From c69ebdc05b4094e1ad330f4868d29efe6ab7ad40 Mon Sep 17 00:00:00 2001
From: chengdandan <2549057906@qq.com>
Date: Wed, 17 May 2023 18:18:26 +0800
Subject: [PATCH] 20230516

---
 src/App.vue                    | 15 ++++-----------
 src/views/alarm.vue            |  3 ++-
 src/views/camera/cameraBig.vue |  2 +-
 src/views/court.vue            |  1 +
 src/views/index.vue            |  6 +++---
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0fbbcab..a526101 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -142,10 +142,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];
@@ -163,7 +159,7 @@ export default {
           document.documentElement.clientWidth ||
           document.body.clientWidth),
           (that.screenWidth = window.screenWidth);
-        that.fun();
+        // that.fun();
       };
     };
   },
@@ -176,7 +172,7 @@ export default {
 //    },
     //菜单选中
     menuChange(index, name) {
-          this.menuBtn.forEach((item, index) => {
+       /*    this.menuBtn.forEach((item, index) => {
         if (index == 0) {
           item.icon = require("./assets/images/shouYe.png");
         } else if (index == 1) {
@@ -190,7 +186,7 @@ export default {
         } else if (index == 5) {
           item.icon = require("./assets/images/gaoJing.png");
         }
-      });
+      }); */
       if (index == 0) {
          this.menuBtn[index].icon = require("./assets/images/shouYeAc.png");
          this.$router.push("/");
@@ -208,14 +204,11 @@ export default {
       } else if (index == 3) {
         this.menuBtn[index].icon = require("./assets/images/anFangAc.png");
         this.$router.push("security");
-        
-        
       } else if (index == 4) {
          this.menuBtn[index].icon = require("./assets/images/yunWeiAc.png"); 
          this.$router.push("operationMaintenance");
        
       } else if (index == 5) {
-        this.menuBtn[index].icon = require("./assets/images/gaoJingAc.png"); 
         this.menuBtn[index].icon = require("./assets/images/gaoJingAc.png"); 
         this.$router.push("alarm");
         
@@ -277,7 +270,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 5f703af..d11d997 100644
--- a/src/views/alarm.vue
+++ b/src/views/alarm.vue
@@ -141,6 +141,7 @@ export default {
     window.alarmFirstLevel =  this.alarmFirstLevel
     window.alarmSecondLevel= this.alarmSecondLevel 
     window.alarmThirdLevel= this.alarmThirdLevel 
+   
     // window.createMqtt = this.createMqtt();
     // console.log(this.$moment('2023-04-03T10:05:31').format("YYYY-MM-DD HH:mm:ss"),'ssssss222222');
     //一级告警
@@ -175,7 +176,7 @@ export default {
      },
   methods: {
  
-
+    
 
     //获取一级告警
     getFirstAlarm() {
diff --git a/src/views/camera/cameraBig.vue b/src/views/camera/cameraBig.vue
index 7dce36d..2044356 100644
--- a/src/views/camera/cameraBig.vue
+++ b/src/views/camera/cameraBig.vue
@@ -34,7 +34,7 @@ export default {
     };
   },
   mounted(){
-      this.clickSurveillance(this.cameraBig)
+      //this.clickSurveillance(this.cameraBig)
   },
   watch: {
     // cameraBig: {
diff --git a/src/views/court.vue b/src/views/court.vue
index 5b6af98..887637f 100644
--- a/src/views/court.vue
+++ b/src/views/court.vue
@@ -338,6 +338,7 @@ export default {
     };
   },
   mounted() {
+    this.getcourt()
     this.caseEcharts();
     this.caseTypeLeft();
     this.caseTypeRight();
diff --git a/src/views/index.vue b/src/views/index.vue
index ad09f60..9336a2a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -516,13 +516,13 @@ export default {
   watch: {
     alarmAllLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      //console.log("alarmAllLevel", val);
+      console.log("alarmAllLevel", val);
       this.upmqttData(val);
     },
   
     alarmFirstLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      //console.log("alarmFirstLevel", val);
+      console.log("alarmFirstLevel", val);
       if (val.length != 0) {
         this.upmqttData(val);
       }
@@ -541,7 +541,7 @@ export default {
     watch: {
     alarmAllLevel(val) {
       // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
-      //console.log("alarmAllLevel",val)
+      console.log("alarmAllLevel",val)
       this.upmqttData(val) 
     },