diff --git a/.env.development b/.env.development
index 218ef3c..38a0253 100644
--- a/.env.development
+++ b/.env.development
@@ -5,5 +5,5 @@ VITE_APP_TITLE = 联美运营系统
VITE_APP_ENV = 'development'
# 联美运营系统/开发环境
-VITE_APP_BASE_API = 'http://localhost:9010'
+VITE_APP_BASE_API = 'http://10.10.10.56:9010'
VITE_APP_BASE_API_IMAGE = 'http://localhost:9010'
diff --git a/src/api/model/asset/params.js b/src/api/model/asset/params.js
index 1d027d9..1435f90 100644
--- a/src/api/model/asset/params.js
+++ b/src/api/model/asset/params.js
@@ -1,53 +1,62 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
// 查询资产参数列表
export function listParams(query) {
return request({
- url: '/model/dcBaseAssetParams/list',
- method: 'get',
- params: query
- })
+ url: "/model/dcBaseAssetParams/list",
+ method: "get",
+ params: query,
+ });
}
// 查询资产参数详细
export function getParams(id) {
return request({
- url: '/model/dcBaseAssetParams/' + id,
- method: 'get'
- })
+ url: "/model/dcBaseAssetParams/" + id,
+ method: "get",
+ });
}
// 新增资产参数
export function addParams(data) {
return request({
- url: '/model/dcBaseAssetParams',
- method: 'post',
- data: data
- })
+ url: "/model/dcBaseAssetParams",
+ method: "post",
+ data: data,
+ });
}
// 修改资产参数
export function updateParams(data) {
return request({
- url: '/model/dcBaseAssetParams',
- method: 'put',
- data: data
- })
+ url: "/model/dcBaseAssetParams",
+ method: "put",
+ data: data,
+ });
}
// 删除资产参数
export function delParams(id) {
return request({
- url: '/model/dcBaseAssetParams/' + id,
- method: 'delete'
- })
+ url: "/model/dcBaseAssetParams/" + id,
+ method: "delete",
+ });
}
// 导出资产参数
export function exportParams(query) {
return request({
- url: '/${baseUrl}/export',
- method: 'get',
- params: query
- })
-}
\ No newline at end of file
+ url: "/${baseUrl}/export",
+ method: "get",
+ params: query,
+ });
+}
+
+// 根据设备查询设备参数列表
+export function listByDeviceUuids(data) {
+ return request({
+ url: "/model/dcBaseDeviceParam/listByDeviceUuids",
+ method: "post",
+ data: data,
+ });
+}
diff --git a/src/api/model/dcHeatStandardDeviceStrategyConf.js b/src/api/model/dcHeatStandardDeviceStrategyConf.js
new file mode 100644
index 0000000..1b5fe3a
--- /dev/null
+++ b/src/api/model/dcHeatStandardDeviceStrategyConf.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 查询设备策略配置列表
+export function listDcHeatStandardDeviceStrategyConf(query) {
+ return request({
+ url: '/model/dcHeatStandardDeviceStrategyConf/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备策略配置详细
+export function getDcHeatStandardDeviceStrategyConf(id) {
+ return request({
+ url: '/model/dcHeatStandardDeviceStrategyConf/' + id,
+ method: 'get'
+ })
+}
+
+// 新增设备策略配置
+export function addDcHeatStandardDeviceStrategyConf(data) {
+ return request({
+ url: '/model/dcHeatStandardDeviceStrategyConf',
+ method: 'post',
+ data: data
+ })
+}
+
+// 批量新增设备策略配置
+export function addBatchDcHeatStandardDeviceStrategyConf(confId, list) {
+ return request({
+ url: '/model/dcHeatStandardDeviceStrategyConf',
+ method: 'post',
+ params: {
+ confId: confId
+ },
+ data: {
+ list: list
+ }
+ })
+}
+
+// 修改设备策略配置
+export function updateDcHeatStandardDeviceStrategyConf(data) {
+ return request({
+ url: '/model/dcHeatStandardDeviceStrategyConf',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备策略配置
+export function delDcHeatStandardDeviceStrategyConf(id) {
+ return request({
+ url: '/model/dcHeatStandardDeviceStrategyConf/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出设备策略配置
+export function exportDcHeatStandardDeviceStrategyConf(query) {
+ return request({
+ url: '/${baseUrl}/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6d8c05f..43a4e5d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,70 +1,78 @@
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
-import defAva from '@/assets/images/profile.jpg'
+import { login, logout, getInfo } from "@/api/login";
+import { getToken, setToken, removeToken } from "@/utils/auth";
+import defAva from "@/assets/images/profile.jpg";
-const useUserStore = defineStore(
- 'user',
- {
- state: () => ({
- token: getToken(),
- name: '',
- avatar: '',
- roles: [],
- permissions: []
- }),
- actions: {
- // 登录
- login(userInfo) {
- const username = userInfo.username.trim()
- const password = userInfo.password
- const code = userInfo.code
- const uuid = userInfo.uuid
- return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
- setToken(res.token)
- this.token = res.token
- resolve()
- }).catch(error => {
- reject(error)
+const useUserStore = defineStore("user", {
+ state: () => ({
+ token: getToken(),
+ name: "",
+ avatar: "",
+ roles: [],
+ permissions: [],
+ }),
+ actions: {
+ // 登录
+ login(userInfo) {
+ const username = userInfo.username.trim();
+ const password = userInfo.password;
+ const code = userInfo.code;
+ const uuid = userInfo.uuid;
+ return new Promise((resolve, reject) => {
+ login(username, password, code, uuid)
+ .then((res) => {
+ setToken(res.token);
+ this.token = res.token;
+ resolve();
})
- })
- },
- // 获取用户信息
- getInfo() {
- return new Promise((resolve, reject) => {
- getInfo().then(res => {
- const user = res.user
- const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
+ .catch((error) => {
+ reject(error);
+ });
+ });
+ },
+ // 获取用户信息
+ getInfo() {
+ return new Promise((resolve, reject) => {
+ getInfo()
+ .then((res) => {
+ const user = res.user;
+ const avatar =
+ user.avatar == "" || user.avatar == null
+ ? defAva
+ : import.meta.env.VITE_APP_BASE_API + user.avatar;
- if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
- this.roles = res.roles
- this.permissions = res.permissions
+ if (res.roles && res.roles.length > 0) {
+ // 验证返回的roles是否是一个非空数组
+ this.roles = res.roles;
+ this.permissions = res.permissions;
} else {
- this.roles = ['ROLE_DEFAULT']
+ this.roles = ["ROLE_DEFAULT"];
}
- this.name = user.userName
+ this.name = user.userName;
this.avatar = avatar;
- resolve(res)
- }).catch(error => {
- reject(error)
+ resolve(res);
})
- })
- },
- // 退出系统
- logOut() {
- return new Promise((resolve, reject) => {
- logout(this.token).then(() => {
- this.token = ''
- this.roles = []
- this.permissions = []
- removeToken()
- resolve()
- }).catch(error => {
- reject(error)
+ .catch((error) => {
+ reject(error);
+ });
+ });
+ },
+ // 退出系统
+ logOut() {
+ return new Promise((resolve, reject) => {
+ logout(this.token)
+ .then(() => {
+ this.token = "";
+ this.roles = [];
+ this.permissions = [];
+ removeToken();
+ resolve();
})
- })
- }
- }
- })
+ .catch((error) => {
+ reject(error);
+ });
+ });
+ },
+ },
+});
-export default useUserStore
+export default useUserStore;
diff --git a/src/views/model/asset/addParams.vue b/src/views/model/asset/addParams.vue
new file mode 100644
index 0000000..6960ac0
--- /dev/null
+++ b/src/views/model/asset/addParams.vue
@@ -0,0 +1,533 @@
+
+
+
+
+ {{ paramsText }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择参数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/model/asset/index.vue b/src/views/model/asset/index.vue
index 028efc7..5c5318e 100644
--- a/src/views/model/asset/index.vue
+++ b/src/views/model/asset/index.vue
@@ -3,52 +3,110 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
- 搜索
- 重置
+ 搜索
+ 重置
- 新增
+ 新增
+
- 修改
+ 删除
- 删除
+ 导出
-
- 导出
-
-
+
-
+
@@ -59,19 +117,43 @@
-
+
- 参数
+ 参数
- 修改
- 删除
+ 修改
+ 删除
-
-
+
@@ -81,14 +163,29 @@
-
+
-
+
@@ -98,8 +195,16 @@
-
-
+
+
@@ -111,12 +216,15 @@
-
+
-
@@ -130,11 +238,17 @@
diff --git a/src/views/model/asset/params.vue b/src/views/model/asset/params.vue
index 2ea1cde..7069041 100644
--- a/src/views/model/asset/params.vue
+++ b/src/views/model/asset/params.vue
@@ -1,44 +1,95 @@
-
+
-
+
-
+
-
+
-
+
-
+
- 搜索
- 重置
+ 搜索
+ 重置
- 新增
+ 新增
- 修改
+ 修改
- 删除
+ 删除
- 导出
+ 导出
-
+
-
+
@@ -48,28 +99,48 @@
-
+
- 修改
- 删除
+ 修改
+ 删除
-
+
-
+
-
+
@@ -110,8 +181,14 @@
diff --git a/src/views/model/heatapiconf/paramModel.vue b/src/views/model/heatapiconf/paramModel.vue
index eb8b355..ce4f080 100644
--- a/src/views/model/heatapiconf/paramModel.vue
+++ b/src/views/model/heatapiconf/paramModel.vue
@@ -42,6 +42,11 @@
{{ getParamClassName(scope.row.paramClassId) }}
+
+
+ {{ scope.row.pushingCounterpartParam }}
+
+
@@ -49,7 +54,7 @@
-
+ 修改
删除
@@ -59,7 +64,7 @@
@pagination="getList" />
-
+
@@ -71,7 +76,6 @@
-
@@ -81,6 +85,23 @@
+
+
+
+
+ {{paramClassFormat(editForm.paramClassId)}}
+
+
+
+
+
+
+
+
+