Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/router/index.js

@@ -271,16 +271,7 @@ export const asyncRoutes = [
           },
         ],
       },
-      //   {
-      //     path: "agc",
-      //     component: () => import("@/views/stateMonitor/Agc/Agc.vue"),
-      //     name: "agc",
-      //     meta: {
-      //       title: "agc",
-      //       icon: "svg-s指标列表",
-      //       permissions: ["jn_fdcz_sjzb"],
-      //     },
-      //   },
+
       {
         path: "lightmatrix", // 基础矩阵
         name: "LightMatrix",
@@ -322,6 +313,16 @@ export const asyncRoutes = [
         },
       },
       {
+        path: "agc",
+        component: () => import("@/views/stateMonitor/Agc/Agc.vue"),
+        name: "agc",
+        meta: {
+          title: "Agc矩阵",
+          icon: "svg-s指标列表",
+          permissions: ["jn_fdcz_sjzb"],
+        },
+      },
+      {
         path: "zhzb", // 综合指标统计
         name: "zhzb",
         component: () =>

src/views/stateMonitor/Agc/Agc.vue

@@ -18,7 +18,7 @@
 <script>
 import AgcPanel from "./components/agc-panel.vue";
 import { getAgcDatas } from "@/api/monitor/index.js";
-import HeaderNav from "@/components/headerNav/index.vue";
+import HeaderNav from "@/components/headerNavSta/index.vue";
 export default {
   // 名称
   name: "Agc", //agc监视
@@ -33,7 +33,7 @@ export default {
       timmer: null, // 计时器
       datas: [],
       activeTab: "all",
-      tabIndex: 0,
+      tabIndex: -1,
       enterpriseIndex: "all",
     };
   },
@@ -44,9 +44,14 @@ export default {
       this.activeTab = activeTab;
       this.tabIndex = activeTab == "all" ? 0 : activeTab == "fc" ? -1 : -2;
       this.enterpriseIndex = enterpriseIndex;
-      this.$nextTick(() => {
+      this.BASE.showLoading();
+      this.datas = [];
+      this.requestData();
+      clearInterval(this.timmer);
+      this.timmer = null;
+      this.timmer = setInterval(() => {
         this.requestData();
-      });
+      }, 5000);
     },
     // 请求服务
     requestData() {
@@ -55,6 +60,7 @@ export default {
           this.enterpriseIndex == "all" ? "0" : this.enterpriseIndex.toString(),
         type: this.tabIndex.toString(),
       }).then((res) => {
+        this.BASE.closeLoading();
         if (res.data) {
           this.datas = res.data.data;
         } else {
@@ -63,18 +69,16 @@ export default {
       });
     },
   },
-  watch: {},
   created() {
     let that = this;
     that.$nextTick(() => {
+      //   this.loading = true;
       that.requestData();
+      that.timmer = setInterval(() => {
+        that.requestData();
+      }, 5000);
     });
   },
-  mounted() {
-    this.timmer = setInterval(() => {
-      this.requestData();
-    }, 5000);
-  },
   unmounted() {
     clearInterval(this.timmer);
     this.timmer = null;

src/views/stateMonitor/Agc/components/agc-panel.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="$store.state.themeName == 'dark' ? 'dark-grid' : 'light-grid'">
+  <div class="dark-grid">
     <div
       class="grid-content"
       style="width: 443px"