From 3d999649979fba8e46355edd3bf6e4a9b92cec89 Mon Sep 17 00:00:00 2001 From: 23688nl <329261568@qq.com> Date: Fri, 18 Nov 2022 15:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9bug=20=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/iot/device.js | 20 ++++++++++++++++++- .../DeviceManage/EDeviceChildren.vue | 10 ++++++++-- .../profileV2/DeviceManage/EDeviceTable.vue | 9 +++++++-- .../ESceneTriggers/src/ESelectDevice.vue | 2 +- .../ESceneManage/ESceneTriggers/src/index.js | 1 + src/views/iot/project/profileV2/details.vue | 2 +- .../DeviceDetailsView/deviceSelectNav.vue | 8 +++----- 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/api/iot/device.js b/src/api/iot/device.js index 83fe46e4..303ec9e0 100644 --- a/src/api/iot/device.js +++ b/src/api/iot/device.js @@ -117,13 +117,31 @@ export function resetPssword(data) { } // 开关控制 -export function setSwitchControl(data) { +export function setSwitchControlold(data) { return request({ url: "/iot/dev/opt/down", method: "post", data: data }); } +// 开关控制 最新接口 +export function setSwitchControl(data) { + return request({ + url: "/iot/dev/opt/switch", + method: "post", + data: data + }); +} + +// 断路器上报间隔设置 +export function setLivetimeControl(data) { + return request({ + url: "/iot/dev/opt/livetime", + method: "post", + data: data + }); +} + // 获取未绑定设备列表 export function listNoParent(query) { diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue index e9a5b576..41c93cd9 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue @@ -147,6 +147,9 @@ export default { type: String, default: "", }, + wsGuid: { + type: String + } }, data() { return { @@ -255,6 +258,7 @@ export default { projectId: this.sourceId || "", deviceTags: this.deviceType || "", pid: this.gatewayDevice.deviceId || "", + sign: this.wsGuid }, this.queryParams ) @@ -286,7 +290,9 @@ export default { } }, handleChildStatus(type) { - this.handleSendSwitchDirect(type, this.tableSelectList.toString()); + if (this.tableSelectList && this.tableSelectList.length > 0) { + this.handleSendSwitchDirect(type, this.tableSelectList.toString()); + } }, // 点击子设备 线路开关 handleSendSwitchDirect(type, ids) { @@ -299,7 +305,7 @@ export default { }).then(({ value }) => { let params = { data: { - cmd: "set_switch", + // cmd: "set_switch", params: { switch: 1, }, diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue index 933f4444..725c63ab 100644 --- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue +++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue @@ -185,6 +185,7 @@ :gatewayDevice="showGatewayInfo" :sourceId="sourceId" :deviceType="deviceType" + :wsGuid="ws_guid" @handleLinkToHome="handleLinkToHome" > @@ -233,6 +234,7 @@ export default { stompClient: null, socket_flag: true, timeout_flag: null, + ws_guid: '', }; }, watch: { @@ -255,6 +257,7 @@ export default { getIotFileUrl, // init html initHTML() { + this.ws_guid = this.getGuid(); this.getGatewayList(); this.getProjectModelList(); }, @@ -325,11 +328,13 @@ export default { // 获取 项目网关设备列表 getGatewayList() { this.list = []; + this.ws_guid = this.getGuid(); listProjectDevice( Object.assign( { projectId: this.sourceId, deviceTags: this.deviceType || "", + sign: this.ws_guid, }, this.queryParams ) @@ -354,7 +359,7 @@ export default { } let deviceIds = this.list.map((v) => v["deviceKey"]); this.stompClient = new WebSocket( - `${webSocketProjectGatewayUrl}/${this.getGuid()}/${deviceIds.toString()}` + `${webSocketProjectGatewayUrl}/${this.ws_guid}/${deviceIds.toString()}` ); this.stompClient.onmessage = this.socket_message; this.stompClient.onclose = this.socket_onclose; @@ -549,4 +554,4 @@ export default { } } } - + \ No newline at end of file diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue index 68faaaae..0b292c31 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ESelectDevice.vue @@ -83,7 +83,6 @@ export default { selectId: null, inputValueName: "", slectList: [], - selectTableShow: false, tableSelectOption: { otherOption: { tableType: "device", @@ -206,6 +205,7 @@ export default { this.tableSelectOption.tableList = response.rows; this.tableSelectOption.queryOpt.page.total = Number(response.total); } + this.tableSelectOption.tableOpt.loading = false } ); }, diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js index 37408ea5..d98fecd8 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js @@ -5,6 +5,7 @@ import ESelectDevice from './ESelectDevice' import EConditionTemp from './EConditionTemp' import ECronForm from './ECronForm' import EInterval from './EInterval' +import EDialogTableInput from "@/components/EDialogTableInput"; export default { diff --git a/src/views/iot/project/profileV2/details.vue b/src/views/iot/project/profileV2/details.vue index c3aa4ed9..79598ce1 100644 --- a/src/views/iot/project/profileV2/details.vue +++ b/src/views/iot/project/profileV2/details.vue @@ -531,7 +531,7 @@ export default { key: "todayAlarmTotal", }, { - label: "本月报警数", + label: "近30天报警数", key: "alarmTotal", }, ], diff --git a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue index 366016b7..d20f6e52 100644 --- a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue +++ b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue @@ -328,7 +328,7 @@