From 69b4dd3f04272f158805fc0a8ee69d1dc9a12d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Mon, 29 Apr 2024 17:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E7=82=B9=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/HomeFilter/index.vue      | 10 ++++++-
 .../components/HomeFrameControl/index.vue     | 29 ++++++-------------
 2 files changed, 18 insertions(+), 21 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 4e55059c..f7b33396 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
@@ -110,7 +110,8 @@ export default {
         this.formList[2].options.options = options;
       },
       immediate: true,
-      deep: true
+      deep: true,
+      isButtonClick: false
     }
   },
   methods: {
@@ -126,6 +127,13 @@ export default {
       this.$parent.$refs.RoadAndEventsRef?.setFilterDataNoAction?.(data);
     },
     async handleResetForm() {
+      if(this.isButtonClick){return}
+        
+      this.isButtonClick = true;
+      setTimeout(() => {
+        this.isButtonClick = false;
+      }, 500);
+      
       this.$refs.FormConfigRef?.reset();
       this.activeIcon = "filter";
       this.filterEnd(initSearch);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index 8e424c5e..7b231d2a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -2,10 +2,15 @@
   <div class="HomeFrameControl">
     <ElPopover trigger="manual" :value="activeIcon === 'FrameControl'" :visibleArrow="false" placement="left"
       popper-class="global-input-search-popover" @hide="onHide()">
-      <Button :class="['btn', { 'btn-active': activeIcon }]" slot="reference"
-        @click.native="handleClick('FrameControl')">
-        <img src="@screen/images/home-FrameControl/FrameControl.svg" />
-      </Button>
+  
+        <el-tooltip slot="reference" effect="light" content="批量控制" placement="left">
+            <Button :class="['btn', { 'btn-active': activeIcon }]" 
+              @click.native="handleClick('FrameControl')">
+            
+              <img src="@screen/images/home-FrameControl/FrameControl.svg" />
+            </Button>
+        </el-tooltip>
+      
       <el-tabs v-model="tabAction" @tab-click="tabClick">
         <el-tab-pane label="批量管控" name="1">{{  }}</el-tab-pane>
         <el-tab-pane label="定时管控" name="2"></el-tab-pane>
@@ -322,22 +327,6 @@ export default {
             return true;
           },
         },
-        // {
-        //   label: "控制操作:",
-        //   key: "controlOp",
-        //   type: "select",
-        //   default: null,
-        //   options: {
-        //     clearable: true,
-        //     options: [{
-        //       label: "在线",
-        //       value: "1"
-        //     }, {
-        //       label: "离线",
-        //       value: "0"
-        //     }]
-        //   },
-        // },
       ],
       DeviceTopics,
       componentMap,