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] =?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 @@
     </div>
 
     <div class="bottom">
+      <!-- <div class="cleared-btn" @click="handleRefresh">
+        <img src="@screen/images/clearLayer.svg" />
+        <span>更新图层</span>
+      </div> -->
       <div class="cleared-btn" @click="handleCleared">
         <img src="@screen/images/clearLayer.svg" />
         <span>清空图层</span>
@@ -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, [
             //     {