From b4796e0ae1274bd680c5af55f8fe498c4a175e79 Mon Sep 17 00:00:00 2001 From: zhoule Date: Thu, 9 May 2024 18:13:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=AA=E9=98=B3=E8=83=BD=E6=9D=BF?= =?UTF-8?q?=E5=81=B6=E5=B0=94=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/SolarEnergy/components/DeviceParams.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue index 99d76608..54157d65 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue @@ -55,8 +55,11 @@ export default { this.devicesList = []; let devs = []; // Promise.all([this.getAc('A1'), this.getAc('A2'), this.getAc('A3'), this.getAc('A4'), this.getAc('A5'), this.getAc('A6')]).then(res => { - Promise.all([this.getAc()]).then(res => { + Promise.all([this.getAc()]).then(async (res) => { console.log('res', res) + if (res[0].code == 500) { + await this.getAc(); + } request({ url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`, method: "get", From 63a242c3613369eac0c1a05a879adee30390f856 Mon Sep 17 00:00:00 2001 From: zhoule Date: Thu, 9 May 2024 18:30:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/components/Dialogs/RoadNetworkFacilities/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue index 7c17759d..c8d3304b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue @@ -95,7 +95,7 @@ export default { justify-content: center; >div.video-stream { - height: 255px; + height: 260px; } } From 4abf990724c24f036376a730dab261842802b95d Mon Sep 17 00:00:00 2001 From: zhoule Date: Thu, 9 May 2024 18:33:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B8=85=E9=9A=9C=E9=A9=BB=E7=82=B9?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/layer/路网设施/清障驻点.svg | 18 +++++------------- .../layer/路网设施/清障驻点_active.svg | 18 +++++++----------- .../layer/路网设施/清障驻点_fault.svg | 18 +++++++----------- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg index a6705492..d63f6d9e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg @@ -1,15 +1,7 @@ - - - - - - - - - - - - - + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg index 716b7e01..791b3bd3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg @@ -1,14 +1,10 @@ - - - - - - - - - - - + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg index 83bff754..52dd7e36 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg @@ -1,14 +1,10 @@ - - - - - - - - - - - + + + + + + + From a87ecd590ee859c77a773c48aeffe164ffe1690a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Thu, 9 May 2024 18:37:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?0509BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/components/Dialogs/TrafficIncidents/index.vue | 4 ++-- .../pages/Home/components/RoadAndEvents/index.vue | 10 ++++++++++ .../pages/control/event/commandDispatch/index.vue | 5 +++-- .../JiHeExpressway/pages/datav/roadNet/sensors.vue | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue index 8c296b5a..6a100d88 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue @@ -164,8 +164,8 @@ export default { url: `dc/system/event/${this.dialogData.id}`, method: "delete", }).then((result) => { - if (result.code == 200) Message.success("成功！"); - else Message.error(result?.msg); + if (result.code == 200) this.$message.success("成功！"); + else this.$message.error(result?.msg); this.$emit('traffic-relieve', this.data); }); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index f30a110b..6564597b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -18,6 +18,10 @@
+
清空图层 @@ -258,6 +262,12 @@ export default { handleDevice: debounce(async function (item) { await this.handleDeviceImmediate(item); }, 360), + handleRefresh(){ + // 先清空图层 + const { mapIns } = this.getMap(); + console.log(mapIns.getLayers(),'-----') + mapIns.getLayers().forEach((layer, index) => index > this.minLayers && mapIns.remove(layer)) + }, handleCleared() { const { mapIns } = this.getMap(); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue index e8cfe1e0..e248883b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue @@ -87,7 +87,7 @@ export default { delete gridArea.TrafficControl; if (["设备设施隐患", "非法上路"].includes(result.data.eventName)) { // 第三列变化 - gridArea["RealTimeVideo"] = "1 / 3 / span 17 / 3"; + gridArea["RealTimeVideo"] = "1 / 3 / span 16 / 3"; delete gridArea.ReleaseInformation; } @@ -97,6 +97,7 @@ export default { .catch((err) => {}); }, handleFullHeight(key, opacityKey) { + // 还原图标 if (this.gridAreaMap[key] !== originGridArea[key]) { this.gridAreaMap[key] = originGridArea[key]; if (this.$refs[opacityKey]?.[0]) { @@ -109,7 +110,6 @@ export default { this.$refs[opacityKey][0].$el.style.opacity = 0; this.$refs[opacityKey][0].$el.style.pointerEvents = "none"; } - this.gridAreaMap[key] = originGridArea[key].replace( /[0-9]+/g, (num) => { @@ -121,6 +121,7 @@ export default { } } ); + this.gridAreaMap["DisposalProcess"] = "1 / 2 / span 33 / 2"; } }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue index 5dbf5634..fec3da9f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue @@ -194,7 +194,7 @@ export default { }) let subItems = [ - "可变新消息标志", + "可变信息标志", "气象检测器", "一类交通量调查站", "枪机", @@ -216,7 +216,7 @@ export default { // const sub01 = createSub(0, 0, '气象检测器') // const sub02 = createSub(0, 100, '一类交通量调查站') - // const sub03 = createSub(0, 200, '可变新消息标志') + // const sub03 = createSub(0, 200, '可变信息标志') // link(main, sub02, [ // {