代码提交

package-lock.json

@@ -8151,7 +8151,7 @@
       "version": "1.2.13",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
       "hasInstallScript": true,
       "optional": true,
       "os": [

package.json

@@ -35,6 +35,8 @@
     "@vue/cli-plugin-babel": "^3.0.4",
     "@vue/cli-service": "^3.0.4",
     "mini-css-extract-plugin": "^2.7.2",
+    "sass": "^1.26.5",
+    "sass-loader": "^8.0.2",
     "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();
       };
     };
   },

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

@@ -132,23 +132,23 @@ export default {
   },
   mounted() {
     // setTimeout(() => {
-      window.alarmFirstLevel = this.alarmFirstLevel;
+    window.alarmFirstLevel = this.alarmFirstLevel;
-      window.alarmSecondLevel = this.alarmSecondLevel;
+    window.alarmSecondLevel = this.alarmSecondLevel;
-      window.alarmThirdLevel = this.alarmThirdLevel;
+    window.alarmThirdLevel = this.alarmThirdLevel;
-      // window.createMqtt = this.createMqtt();
+    // window.createMqtt = this.createMqtt();
-      // console.log(this.$moment('2023-04-03T10:05:31').format("YYYY-MM-DD HH:mm:ss"),'ssssss222222');
+    // console.log(this.$moment('2023-04-03T10:05:31').format("YYYY-MM-DD HH:mm:ss"),'ssssss222222');
-      //一级告警
+    //一级告警
-      this.getFirstAlarm();
+    this.getFirstAlarm();
-      //二级告警
+    //二级告警
-      this.getSecondAlarm();
+    this.getSecondAlarm();
-      //三级告警
+    //三级告警
-      this.getThirdAlarm();
+    this.getThirdAlarm();
-      //
+    //
-      let name = "courtHouse2";
+    let name = "courtHouse2";
-      let name1 = "courtHouse3";
+    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,30 +388,36 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
-      that.intervalTime = null
+      that.intervalTime = null;
     },
     mouseLeave() {
-      this.autoScroll2(67, 50, 0, document.getElementById("courtHouse"));
+      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) {
-      this.autoScroll(67, 50, 0, document.getElementById("courtHouse2"),name);
+        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) {
-      this.autoScroll(67, 50, 0, document.getElementById("courtHouse3"),name);
+        let name = "courtHouse3";
+        this.autoScrollalarm(67, 50, 0, document.getElementById("courtHouse3"), name);
+      }
     },
   },
   beforeDestroy() {
@@ -420,6 +426,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,11 +1113,11 @@ export default {
     mouseOver() {
       let that = this
       clearInterval(that.interval);
-      that.interval = null
+      that.interval = null;
     },
     mouseLeave() {
       if (this.interval == null) {
-      this.autoScroll(67, 50, 0, document.getElementById("equipmentWarnList"));
+         this.autoScrollenergySaving(67, 50, 0, document.getElementById("equipmentWarnList"));
       }
     },
   },

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,12 @@
       </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,122 +321,125 @@ export default {
     };
   },
   mounted() {
+    window["getsecurity"] = (name) => {
+      console.log("name", name);
+    };
     // setTimeout(() => {
-      window["getWarning"] = (name) => {
+    window["getWarning"] = (name) => {
-        // alert("goPage:"+b);
+      // alert("goPage:"+b);
-        // console.log("name",name)
+      // console.log("name",name)
-        if (name.indexOf("法院一层") != -1) {
+      if (name.indexOf("法院一层") != -1) {
-          if (
+        if (
-            name.indexOf("走道") != -1 ||
+          name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
+          name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1 ||
+          name.indexOf("楼梯") != -1 ||
-            name.indexOf("自助立案") != -1 ||
+          name.indexOf("自助立案") != -1 ||
-            name.indexOf("门厅") != -1 ||
+          name.indexOf("门厅") != -1 ||
-            name.indexOf("展厅") != -1
+          name.indexOf("展厅") != -1
-          ) {
+        ) {
-            // console.log("消防联动,主楼一层,公共区");
+          // console.log("消防联动,主楼一层,公共区");
-          } else {
+        } else {
-            //  console.log("消防联动,主楼一层,办公区");
+          //  console.log("消防联动,主楼一层,办公区");
-          }
-        } else if (name.indexOf("法院四层") != -1) {
-          if (
-            name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1 ||
-            name.indexOf("自助立案") != -1
-          ) {
-            // console.log("消防联动,主楼四层,公共区");
-          } else {
-            // console.log("消防联动,主楼四层,办公区");
-          }
-        } else if (name.indexOf("法院二层") != -1) {
-          //console.log("消防联动 主楼二层");
-          if (
-            name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1 ||
-            name.indexOf("自助立案") != -1
-          ) {
-            //console.log("消防联动,主楼二层,公共区");
-          } else {
-            // console.log("消防联动,主楼二层,办公区");
-          }
-        } else if (name.indexOf("法院三层") != -1) {
-          // console.log("消防联动 主楼三层");
-          if (
-            name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1 ||
-            name.indexOf("自助立案") != -1
-          ) {
-            //console.log("消防联动,主楼三层,公共区");
-          } else {
-            // console.log("消防联动,主楼三层,办公区");
-          }
-        } else if (name.indexOf("辅楼1层") != -1) {
-          // console.log("消防联动 辅楼一层");
-          if (
-            name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1 ||
-            name.indexOf("自助立案") != -1
-          ) {
-            //console.log("消防联动,辅楼一层,公共区");
-          } else {
-            // console.log("消防联动,辅楼一层,办公区");
-          }
-        } else if (name.indexOf("辅楼2层") != -1) {
-          // console.log("消防联动 辅楼二层");
-          if (
-            name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1
-          ) {
-            // console.log("消防联动,辅楼二层,公共区");
-          } else {
-            // console.log("消防联动,辅楼二层,办公区");
-          }
-        } else if (name.indexOf("辅楼3层") != -1) {
-          //console.log("消防联动 辅楼三层");
-          if (
-            name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1 ||
-            name.indexOf("电梯") != -1
-          ) {
-            //console.log("消防联动,辅楼三层,公共区");
-          } else {
-            // console.log("消防联动,辅楼三层,办公区");
-          }
-        } else if (name.indexOf("辅楼4层") != -1) {
-          //console.log("消防联动 辅楼四层");
-          if (
-            name.indexOf("走道") != -1 ||
-            name.indexOf("大厅") != -1 ||
-            name.indexOf("楼梯") != -1 ||
-            name.indexOf("电梯") != -1
-          ) {
-            // console.log("消防联动,辅楼四层,公共区");
-          } else {
-            // console.log("消防联动,辅楼四层,办公区");
-          }
         }
-      };
+      } else if (name.indexOf("法院四层") != -1) {
-      this.getAnfang();
+        if (
-      //获取消防告警
+          name.indexOf("走道") != -1 ||
-      this.getPoliceList();
+          name.indexOf("大厅") != -1 ||
-      this.getFireWarnList();
+          name.indexOf("楼梯") != -1 ||
-      // 获取安防告警
+          name.indexOf("自助立案") != -1
+        ) {
+          // console.log("消防联动,主楼四层,公共区");
+        } else {
+          // console.log("消防联动,主楼四层,办公区");
+        }
+      } else if (name.indexOf("法院二层") != -1) {
+        //console.log("消防联动 主楼二层");
+        if (
+          name.indexOf("走道") != -1 ||
+          name.indexOf("大厅") != -1 ||
+          name.indexOf("楼梯") != -1 ||
+          name.indexOf("自助立案") != -1
+        ) {
+          //console.log("消防联动,主楼二层,公共区");
+        } else {
+          // console.log("消防联动,主楼二层,办公区");
+        }
+      } else if (name.indexOf("法院三层") != -1) {
+        // console.log("消防联动 主楼三层");
+        if (
+          name.indexOf("走道") != -1 ||
+          name.indexOf("大厅") != -1 ||
+          name.indexOf("楼梯") != -1 ||
+          name.indexOf("自助立案") != -1
+        ) {
+          //console.log("消防联动,主楼三层,公共区");
+        } else {
+          // console.log("消防联动,主楼三层,办公区");
+        }
+      } else if (name.indexOf("辅楼1层") != -1) {
+        // console.log("消防联动 辅楼一层");
+        if (
+          name.indexOf("走道") != -1 ||
+          name.indexOf("大厅") != -1 ||
+          name.indexOf("楼梯") != -1 ||
+          name.indexOf("自助立案") != -1
+        ) {
+          //console.log("消防联动,辅楼一层,公共区");
+        } else {
+          // console.log("消防联动,辅楼一层,办公区");
+        }
+      } else if (name.indexOf("辅楼2层") != -1) {
+        // console.log("消防联动 辅楼二层");
+        if (
+          name.indexOf("走道") != -1 ||
+          name.indexOf("大厅") != -1 ||
+          name.indexOf("楼梯") != -1
+        ) {
+          // console.log("消防联动,辅楼二层,公共区");
+        } else {
+          // console.log("消防联动,辅楼二层,办公区");
+        }
+      } else if (name.indexOf("辅楼3层") != -1) {
+        //console.log("消防联动 辅楼三层");
+        if (
+          name.indexOf("走道") != -1 ||
+          name.indexOf("大厅") != -1 ||
+          name.indexOf("楼梯") != -1 ||
+          name.indexOf("电梯") != -1
+        ) {
+          //console.log("消防联动,辅楼三层,公共区");
+        } else {
+          // console.log("消防联动,辅楼三层,办公区");
+        }
+      } else if (name.indexOf("辅楼4层") != -1) {
+        //console.log("消防联动 辅楼四层");
+        if (
+          name.indexOf("走道") != -1 ||
+          name.indexOf("大厅") != -1 ||
+          name.indexOf("楼梯") != -1 ||
+          name.indexOf("电梯") != -1
+        ) {
+          // console.log("消防联动,辅楼四层,公共区");
+        } else {
+          // console.log("消防联动,辅楼四层,办公区");
+        }
+      }
+    };
+    this.getAnfang();
+    //获取消防告警
+    this.getPoliceList();
+    this.getFireWarnList();
+    // 获取安防告警
 
-      //获取安防统计今天昨天报警数量
+    //获取安防统计今天昨天报警数量
-      this.getAlarmCount();
+    this.getAlarmCount();
-      window.alarmFirstLevel = this.alarmFirstLevel;
+    window.alarmFirstLevel = this.alarmFirstLevel;
-      window.alarmSecondLevel = this.alarmSecondLevel;
+    window.alarmSecondLevel = this.alarmSecondLevel;
-      window.alarmThirdLevel = this.alarmThirdLevel;
+    window.alarmThirdLevel = this.alarmThirdLevel;
-      let name = "fire";
+    let name = "fire";
-      let name1 = "police";
+    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 +732,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])
@@ -735,8 +744,11 @@ 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,22 +821,24 @@ export default {
     mouseOver() {
       let that = this;
       clearInterval(that.intervalTime);
-      that.intervalTime = null
+      that.intervalTime = null;
     },
     mouseLeave() {
-      let name = 'fire'
+      if (this.intervalTime == null) {
-      this.autoScroll(67, 50, 0, document.getElementById("fire"),name);
+        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() {
       if (this.intervalTime1 == null) {
-        let name = 'police'
+        let name = "police";
-        this.autoScroll(67, 50, 0, document.getElementById("police"),name);
+        this.autoScrollsecurity(67, 50, 0, document.getElementById("policeId"), name);
       }
     },
   },
@@ -833,6 +847,8 @@ export default {
     // 离开当前路由前的操作
     clearInterval(that.intervalTime);
     clearInterval(that.intervalTime1);
+    that.intervalTime = null;
+    that.intervalTime1 = null;
   },
   components: {},
 };