From d2f395c9e935f9d1c34cc280200fba85618cd81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Tue, 6 Feb 2024 17:21:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=83=85=E6=8A=A5?= =?UTF-8?q?=E7=AE=B1=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/SmartDevice/components/DeviceParams.vue | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue index f3ae6362..e246f8c9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue @@ -50,14 +50,10 @@ export default { created() { // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc= // 获取设备参数 - // request({ - // url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}`, - // method: "get", - // params: {} - // }) - Promise.resolve({ - code: 200, - data: [{ "id": "ab58aab1e4c5fcf0457b3f1d808be44e", "deviceId": "10.0.36.143-1883", "property": "1", "propertyName": "状态包", "type": "object", "numberValue": null, "objectValue": { "dc_out_electricity_2": 0, "dc_out_electricity_1": 0, "power_status": "1", "dc_out_voltage_2": 11.3238, "fan_status": "0", "dc_out_voltage_1": 11.3125, "ac_out_voltage_2": 232.5156, "ac_out_voltage_1": 231.1293, "ac_out_electricity_1": 0, "temperature": "7.9", "humidity": "40.6", "ac_out_electricity_2": 0.1964, "door_status": "1" }, "geoValue": null, "value": { "dc_out_electricity_2": 0, "dc_out_electricity_1": 0, "power_status": "1", "dc_out_voltage_2": 11.3238, "fan_status": "0", "dc_out_voltage_1": 11.3125, "ac_out_voltage_2": 232.5156, "ac_out_voltage_1": 231.1293, "ac_out_electricity_1": 0, "temperature": "7.9", "humidity": "40.6", "ac_out_electricity_2": 0.1964, "door_status": "1" }, "formatValue": { "dc_out_electricity_2": "0.00A", "dc_out_electricity_1": "0.00A", "power_status": "1", "dc_out_voltage_2": "11.32V", "fan_status": "0", "dc_out_voltage_1": "11.31V", "ac_out_voltage_2": "232.52V", "ac_out_voltage_1": "231.13V", "ac_out_electricity_1": "0.00A", "temperature": "7.9", "humidity": "40.6", "ac_out_electricity_2": "0.20A", "door_status": "1" }, "createTime": 1707187234249, "timestamp": 1707187234249, "formatTime": null, "state": null }] + request({ + url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}`, + method: "get", + params: {} }).then(result => { if (result.code != 200) return; const [deviceInfo] = result.data; From 502802feaf89cf72bb7ef8d62cd489d27163b7d8 Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 6 Feb 2024 17:27:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/control/event/event/index.vue | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index a1288fdd..8f2328dd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -128,7 +128,7 @@ export default { this.searchData.eventState = activeName == "-1" ? null : activeName; - this.getData(); + this.getData(activeName); }, getStateCardBind(item) { const { state, textColor, text } = tabMap[this.activeName]; @@ -140,15 +140,29 @@ export default { }; }, getData() { - request({ - url: `/dc/system/event/list`, - method: "get", - params: this.searchData, - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - this.data = result.rows; - this.total = result.total; - }); + + if (this.activeName == '-1') { + request({ + url: `/perceivedEvents/warning/perceivedEventsList`, + method: "post", + data: this.searchData, + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + this.data = result.rows; + this.total = result.total; + }); + } else { + request({ + url: `/dc/system/event/list`, + method: "get", + params: this.searchData, + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + this.data = result.rows; + this.total = result.total; + }); + } + // request({ // url: `/dc/system/event/count`, From bf82b4786b84aa198d0b0ef54f80f422e277d1d7 Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Tue, 6 Feb 2024 17:29:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sensitive/components/AddNEditDialog.vue | 22 ++++++++++++++++--- .../pages/service/sensitive/index.vue | 4 ++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue index 3cc86f02..ea6cabfd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue @@ -4,7 +4,7 @@
- @@ -138,7 +138,7 @@ export default { handleExport() { exportFile({ url: "/business/dcInfoBoardVocabulary/export", - filename: "管辖路段", + filename: "情报板敏感词", data: this.getSearchData() }); }, From f930c5d5e0a40460c53aaa0edc467a70af691190 Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Tue, 6 Feb 2024 17:39:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/sensitive/components/AddNEditDialog.vue | 9 ++++----- ruoyi-ui/vue.config.js | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue index ea6cabfd..0324ea60 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue @@ -4,7 +4,7 @@ -