代码提交

package.json

@@ -19,7 +19,6 @@
     "less-loader": "^5.0.0",
     "moment": "^2.29.4",
     "mqtt": "^4.3.7",
-    "node-sass": "^8.0.0",
     "pdfjs-dist": "2.5.207",
     "postcss-px2rem-exclude": "^0.0.6",
     "semver": "^7.4.0",
@@ -36,7 +35,8 @@
     "@vue/cli-plugin-babel": "^3.0.4",
     "@vue/cli-service": "^3.0.4",
     "mini-css-extract-plugin": "^2.7.2",
-    "sass-loader": "^7.0.3",
+    "sass": "^1.26.5",
+    "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.10",
     "webpack": "^4.0.0"
   },

src/views/alarm.vue

@@ -388,30 +388,36 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
-      that.intervalTime = null
+      that.intervalTime = null;
     },
     mouseLeave() {
+      if (this.intervalTime == null) {
         this.autoScrollalarm2(67, 50, 0, document.getElementById("courtHouse"));
+      }
     },
     //鼠标移入事件
     mouseOver2() {
       let that = this;
       clearInterval(that.intervalTime1);
-      that.intervalTime1 = null
+      that.intervalTime1 = null;
     },
     mouseLeave2() {
-      let name = 'courtHouse2'
+      if (this.intervalTime1 == null) {
+        let name = "courtHouse2";
         this.autoScrollalarm(67, 50, 0, document.getElementById("courtHouse2"), name);
+      }
     },
     //鼠标移入事件
     mouseOver3() {
       let that = this;
       clearInterval(that.intervalTime2);
-      that.intervalTime2 = null
+      that.intervalTime2 = null;
     },
     mouseLeave3() {
-      let name = 'courtHouse3'
+      if (this.intervalTime2 == null) {
+        let name = "courtHouse3";
         this.autoScrollalarm(67, 50, 0, document.getElementById("courtHouse3"), name);
+      }
     },
   },
   beforeDestroy() {
@@ -420,9 +426,9 @@ export default {
     clearInterval(that.intervalTime);
     clearInterval(that.intervalTime1);
     clearInterval(that.intervalTime2);
-    that.intervalTime = null
-    that.intervalTime1 = null
-    that.intervalTime2 = null
+    that.intervalTime = null;
+    that.intervalTime1 = null;
+    that.intervalTime2 = null;
   },
   components: {},
 };

src/views/energySaving.vue

@@ -1116,7 +1116,9 @@ export default {
       that.interval = null;
     },
     mouseLeave() {
+      if (this.interval == null) {
          this.autoScrollenergySaving(67, 50, 0, document.getElementById("equipmentWarnList"));
+      }
     },
   },
    beforeDestroy() {

src/views/index.vue

@@ -1736,7 +1736,9 @@ export default {
       that.interval = null
     },
     mouseLeave() {
+      if (this.interval == null) {
         this.autoScrollindex(67, 50, 0, document.getElementById('warnList'))
+      }
     },
   },
   beforeDestroy() {

src/views/security.vue

@@ -112,7 +112,12 @@
       </div>
       <div class="rightTwo">
         <div class="title" style="height: 10%">安防报警管理</div>
-        <div class="police" id="policeId" @mouseenter="mouseOver1" @mouseleave="mouseLeave1">
+        <div
+          class="police"
+          id="policeId"
+          @mouseenter="mouseOver1"
+          @mouseleave="mouseLeave1"
+        >
           <div class="warnList" v-for="(item, index) in policeList" :key="index">
             <span>{{ item.id }}</span>
             <img :src="item.icon" />
@@ -316,9 +321,9 @@ export default {
     };
   },
   mounted() {
-    window['getsecurity']= (name) => {
-          console.log("name",name)
-    }
+    window["getsecurity"] = (name) => {
+      console.log("name", name);
+    };
     // setTimeout(() => {
     window["getWarning"] = (name) => {
       // alert("goPage:"+b);
@@ -816,21 +821,25 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
-      that.intervalTime = null
+      that.intervalTime = null;
     },
     mouseLeave() {
-      let name = 'fire'
+      if (this.intervalTime == null) {
+        let name = "fire";
         this.autoScrollsecurity(67, 50, 0, document.getElementById("fireId"), name);
+      }
     },
     //鼠标移入事件
     mouseOver1() {
       let that = this;
       clearInterval(that.intervalTime1);
-      that.intervalTime1 = null
+      that.intervalTime1 = null;
     },
     mouseLeave1() {
-      let name = 'police'
+      if (this.intervalTime1 == null) {
+        let name = "police";
         this.autoScrollsecurity(67, 50, 0, document.getElementById("policeId"), name);
+      }
     },
   },
   beforeDestroy() {
@@ -838,8 +847,8 @@ export default {
     // 离开当前路由前的操作
     clearInterval(that.intervalTime);
     clearInterval(that.intervalTime1);
-    that.intervalTime = null
-    that.intervalTime1 = null
+    that.intervalTime = null;
+    that.intervalTime1 = null;
   },
   components: {},
 };