From ce2c2473861fc50fe2c2f90a1bdf1171e8c68f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C002001lixiaobang=E2=80=9D?= <2547956374@qq.com>
Date: Fri, 19 May 2023 09:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                | 2 +-
 src/views/alarm.vue        | 3 +++
 src/views/energySaving.vue | 3 +++
 src/views/index.vue        | 9 ++++++---
 src/views/security.vue     | 8 ++++++--
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 58e4ada..41a931e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -262,7 +262,7 @@ export default {
 #app {
   // width: 6144px;
   // height: 1920px;
-  background: rgba(1, 1, 7, 0);
+  background: rgba(1, 1, 7, 1);
   // overflow: hidden;
   .header {
     height: 11%;
diff --git a/src/views/alarm.vue b/src/views/alarm.vue
index bdfa48c..44a79ca 100644
--- a/src/views/alarm.vue
+++ b/src/views/alarm.vue
@@ -388,6 +388,7 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
+      that.intervalTime = null
     },
     mouseLeave() {
       this.autoScroll2(67, 50, 0, document.getElementById("courtHouse"));
@@ -396,6 +397,7 @@ export default {
     mouseOver2() {
       let that = this;
       clearInterval(that.intervalTime1);
+      that.intervalTime1 = null
     },
     mouseLeave2() {
       let name = 'courtHouse2'
@@ -405,6 +407,7 @@ export default {
     mouseOver3() {
       let that = this;
       clearInterval(that.intervalTime2);
+      that.intervalTime2 = null
     },
     mouseLeave3() {
       let name = 'courtHouse3'
diff --git a/src/views/energySaving.vue b/src/views/energySaving.vue
index 0e18d65..f2665c0 100644
--- a/src/views/energySaving.vue
+++ b/src/views/energySaving.vue
@@ -1113,9 +1113,12 @@ export default {
     mouseOver() {
       let that = this
       clearInterval(that.interval);
+      that.interval = null
     },
     mouseLeave() {
+      if (this.interval == null) {
       this.autoScroll(67, 50, 0, document.getElementById("equipmentWarnList"));
+      }
     },
   },
    beforeDestroy() {
diff --git a/src/views/index.vue b/src/views/index.vue
index cb9d7dd..1d48804 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -650,7 +650,7 @@ export default {
           buildingId: this.selectValue.value, //建筑id
           customerId: "12345678",
           date: this.value1,
-          dateType: 1,
+          dateType: 3,
           meterType: "1", //1.电,2.水
           pbuildingId: this.selectValue.parentId, //建组父id
         };
@@ -696,7 +696,7 @@ export default {
           buildingId: this.selectValue.value, //建筑id
           customerId: "12345678",
           date: this.value3,
-          dateType: 3,
+          dateType: 1,
           meterType: "1", //1.电,2.水
           pbuildingId: this.selectValue.parentId, //建组父id
         };
@@ -1743,9 +1743,12 @@ export default {
     mouseOver() {
       let that = this
       clearInterval(that.interval);
+      that.interval = null
     },
     mouseLeave() {
-      this.autoScroll(67, 50, 0, document.getElementById("warnList"));
+      if (this.interval == null) {
+        this.autoScroll(67, 50, 0, document.getElementById("warnList"));
+      }
     },
   },
   beforeDestroy() {
diff --git a/src/views/security.vue b/src/views/security.vue
index 30b4bc5..bf60814 100644
--- a/src/views/security.vue
+++ b/src/views/security.vue
@@ -809,6 +809,7 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
+      that.intervalTime = null
     },
     mouseLeave() {
       let name = 'fire'
@@ -818,10 +819,13 @@ export default {
     mouseOver1() {
       let that = this;
       clearInterval(that.intervalTime1);
+      that.intervalTime1 = null
     },
     mouseLeave1() {
-      let name = 'police'
-      this.autoScroll(67, 50, 0, document.getElementById("police"),name);
+      if (this.intervalTime1 == null) {
+        let name = 'police'
+        this.autoScroll(67, 50, 0, document.getElementById("police"),name);
+      }
     },
   },
   beforeDestroy() {