From 21a6e4c30284414c4516be6c424360afa0c02813 Mon Sep 17 00:00:00 2001 From: ccc Date: Wed, 30 Mar 2022 14:46:35 +0800 Subject: [PATCH 1/4] update --- package-lock.json | 12 +- .../ChartsComponents/AlarmCounts.vue | 332 +++++++++--------- .../CenterBottomChartsComponets.vue | 1 - .../ChartsComponents/RightTopChart.vue | 20 -- src/utils/api.js | 4 + src/utils/config.js | 2 +- src/utils/request.js | 3 +- src/utils/websocket_service.js | 4 +- .../FacilityManagement/FacilityLists.vue | 47 ++- .../FacilityManagement/OperationLogs.vue | 28 +- src/views/Login.vue | 1 - src/views/MainPage.vue | 22 +- 12 files changed, 237 insertions(+), 239 deletions(-) delete mode 100644 src/components/ChartsComponents/RightTopChart.vue diff --git a/package-lock.json b/package-lock.json index 2fcef5e..d88be52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4129,9 +4129,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001241", - "resolved": "https://registry.nlark.com/caniuse-lite/download/caniuse-lite-1.0.30001241.tgz?cache=0&sync_timestamp=1624942708986&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001241.tgz", - "integrity": "sha1-zT+uR+s9dpFpK0BlaNej5bI8dZg=", + "version": "1.0.30001322", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001322.tgz", + "integrity": "sha512-neRmrmIrCGuMnxGSoh+x7zYtQFFgnSY2jaomjU56sCkTA6JINqQrxutF459JpWcWRajvoyn95sOXq4Pqrnyjew==", "dev": true }, "node_modules/case-sensitive-paths-webpack-plugin": { @@ -19128,9 +19128,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001241", - "resolved": "https://registry.nlark.com/caniuse-lite/download/caniuse-lite-1.0.30001241.tgz?cache=0&sync_timestamp=1624942708986&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001241.tgz", - "integrity": "sha1-zT+uR+s9dpFpK0BlaNej5bI8dZg=", + "version": "1.0.30001322", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001322.tgz", + "integrity": "sha512-neRmrmIrCGuMnxGSoh+x7zYtQFFgnSY2jaomjU56sCkTA6JINqQrxutF459JpWcWRajvoyn95sOXq4Pqrnyjew==", "dev": true }, "case-sensitive-paths-webpack-plugin": { diff --git a/src/components/ChartsComponents/AlarmCounts.vue b/src/components/ChartsComponents/AlarmCounts.vue index e8a7b37..4d84db7 100644 --- a/src/components/ChartsComponents/AlarmCounts.vue +++ b/src/components/ChartsComponents/AlarmCounts.vue @@ -1,14 +1,14 @@ diff --git a/src/utils/api.js b/src/utils/api.js index fbd1a32..cee1f82 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -89,6 +89,10 @@ export function editDeviceData(query) { export function editDeviceOperateData(query) { return postRequest('api/api/configure/insertConfig', query) } + +export function getConfigureByDeviceId(query) { + return getRequest(`api/api/configure/get/${query}`) +} // 获取下拉框 export function getConfigData() { return getRequest('api/api/configure/dropDown') diff --git a/src/utils/config.js b/src/utils/config.js index 4744ed0..1a10ff3 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,3 +1,3 @@ module.exports = { - baseUrl: '192.168.1.102:2011' + baseUrl: '192.168.1.103:2011' } diff --git a/src/utils/request.js b/src/utils/request.js index c45bb34..3c87335 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,7 +4,7 @@ import { Message, Notification } from 'element-ui' // 1. 创建新的axios实例， const service = axios.create({ baseURL: '', - timeout: 10 * 1000 + timeout: 20 * 1000 }) // 2.请求拦截器 service.interceptors.request.use(config => { @@ -43,6 +43,7 @@ service.interceptors.response.use(success => { } return success.data }, error => { + console.log(error, 'request') if (error.response.code === 504 || error.response.code === 404) { Message.error({ message: '服务器宕机了，( ╯□╰ )' }) } else if (error.response.code === 403) { diff --git a/src/utils/websocket_service.js b/src/utils/websocket_service.js index dd99988..16b9bdb 100644 --- a/src/utils/websocket_service.js +++ b/src/utils/websocket_service.js @@ -43,7 +43,7 @@ connect() { this.connectRetryCount = 0 } // 连接失败 - this.ws.onclose = () => { + this.ws.onclose = () => { if (this.isClosed) { return false } else { @@ -119,7 +119,7 @@ const heartCheck = { // 这里发送一个心跳，后端收到后，返回一个心跳消息， // onmessage拿到返回的心跳就说明连接正常 SocketService.Instance.ws.send('I am Your father！') - Message.info('HeartBeat') + // Message.info('HeartBeat') self.serverTimeoutObj = setTimeout(function() { // 如果超过一定时间还没重置，说明后端主动断开了 Message.warning('关闭服务') SocketService.Instance.ws.close()// 如果onclose会执行reconnect，我们执行 websocket.close()就行了.如果直接执行 reconnect 会触发onclose导致重连两次 diff --git a/src/views/FacilityManagement/FacilityLists.vue b/src/views/FacilityManagement/FacilityLists.vue index 231f0c5..a2e6c5b 100644 --- a/src/views/FacilityManagement/FacilityLists.vue +++ b/src/views/FacilityManagement/FacilityLists.vue @@ -208,7 +208,7 @@ center :close-on-click-modal="false" > -
+
- + @@ -289,7 +289,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -414,8 +414,8 @@ - - + + @@ -543,7 +543,7 @@ - + @@ -731,7 +731,14 @@ import BreadCrumb from '@/components/BreadCrumb' import EmptyCard from '@/components/EmptyCard' -import { addDevice, editDeviceData, editDeviceOperateData, getConfigData, getDeviceData } from '@/utils/api' +import { + addDevice, + editDeviceData, + editDeviceOperateData, + getConfigData, + getConfigureByDeviceId, + getDeviceData +} from '@/utils/api' export default { components: { @@ -896,6 +903,7 @@ export default { minVolume: [{ required: true, message: '必填项', trigger: 'blur' }] // 最小音量 }, // 设备操作表单校验规则 isShow: false, // 是否为查看控制是否可选 + operationDialogLoading: false, editArray: [] } }, @@ -1001,7 +1009,6 @@ export default { ...this.modifyInfo } const res = this.ModifyDialogTitle === '编辑设备信息' ? await editDeviceData(query) : await addDevice(this.modifyInfo) - console.log(res, '编辑或修改设备') } catch (err) { this.$message.error(err) } finally { @@ -1015,17 +1022,30 @@ export default { }) }, // 查看设备操作信息 - seeInfo(scope, row) { + async seeInfo(scope, row) { + if (this.$refs.EquipmentOperation) { + this.$refs.EquipmentOperation.resetFields() + } this.titleOfDialog = '查看设备操作' this.isShow = true - this.operationDialogVisible = true + const res = await getConfigureByDeviceId(row.deviceId) + if (res === {}) { + this.$message.info('暂未设置参数') + } else { + this.EquipmentOperation = res + this.operationDialogVisible = true + } }, // 编辑设备操作 - editOperation(scope, row) { + async editOperation(scope, row) { + if (this.$refs.EquipmentOperation) { + this.$refs.EquipmentOperation.resetFields() + } this.titleOfDialog = '编辑设备操作' this.isShow = false this.operationDialogVisible = true this.editArray = [row.deviceId] + this.EquipmentOperation = await getConfigureByDeviceId(row.deviceId) }, // 确认编辑设备操作 async modifyEquipmentOperation() { @@ -1040,12 +1060,13 @@ export default { await editDeviceOperateData(query) } catch (err) { this.$message.error(err) + console.log(err, '111') } } else { console.log('error submit!!') return false } - this.ModifyDialogVisible = false + this.operationDialogVisible = false }) } } diff --git a/src/views/FacilityManagement/OperationLogs.vue b/src/views/FacilityManagement/OperationLogs.vue index fc844ee..5df73bc 100644 --- a/src/views/FacilityManagement/OperationLogs.vue +++ b/src/views/FacilityManagement/OperationLogs.vue @@ -40,7 +40,7 @@ /> - +
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Date: Wed, 30 Mar 2022 14:58:28 +0800 Subject: [PATCH 2/4] update --- src/views/FacilityManagement/OperationLogs.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/FacilityManagement/OperationLogs.vue b/src/views/FacilityManagement/OperationLogs.vue index 5df73bc..7441493 100644 --- a/src/views/FacilityManagement/OperationLogs.vue +++ b/src/views/FacilityManagement/OperationLogs.vue @@ -160,8 +160,8 @@ export default { this.getData() }, methods: { - getData() { - // this.loading = true + async getData() { + this.loading = true if (this.searchFrom.endTime === null) { this.searchFrom.endTime = '' } @@ -174,8 +174,7 @@ export default { searchObject: this.searchFrom } try { - const res = getOperationLogs(query) - // if (res.code && res.code === 200) { + const res = await getOperationLogs(query) if (res.code === 200) { this.pager.totalPage = JSON.parse(JSON.stringify(res.data.result.totalPage)) * 10 this.tableData = res.data.result.tableData -- Gitee From 14a34e68daac9e6f2555a89da1fed4510781ce41 Mon Sep 17 00:00:00 2001 From: ccc Date: Wed, 30 Mar 2022 14:59:29 +0800 Subject: [PATCH 3/4] update --- src/utils/request.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 3c87335..59a251d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -43,7 +43,6 @@ service.interceptors.response.use(success => { } return success.data }, error => { - console.log(error, 'request') if (error.response.code === 504 || error.response.code === 404) { Message.error({ message: '服务器宕机了，( ╯□╰ )' }) } else if (error.response.code === 403) { -- Gitee From e1e2878fc39d539e2774adbdcf0910d71fd04917 Mon Sep 17 00:00:00 2001 From: ccc Date: Wed, 30 Mar 2022 21:04:58 +0800 Subject: [PATCH 4/4] update --- .../FacilityManagement/FacilityLists.vue | 41 +++++++------ .../FacilityManagement/OperationLogs.vue | 58 +++++++++++++------ 2 files changed, 59 insertions(+), 40 deletions(-) diff --git a/src/views/FacilityManagement/FacilityLists.vue b/src/views/FacilityManagement/FacilityLists.vue index a2e6c5b..4562e76 100644 --- a/src/views/FacilityManagement/FacilityLists.vue +++ b/src/views/FacilityManagement/FacilityLists.vue @@ -208,7 +208,7 @@ center :close-on-click-modal="false" > -
+
- + @@ -241,7 +241,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -314,7 +314,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -385,7 +385,7 @@ - + @@ -410,12 +410,12 @@ - + - + @@ -450,12 +450,12 @@ - + - + @@ -498,12 +498,12 @@ - + - + @@ -538,12 +538,12 @@ - + - + @@ -586,7 +586,7 @@ - + @@ -775,7 +775,7 @@ export default { updateTime: '2022-03-22 18:10:11', remark: '描述' }], // 表格数据 - filterData: [{ text: '关闭', value: '关闭' }, { text: '运行中', value: '运行中' }, { text: '异常', value: '异常' }], + filterData: [{ text: '关闭', value: 0 }, { text: '运行中', value: 1 }, { text: '异常', value: 2 }], pager: { currentPage: 1, pageSize: 10, @@ -973,8 +973,7 @@ export default { }, // 筛选函数 filterHandler(value, row, column) { - const property = column['property'] - return row[property] === value + return row.state === value }, // 设备新增 newDevice() { diff --git a/src/views/FacilityManagement/OperationLogs.vue b/src/views/FacilityManagement/OperationLogs.vue index 7441493..ccf59dc 100644 --- a/src/views/FacilityManagement/OperationLogs.vue +++ b/src/views/FacilityManagement/OperationLogs.vue @@ -59,19 +59,42 @@
- + - - - + + + @@ -84,12 +107,12 @@
- - -- Gitee