src/components/chart/pie/dual-pie-chart.vue

@@ -39,6 +39,7 @@ export default {
       default: true,
     },
     title: { type: String, default: "" },
+    type: { type: Number, default: 0 },
   },
   data() {
     return {
@@ -53,7 +54,8 @@ export default {
       //   let legend1 = this.innerData.map((v) => v.name);
       //   let legend2 = this.outerData.map((v) => v.name);
       //   let legendData = [...legend1, ...legend2];
-
+      let type = this.type;
+     
       let option = {
         title: {
           text: this.title,
@@ -67,7 +69,13 @@ export default {
         tooltip: {
           trigger: "item",
           formatter: function (params) {
-            return params.marker + params.name + " " + params.value + "%";
+            return (
+              params.marker +
+              params.name +
+              " " +
+              params.value +
+              (type == 1 ? "次" : "%")
+            );
           },
         },
         legend: {

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/HealthControl/healthManagement/overview/index.vue

@@ -54,7 +54,7 @@
             :outerData="healPieData"
             :height="'150px'"
           /> -->
-          <dual-pie-chart :series="healPieData" :height="'150px'" />
+          <dual-pie-chart :series="healPieData" :height="'150px'" :type="1"/>
         </panel>
       </Col>
       <Col :span="12">
@@ -64,7 +64,7 @@
             :outerData="stopPieData"
             :height="'150px'"
           /> -->
-          <dual-pie-chart :series="stopPieData" :height="'150px'" />
+          <dual-pie-chart :series="stopPieData" :height="'150px'" :type="1"/>
         </panel>
       </Col>
       <!-- <Col :span="16">

src/views/Home/components/map.vue

@@ -1459,9 +1459,9 @@ export default {
         wpId.includes("FDC") || wpId.includes("GDC") ? wpId : wpId + activeTab;
       this.requestData();
       this.findProjectPlan();
-      //   this.timmer = setInterval(() => {
-      //     this.requestData();
-      //   }, 5000);
+        this.timmer = setInterval(() => {
+          this.requestData();
+        }, 5000);
 
       this.timmer2 = setInterval(() => {
         this.findProjectPlan(); //发电量

src/views/economicsOperation/photovoltaicAnalyse/prAnalyse/index.vue

@@ -226,8 +226,14 @@ export default {
           this.tableData = res.data.map((i) => {
             return {
               ...i,
-              prhbzzl: i.prhbzzl ? i.prhbzzl.toFixed(2) : i.prhbzzl,
-              prtbzzl: i.prtbzzl ? i.prtbzzl.toFixed(2) : i.prtbzzl,
+              prhbzzl:
+                i.prhbzzl && typeof i.prhbzzl == "number"
+                  ? i.prhbzzl.toFixed(2)
+                  : i.prhbzzl,
+              prtbzzl:
+                i.prtbzzl && typeof i.prtbzzl == "number"
+                  ? i.prtbzzl.toFixed(2)
+                  : i.prtbzzl,
             };
           });
         }

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"

src/views/stateMonitor/factoryMonitor/components/headerButton.vue

@@ -244,7 +244,13 @@ export default {
         type: this.type,
       });
       if (data.data.length) {
-        this.allPowerStation = data.data;
+        this.allPowerStation =
+          this.type == -2
+            ? [
+                ...data.data,
+                { aname: "阳泉城新电站",nemCode:'SXJ_KGDL_CX_GDC_STA' },
+              ]
+            : data.data;
         let index = Object.keys(this.localWpinfo).length
           ? this.allPowerStation.findIndex(
               (item) => item.nemCode == this.localWpinfo.wpid

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrix/index.vue

@@ -715,27 +715,35 @@ export default {
     // 获取单场站矩阵数据
     getSingleMatrix(first) {
       if (first) {
-        this.BASE.showLoading();
+        if (this.stationCode == "SXJ_KGDL_CX_GDC_STA") {
+          this.BASE.closeLoading();
+        } else {
+          this.BASE.showLoading();
+        }
       }
       if (this.stationCode) {
-        api
-          .matrixSinglePushFL({ wpid: this.stationCode, type: this.tab })
-          .then(({ data }) => {
-            if (
-              Object.keys(data).indexOf(`${this.tab.toLowerCase()}zqsl`) !=
-                -1 &&
-              data.qtsj.czid == this.stationCode
-            ) {
-              this.BASE.closeLoading();
-              this.matrixState = data.mxzt;
-              this.matrixOther = data.qtsj;
-              this.singleMatrixInfo = data.ZQ;
-              if (this.current) {
-                this.handleClick(this.current);
+        if (this.stationCode == "SXJ_KGDL_CX_GDC_STA") {
+          this.singleMatrixInfo = {};
+        } else {
+          api
+            .matrixSinglePushFL({ wpid: this.stationCode, type: this.tab })
+            .then(({ data }) => {
+              if (
+                Object.keys(data).indexOf(`${this.tab.toLowerCase()}zqsl`) !=
+                  -1 &&
+                data.qtsj.czid == this.stationCode
+              ) {
+                this.BASE.closeLoading();
+                this.matrixState = data.mxzt;
+                this.matrixOther = data.qtsj;
+                this.singleMatrixInfo = data.ZQ;
+                if (this.current) {
+                  this.handleClick(this.current);
+                }
               }
-            }
-            // this.BASE.closeLoading();
-          });
+              // this.BASE.closeLoading();
+            });
+        }
       }
     },
     // 点击左侧数据弹出详情

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrixMonitor/index.vue

@@ -316,6 +316,7 @@ import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import LightDetail from "@/components/lightDetial/index.vue";
 import api from "@/api/cockpit/matrix/index.js";
 import dayjs from "dayjs";
+import { dataObj } from "@/utills/mock-yangquandianzhan.js";
 import { deepClone, findUpColor } from "@/utills/func.js";
 export default {
   name: "lightMatrixMonitor",
@@ -327,6 +328,7 @@ export default {
   },
   data() {
     return {
+      dataObj,
       units: [],
       unitDatas: [{ flag: false, min: 0, max: 0, codex: 0 }],
       color: [
@@ -703,13 +705,20 @@ export default {
     // 获取单场站矩阵数据
     getSingleMatrix() {
       if (this.stationCode) {
-        api.matrixSinglePush({ wpid: this.stationCode }).then(({ data }) => {
-          let resData = data.data;
-          this.singleMatrixInfo = resData;
+        if (this.stationCode == "SXJ_KGDL_CX_GDC_STA") {
+          this.singleMatrixInfo = this.dataObj;
           if (this.current) {
             this.handleClick(this.current);
           }
-        });
+        } else {
+          api.matrixSinglePush({ wpid: this.stationCode }).then(({ data }) => {
+            let resData = data.data;
+            this.singleMatrixInfo = resData;
+            if (this.current) {
+              this.handleClick(this.current);
+            }
+          });
+        }
       }
     },
     // 点击左侧数据弹出曲线
@@ -1635,7 +1644,7 @@ p {
           height: 50px;
 
           .card-left {
-            width: 50px;
+            width: 65px;
             height: 100%;
             display: flex;
             flex-direction: column;