From 24975487c6d9e06d6bb99335127516c290fa3d97 Mon Sep 17 00:00:00 2001 From: xins Date: Tue, 7 Nov 2023 09:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A11.?= =?UTF-8?q?8.1=201=E3=80=81=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=92=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=202=E3=80=81=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=BC=96=E8=BE=91bug=E4=BF=AE=E5=A4=8D=203=E3=80=81=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E5=9B=B4=E6=A0=8F=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/business/alarmRule/index.vue | 1010 ++++++++++++----- .../business/deviceMode/editDeviceMode.vue | 16 +- .../electronicFence/editElectronicFence.vue | 25 +- 3 files changed, 747 insertions(+), 304 deletions(-) diff --git a/ruoyi-ui/src/views/business/alarmRule/index.vue b/ruoyi-ui/src/views/business/alarmRule/index.vue index 0634080..5a02191 100644 --- a/ruoyi-ui/src/views/business/alarmRule/index.vue +++ b/ruoyi-ui/src/views/business/alarmRule/index.vue @@ -9,158 +9,74 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + + + + + - - + + + + - - + + + + + - + + + - - - - - - - - - - - - - - + + + + + + + 搜索 重置 @@ -176,7 +92,8 @@ size="mini" @click="handleAdd" v-hasPermi="['business:alarmRule:add']" - >新增 + >新增 + 修改 + >修改 + 删除 + >删除 + 导出 + >导出 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -271,97 +184,289 @@ /> - - + + - - - - - - - + - - - - - - - - + + + + + + - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + " + {{ dict.label }} + + + + + - - - - - - - - - - - - - - - - - - - + + {{ dict.label }} + +   + + 添加联动设备 + + + + + + + + + + + + + + + + + + + - - - - + +
确 定 取 消
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ + + diff --git a/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue b/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue index d3d6669..12ce6f4 100644 --- a/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue +++ b/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue @@ -501,14 +501,24 @@ export default { this.scenes = response.data; }); + this.eventsData = []; + this.servicesData = []; + this.attributesData = []; + const deviceModeId = this.$route.params && this.$route.params.deviceModeId; if (deviceModeId) { // 获取表详细信息 getDeviceMode(deviceModeId).then(res => { this.info = res.data.deviceMode; this.attributesData = (res.data.deviceModeFunctionMap)['1']; - this.servicesData = (res.data.deviceModeFunctionMap)['2']; - this.eventsData = (res.data.deviceModeFunctionMap)['3']; + const servicesData = (res.data.deviceModeFunctionMap)['2']; + const eventsData = (res.data.deviceModeFunctionMap)['3']; + if(servicesData != null && servicesData!==''){ + this.servicesData =servicesData; + } + if(servicesData != null && eventsData!==''){ + this.eventsData =eventsData; + } this.deviceModeId = deviceModeId; if (res.data.deviceMode.deviceModePic != null) { let previewFile = {}; @@ -530,7 +540,7 @@ export default { }; this.gps_flag = "0" this.disabled = false; - this.eventsData = []; + } }, computed: {}, diff --git a/ruoyi-ui/src/views/business/electronicFence/editElectronicFence.vue b/ruoyi-ui/src/views/business/electronicFence/editElectronicFence.vue index 98ebc8b..f3d4498 100644 --- a/ruoyi-ui/src/views/business/electronicFence/editElectronicFence.vue +++ b/ruoyi-ui/src/views/business/electronicFence/editElectronicFence.vue @@ -271,15 +271,21 @@ export default { getElectronicFence(electronicFenceId).then(response => { this.form = response.data; let circleAreaList = JSON.parse(response.data.circleAreaListStr) - let polygonAreaList = JSON.parse(response.data.polygonAreaListStr) + let polygonAreaListArr = JSON.parse(response.data.polygonAreaListStr) + let polygonData1 = {} let polygonData = [] - polygonAreaList.forEach(e => { - if (polygonData1[e.index]) { - polygonData1[e.index].push([e.longitude, e.latitude]) - } else { - polygonData1[e.index] = [[e.longitude, e.latitude]] - } + polygonAreaListArr.forEach(e1 => { + let polygonAreaListJson = JSON.parse(e1); + let polyJsonArr = JSON.parse(polygonAreaListJson["polyJsonArr"]); + let fenceAreaId = polygonAreaListJson["fenceAreaId"]; + polyJsonArr.forEach(e => { + if (polygonData1[e.index]) { + polygonData1[e.index].push([e.longitude, e.latitude]) + } else { + polygonData1[e.index] = [[e.longitude, e.latitude]] + } + }) }) Object.keys(polygonData1).forEach(e => { polygonData[e] = polygonData1[e] @@ -289,8 +295,9 @@ export default { }) circleAreaList.forEach(e => { - let center = JSON.parse(e.center) - let radius = e.radius + let fenceAreaId = e.fenceAreaId; + let center = JSON.parse(e.center); + let radius = e.radius; this.setCircle({center, radius}) }) });