20230519

package.json

@@ -19,6 +19,7 @@
     "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",
@@ -35,6 +36,7 @@
     "@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",
     "vue-template-compiler": "^2.6.10",
     "webpack": "^4.0.0"
   },

src/App.vue

@@ -136,10 +136,6 @@ export default {
       // alert("goPage:"+b);
       console.log("b");
     };
-    //  window['goIndex'] = (a) => {
-    //     console.log(a)
-    // };
-    // window.goPage = this.goPage();
     this.menuChange(0, this.menuBtn[0].name);
     let week = new Date(this.$moment().format("YYYY-MM-DD")).getDay();
     this.week = this.weekList[week];
@@ -157,7 +153,7 @@ export default {
           document.documentElement.clientWidth ||
           document.body.clientWidth),
           (that.screenWidth = window.screenWidth);
-        that.fun();
+        // that.fun();
       };
     };
   },
@@ -186,7 +182,7 @@ export default {
             item.icon = require("./assets/images/gaoJing.png");
           }
         }
-      });
+      }); 
       if (index == 0) {
         this.menuBtn[index].icon = require("./assets/images/shouYeAc.png");
         this.$router.push("/");
@@ -262,7 +258,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%;

src/assets/home.scss

@@ -0,0 +1,15 @@
+.elDatePicker.el-picker-panel {
+    color: #fff;//设置当前面板的月份的字体为白色，记为1
+    background: #002450;//定义整体面板的颜色
+    border: 1px solid #1384b4;//定义整体面板的轮廓
+    .el-picker-panel__icon-btn {//设置年份月份调节按钮颜色，记为2
+      color: #ffffff;
+     }
+    .el-date-picker__header-label{//设置年月显示颜色，记为3
+        color: #ffffff;
+    }
+    .el-date-table th {//设置星期颜色，记为4
+        color:#ffffff;
+    }
+    
+  }

src/views/alarm.vue

@@ -146,9 +146,9 @@ export default {
       //
       let name = "courtHouse2";
       let name1 = "courtHouse3";
-      this.autoScroll2(67, 50, 0, document.getElementById("courtHouse"));
+      this.autoScrollalarm2(67, 50, 0, document.getElementById("courtHouse"));
-      this.autoScroll(67, 50, 0, document.getElementById("courtHouse2"), name);
+      this.autoScrollalarm(67, 50, 0, document.getElementById("courtHouse2"), name);
-      this.autoScroll(67, 50, 0, document.getElementById("courtHouse3"), name1);
+      this.autoScrollalarm(67, 50, 0, document.getElementById("courtHouse3"), name1);
     // }, 1000);
   },
   watch: {
@@ -278,7 +278,7 @@ export default {
         }
       }
     },
-    autoScroll(stepLength, speed, delay, element, name) {
+    autoScrollalarm(stepLength, speed, delay, element, name) {
       let that = this;
       if (name == "courtHouse2") {
         let step = 1;
@@ -348,7 +348,7 @@ export default {
         }
       }
     },
-    autoScroll2(stepLength, speed, delay, element) {
+    autoScrollalarm2(stepLength, speed, delay, element) {
       let that = this;
       let step = 1;
       element.scrollTop = 0;
@@ -388,27 +388,30 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
+      that.intervalTime = null
     },
     mouseLeave() {
-      this.autoScroll2(67, 50, 0, document.getElementById("courtHouse"));
+      this.autoScrollalarm2(67, 50, 0, document.getElementById("courtHouse"));
     },
     //鼠标移入事件
     mouseOver2() {
       let that = this;
       clearInterval(that.intervalTime1);
+      that.intervalTime1 = null
     },
     mouseLeave2() {
       let name = 'courtHouse2'
-      this.autoScroll(67, 50, 0, document.getElementById("courtHouse2"),name);
+      this.autoScrollalarm(67, 50, 0, document.getElementById("courtHouse2"),name);
     },
     //鼠标移入事件
     mouseOver3() {
       let that = this;
       clearInterval(that.intervalTime2);
+      that.intervalTime2 = null
     },
     mouseLeave3() {
       let name = 'courtHouse3'
-      this.autoScroll(67, 50, 0, document.getElementById("courtHouse3"),name);
+      this.autoScrollalarm(67, 50, 0, document.getElementById("courtHouse3"),name);
     },
   },
   beforeDestroy() {
@@ -417,6 +420,9 @@ export default {
     clearInterval(that.intervalTime);
     clearInterval(that.intervalTime1);
     clearInterval(that.intervalTime2);
+    that.intervalTime = null
+    that.intervalTime1 = null
+    that.intervalTime2 = null
   },
   components: {},
 };

src/views/camera/cameraBig.vue

@@ -34,7 +34,7 @@ export default {
     };
   },
   mounted(){
-      this.clickSurveillance(this.cameraBig)
+      //this.clickSurveillance(this.cameraBig)
   },
   watch: {
     // cameraBig: {

src/views/energySaving.vue

@@ -396,7 +396,7 @@ export default {
       this.getQOQ();
       this.getYOY();
       // window.createMqtt = this.createMqtt();
-      this.autoScroll(67, 50, 0, document.getElementById("equipmentWarnList"));
+      this.autoScrollenergySaving(67, 50, 0, document.getElementById("equipmentWarnList"));
     // }, 1000);
   },
   watch: {
@@ -1074,7 +1074,7 @@ export default {
       this.equipmentShow = false;
     },
     //自动滚动
-    autoScroll(stepLength, speed, delay, element) {
+    autoScrollenergySaving(stepLength, speed, delay, element) {
       let that = this;
       let step = 1;
       element.scrollTop = 0;
@@ -1113,9 +1113,10 @@ export default {
     mouseOver() {
       let that = this
       clearInterval(that.interval);
+      that.interval = null;
     },
     mouseLeave() {
-      this.autoScroll(67, 50, 0, document.getElementById("equipmentWarnList"));
+      this.autoScrollenergySaving(67, 50, 0, document.getElementById("equipmentWarnList"));
     },
   },
    beforeDestroy() {

src/views/operationMaintenance.vue

@@ -224,9 +224,7 @@ export default {
     };
   },
   mounted() {
-    // setTimeout(() => {
     this.workOrderEcharts();
-    // }, 1000);
   },
   methods: {
     workOrderEcharts() {

src/views/security.vue

@@ -70,7 +70,7 @@
     <div class="right">
       <div class="rightOne">
         <div class="title" style="height: 10%">火灾报警管理</div>
-        <div class="fire" id="fire" @mouseenter="mouseOver" @mouseleave="mouseLeave">
+        <div class="fire" id="fireId" @mouseenter="mouseOver" @mouseleave="mouseLeave">
           <div class="warnList" v-for="(item, index) in fireWarnList" :key="index">
             <img :src="item.icon" />
             <div
@@ -112,7 +112,7 @@
       </div>
       <div class="rightTwo">
         <div class="title" style="height: 10%">安防报警管理</div>
-        <div class="police" id="police" @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,6 +316,9 @@ export default {
     };
   },
   mounted() {
+    window['getsecurity']= (name) => {
+          console.log("name",name)
+    }
     // setTimeout(() => {
       window["getWarning"] = (name) => {
         // alert("goPage:"+b);
@@ -430,8 +433,8 @@ export default {
       window.alarmThirdLevel = this.alarmThirdLevel;
       let name = "fire";
       let name1 = "police";
-      this.autoScroll(67, 50, 0, document.getElementById("fire"), name);
+      this.autoScrollsecurity(67, 50, 0, document.getElementById("fireId"), name);
-      this.autoScroll(67, 50, 0, document.getElementById("police"), name1);
+      this.autoScrollsecurity(67, 50, 0, document.getElementById("policeId"), name1);
     // }, 1000);
   },
 
@@ -724,6 +727,7 @@ export default {
         if (warnListMqtt[i].AlarmLevel == "三级") {
           this.policeList.splice(0, 0, warnListMqtt[i]);
           this.getAlarmCount();
+          this.getsecurity(warnListMqtt[i].position);
         }
         if (warnListMqtt[i].DeviceType == "消防") {
           //console.log("warnListMqtt[i]",warnListMqtt[i])
@@ -734,9 +738,12 @@ export default {
     },
     getWarning: function (name) {
       getWarning(name);
+    },
+     getsecurity: function (name) {
+      getsecurity(name);
     },
     //自动滚动
-    autoScroll(stepLength, speed, delay, element, name) {
+    autoScrollsecurity(stepLength, speed, delay, element, name) {
       let that = this;
 
       if (name == "fire") {
@@ -809,19 +816,21 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
+      that.intervalTime = null
     },
     mouseLeave() {
       let name = 'fire'
-      this.autoScroll(67, 50, 0, document.getElementById("fire"),name);
+      this.autoScrollsecurity(67, 50, 0, document.getElementById("fireId"),name);
     },
     //鼠标移入事件
     mouseOver1() {
       let that = this;
       clearInterval(that.intervalTime1);
+      that.intervalTime1 = null
     },
     mouseLeave1() {
       let name = 'police'
-      this.autoScroll(67, 50, 0, document.getElementById("police"),name);
+      this.autoScrollsecurity(67, 50, 0, document.getElementById("policeId"),name);
     },
   },
   beforeDestroy() {
@@ -829,6 +838,8 @@ export default {
     // 离开当前路由前的操作
     clearInterval(that.intervalTime);
     clearInterval(that.intervalTime1);
+    that.intervalTime = null
+    that.intervalTime1 = null
   },
   components: {},
 };