From e6228bf3a59ab0c23d93573d20127aa0aef20ee0 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Sun, 4 Feb 2024 16:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/HomeFilter/index.vue    |  9 +++++++--
 .../pages/Home/components/RoadAndEvents/index.vue | 15 ++++++++++++++-
 .../src/views/JiHeExpressway/pages/Home/index.vue |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
index 5f4656d9..5a774bf0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
@@ -116,13 +116,18 @@ export default {
     handleClick(type) {
       this.activeIcon = this.activeIcon === type ? null : type;
     },
+    filterEnd(data) {
+      this.activeIcon = null;
+      // this.filterData = data;
+      this.$parent.$refs.RoadAndEventsRef?.setFilterData?.(data);
+    },
     async handleResetForm() {
       this.$refs.FormConfigRef?.reset();
-      this.activeIcon = null;
+      this.filterEnd(null)
     },
     async handleSearch() {
       const data = await this.$refs.FormConfigRef.validate();
-      this.activeIcon = null;
+      this.filterEnd(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 70c590b6..b981e89c 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
@@ -151,11 +151,21 @@ export default {
     getMinMapLayers();
   },
   methods: {
+    setFilterData(data) {
+      this.filterData = data;
+
+      this.layerData[1].children.forEach(item => {
+        if (!item.status) return;
+
+        this.handleDeviceImmediate(item);
+        this.handleDeviceImmediate(item);
+      })
+    },
     handleClick(item) {
       this.active = item.title;
       this.tabContentData = item.children;
     },
-    handleDevice: debounce(function (item) {
+    handleDeviceImmediate(item) {
       const key = getHandleDeviceType(item) || `${this.active}/${item.title}`;
 
       const status = item.status;
@@ -167,6 +177,9 @@ export default {
       if (!eventMap[`${key}${status ? "_close" : ""}`]) return this.$emit("onClickItem", item);
 
       eventMap[`${key}${status ? "_close" : ""}`]?.call(this, item);
+    },
+    handleDevice: debounce(function (item) {
+      this.handleDeviceImmediate(item);
     }, 360),
     handleCleared() {
       const { mapIns } = this.getMap();
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
index 34d1124a..e5bb9117 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
@@ -8,7 +8,7 @@
         <FocusedMonitoring class="card-menu" />
 
         <!-- 下 -->
-        <RoadAndEvents class="content-l-b card-menu" />
+        <RoadAndEvents ref="RoadAndEventsRef" class="content-l-b card-menu" />
       </div>
 
       <!-- 右侧 -->