修改首页地图、修改光伏阵区设备图片

.env.development

@@ -1,8 +1,10 @@
 # VUE_APP_API=http://10.81.3.155:8020
+# VUE_APP_API=http://192.168.1.104:6060
 VUE_APP_API=http://10.81.3.153:6060
 
 # 经济运行 安全监视 
 VUE_APP_Matrix=http://10.81.3.153:6060
+# VUE_APP_Matrix=http://192.168.1.104:6060
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 

src/api/home/home.js

@@ -32,3 +32,10 @@ export function FindPlanproject(data) {
     method: "get",
   });
 }
+export function FindProjectplan(data) {
+  return request({
+    baseURL: process.env.VUE_APP_Matrix,
+    url: `cockpit/projectplan?wpId=${data.wpId}`,
+    method: "get",
+  });
+}

src/views/Home/Home.vue

@@ -7,6 +7,7 @@
         :homeSuspensionWindowsData="homeSuspensionWindowsData"
         :ForecastPowerNewHome_fc="ForecastPowerNewHome_fc"
         :ForecastPowerNewHome_gf="ForecastPowerNewHome_gf"
+        :qyPower="qyPower"
         :powerDataHome="powerDataHome"
         :mapList="mapList"
         :StationinformationData="StationinformationData"
@@ -59,7 +60,11 @@
 </template>
 
 <script>
-import { FindBasicDataInfo, FindPowerInfo } from "@/api/home/home.js";
+import {
+  FindBasicDataInfo,
+  FindPowerInfo,
+  FindProjectplan,
+} from "@/api/home/home.js";
 
 import MultipleLineChartHome from "@/components/chart/line/double-line-chart-home.vue";
 import ListBarChart2Home from "../../components/chart/bar/list-bar-chart2-home.vue";
@@ -119,6 +124,7 @@ export default {
       powerDataHome: {},
       ForecastPowerNewHome_fc: [],
       ForecastPowerNewHome_gf: [],
+      qyPower: {},
       homeSuspensionWindowsData: [],
       CurveValues: {
         value: [
@@ -303,9 +309,10 @@ export default {
     // 请求服务
     requestData() {
       FindBasicDataInfo({ wpId: this.wpIds }).then(({ data }) => {
+        this.StationinformationData = data;
+        this.StationinformationData.cblpoint.fcShow = true;
+        this.StationinformationData.cblpoint.gfShow = true;
         if (Object.keys(data).length) {
-          this.StationinformationData = data;
-
           let mapInfos = [];
           this.mapList.forEach((item) => {
             for (var key in data.sytc) {
@@ -319,146 +326,60 @@ export default {
             element.industryState = true;
             element.companyState = true;
             if (element.name == "山西") {
-              //   if (
-              //     element.sxcyzzjrl == 0 &&
-              //     element.sxcyfdcsl == 0 &&
-              //     element.sxcyfdzjrl == 0 &&
-              //     element.sxcygfcsl == 0 &&
-              //     element.sxcygfzjrl == 0
-              //   ) {
-              //     element.industryState = false;
-              //   }
-              //   if (
-              //     element.sxgszzjrl == 0 &&
-              //     element.sxgsfdcsl == 0 &&
-              //     element.sxgsfdzjrl == 0 &&
-              //     element.sxgsgfcsl == 0 &&
-              //     element.sxgsgfzjrl == 0
-              //   ) {
-              //     element.companyState = false;
-              //   }
-
+              if (!Object.hasOwn(element, "sxgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "sxcyzzjrl")) {
+                element.industryState = false;
+              }
               this.homeSuspensionWindowsData.sxqyxx = { ...element };
             } else if (element.name == "新疆") {
-              //   if (
-              //     element.xjcyzzjrl == 0 &&
-              //     element.xjcyfdcsl == 0 &&
-              //     element.xjcyfdzjrl == 0 &&
-              //     element.xjcygfcsl == 0 &&
-              //     element.xjcygfzjrl == 0
-              //   ) {
-              //     element.industryState = false;
-              //   }
-              //   if (
-              //     element.xjgszzjrl == 0 &&
-              //     element.xjgsfdcsl == 0 &&
-              //     element.xjgsfdzjrl == 0 &&
-              //     element.xjgsgfcsl == 0 &&
-              //     element.xjgsgfzjrl == 0
-              //   ) {
-              //     element.companyState = false;
-              //   }
+              if (!Object.hasOwn(element, "xjgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "xjcyzzjrl")) {
+                element.industryState = false;
+              }
               this.homeSuspensionWindowsData.xjqyxx = { ...element };
             } else if (element.name == "内蒙") {
-              //   if (
-              //     element.nmcyzzjrl == 0 &&
-              //     element.nmcyfdcsl == 0 &&
-              //     element.nmcyfdzjrl == 0 &&
-              //     element.nmcygfcsl == 0 &&
-              //     element.nmcygfzjrl == 0
-              //   ) {
-              //     element.industryState = false;
-              //   }
-              //   if (
-              //     element.nmgszzjrl == 0 &&
-              //     element.nmgsfdcsl == 0 &&
-              //     element.nmgsfdzjrl == 0 &&
-              //     element.nmgsgfcsl == 0 &&
-              //     element.nmgsgfzjrl == 0
-              //   ) {
-              //     element.companyState = false;
-              //   }
+              if (!Object.hasOwn(element, "nmgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "nmcyzzjrl")) {
+                element.industryState = false;
+              }
               this.homeSuspensionWindowsData.nmqyxx = { ...element };
             } else if (element.name == "西藏") {
-              //   if (
-              //     element.xzcyzzjrl == 0 &&
-              //     element.xzcyfdcsl == 0 &&
-              //     element.xzcyfdzjrl == 0 &&
-              //     element.xzcygfcsl == 0 &&
-              //     element.xzcygfzjrl == 0
-              //   ) {
-              //     element.industryState = false;
-              //   }
-              //   if (
-              //     element.xzgszzjrl == 0 &&
-              //     element.xzgsfdcsl == 0 &&
-              //     element.xzgsfdzjrl == 0 &&
-              //     element.xzgsgfcsl == 0 &&
-              //     element.xzgsgfzjrl == 0
-              //   ) {
-              //     element.companyState = false;
-              //   }
+              if (!Object.hasOwn(element, "xzgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "xzcyzzjrl")) {
+                element.industryState = false;
+              }
               this.homeSuspensionWindowsData.xzqyxx = { ...element };
             } else if (element.name == "山东") {
-              //   if (
-              //     element.sdcyzzjrl == 0 &&
-              //     element.sdcyfdcsl == 0 &&
-              //     element.sdcyfdzjrl == 0 &&
-              //     element.sdcygfcsl == 0 &&
-              //     element.sdcygfzjrl == 0
-              //   ) {
-              //     element.industryState = false;
-              //   }
-              //   if (
-              //     element.sdgszzjrl == 0 &&
-              //     element.sdgsfdcsl == 0 &&
-              //     element.sdgsfdzjrl == 0 &&
-              //     element.sdgsgfcsl == 0 &&
-              //     element.sdgsgfzjrl == 0
-              //   ) {
-              //     element.companyState = false;
-              //   }
+              if (!Object.hasOwn(element, "sdgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "sdcyzzjrl")) {
+                element.industryState = false;
+              }
               this.homeSuspensionWindowsData.sdqyxx = { ...element };
             } else if (element.name == "陕西") {
-              //   if (
-              //     element.xscyzzjrl == 0 &&
-              //     element.xscyfdcsl == 0 &&
-              //     element.xscyfdzjrl == 0 &&
-              //     element.xscygfcsl == 0 &&
-              //     element.xscygfzjrl == 0
-              //   ) {
-              //     element.industryState = false;
-              //   }
-              //   if (
-              //     element.xsgszzjrl == 0 &&
-              //     element.xsgsfdcsl == 0 &&
-              //     element.xsgsfdzjrl == 0 &&
-              //     element.xsgsgfcsl == 0 &&
-              //     element.xsgsgfzjrl == 0
-              //   ) {
-              //     element.companyState = false;
-              //   }
+              if (!Object.hasOwn(element, "xsgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "xscyzzjrl")) {
+                element.industryState = false;
+              }
               this.homeSuspensionWindowsData.xsqyxx = { ...element };
             } else if (element.name == "河北") {
-              //   if (
-              //     element.hbcyzzjrl == 0 &&
-              //     element.hbcyfdcsl == 0 &&
-              //     element.hbcygfcsl == 0 &&
-              //     element.hbcyfdzjrl == 0 &&
-              //     element.hbcygfcsl == 0 &&
-              //     element.hbcygfzjrl == 0
-              //   ) {
-              //     element.industryState = false;
-              //   }
-              //   if (
-              //     element.hbgszzjrl == 0 &&
-              //     element.hbgsfd == 0 &&
-              //     element.hbgsfdzjrl == 0 &&
-              //     element.hbgsgf == 0 &&
-              //     element.hbgsgfzjrl == 0
-              //   ) {
-              //     element.companyState = false;
-              //   }
+              if (!Object.hasOwn(element, "hbgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "hbcyzzjrl")) {
+                element.industryState = false;
+              }
               this.homeSuspensionWindowsData.hbqyxx = { ...element };
             }
           });
@@ -492,112 +413,7 @@ export default {
               max: 3000,
             },
           ];
-          this.ForecastPowerNewHome_fc = [
-            [
-              {
-                name: "日发电量",
-                id: "day",
-                value: data?.proplanmap
-                  ? data?.proplanmap?.fd_r_sjdl < 0
-                    ? 0
-                    : (data?.proplanmap?.fd_r_sjdl / 10000).toFixed(2)
-                  : 0,
-                color: 1,
-                total: data?.proplanmap
-                  ? data?.proplanmap?.fd_r_jhdl < 0
-                    ? 0
-                    : data?.proplanmap?.fd_r_jhdl
-                  : 0,
-              },
-            ],
-            [
-              {
-                name: "月发电量",
-                id: "month",
-                value: data?.proplanmap
-                  ? data?.proplanmap?.fd_y_sjdl < 0
-                    ? 0
-                    : (data?.proplanmap?.fd_y_sjdl / 10000).toFixed(2)
-                  : 0,
-                color: 1,
-                total: data?.proplanmap
-                  ? data?.proplanmap?.fd_y_jhdl < 0
-                    ? 0
-                    : data?.proplanmap?.fd_y_jhdl
-                  : 0,
-              },
-            ],
-            [
-              {
-                name: "年发电量",
-                id: "year",
-                value: data?.proplanmap
-                  ? data?.proplanmap?.fd_n_sjdl < 0
-                    ? 0
-                    : (data?.proplanmap?.fd_n_sjdl / 10000).toFixed(2)
-                  : 0,
-                color: 0,
-                total: data?.proplanmap
-                  ? data?.proplanmap?.fd_n_jhdl < 0
-                    ? 0
-                    : data?.proplanmap?.fd_n_jhdl
-                  : 0,
-              },
-            ],
-          ];
-          this.ForecastPowerNewHome_gf = [
-            [
-              {
-                name: "日发电量",
-                id: "day",
-                value: data?.proplanmap
-                  ? data?.proplanmap?.gf_r_sjdl < 0
-                    ? 0
-                    : (data?.proplanmap?.gf_r_sjdl / 10000).toFixed(2)
-                  : 0,
-                color: 1,
-                total: data?.proplanmap
-                  ? data?.proplanmap?.gf_r_jhdl < 0
-                    ? 0
-                    : data?.proplanmap?.gf_r_jhdl
-                  : 0,
-              },
-            ],
-            [
-              {
-                name: "月发电量",
-                id: "month",
-                value: data?.proplanmap
-                  ? data?.proplanmap?.gf_y_sjdl < 0
-                    ? 0
-                    : (data?.proplanmap?.gf_y_sjdl / 10000).toFixed(2)
-                  : 0,
-                color: 1,
-                total: data?.proplanmap
-                  ? data?.proplanmap?.gf_y_jhdl < 0
-                    ? 0
-                    : data?.proplanmap?.gf_y_jhdl
-                  : 0,
-              },
-            ],
-            [
-              {
-                name: "年发电量",
-                id: "year",
-                value: data?.proplanmap
-                  ? data?.proplanmap?.gf_n_sjdl < 0
-                    ? 0
-                    : (data?.proplanmap?.gf_n_sjdl / 10000).toFixed(2)
-                  : 0,
-                color: 0,
-                total: data?.proplanmap
-                  ? data?.proplanmap?.gf_n_jhdl < 0
-                    ? 0
-                    : data?.proplanmap?.gf_n_jhdl
-                  : 0,
-              },
-            ],
-          ];
+
           let sbztmap = {
             fd: {},
             gf: {},
@@ -614,6 +430,118 @@ export default {
         }
       });
     },
+    // 发电量
+    findProjectPlan() {
+      FindProjectplan({ wpId: this.wpIds }).then(({ data }) => {
+        this.qyPower = data.proplanmap;
+        this.ForecastPowerNewHome_fc = [
+          [
+            {
+              name: "日发电量",
+              id: "day",
+              value: data?.proplanmap
+                ? data?.proplanmap?.fd_r_sjdl < 0
+                  ? 0
+                  : (data?.proplanmap?.fd_r_sjdl / 10000).toFixed(2)
+                : 0,
+              color: 1,
+              total: data?.proplanmap
+                ? data?.proplanmap?.fd_r_jhdl < 0
+                  ? 0
+                  : data?.proplanmap?.fd_r_jhdl
+                : 0,
+            },
+          ],
+          [
+            {
+              name: "月发电量",
+              id: "month",
+              value: data?.proplanmap
+                ? data?.proplanmap?.fd_y_sjdl < 0
+                  ? 0
+                  : (data?.proplanmap?.fd_y_sjdl / 10000).toFixed(2)
+                : 0,
+              color: 1,
+              total: data?.proplanmap
+                ? data?.proplanmap?.fd_y_jhdl < 0
+                  ? 0
+                  : data?.proplanmap?.fd_y_jhdl
+                : 0,
+            },
+          ],
+          [
+            {
+              name: "年发电量",
+              id: "year",
+              value: data?.proplanmap
+                ? data?.proplanmap?.fd_n_sjdl < 0
+                  ? 0
+                  : (data?.proplanmap?.fd_n_sjdl / 10000).toFixed(2)
+                : 0,
+              color: 0,
+              total: data?.proplanmap
+                ? data?.proplanmap?.fd_n_jhdl < 0
+                  ? 0
+                  : data?.proplanmap?.fd_n_jhdl
+                : 0,
+            },
+          ],
+        ];
+        this.ForecastPowerNewHome_gf = [
+          [
+            {
+              name: "日发电量",
+              id: "day",
+              value: data?.proplanmap
+                ? data?.proplanmap?.gf_r_sjdl < 0
+                  ? 0
+                  : (data?.proplanmap?.gf_r_sjdl / 10000).toFixed(2)
+                : 0,
+              color: 1,
+              total: data?.proplanmap
+                ? data?.proplanmap?.gf_r_jhdl < 0
+                  ? 0
+                  : data?.proplanmap?.gf_r_jhdl
+                : 0,
+            },
+          ],
+          [
+            {
+              name: "月发电量",
+              id: "month",
+              value: data?.proplanmap
+                ? data?.proplanmap?.gf_y_sjdl < 0
+                  ? 0
+                  : (data?.proplanmap?.gf_y_sjdl / 10000).toFixed(2)
+                : 0,
+              color: 1,
+              total: data?.proplanmap
+                ? data?.proplanmap?.gf_y_jhdl < 0
+                  ? 0
+                  : data?.proplanmap?.gf_y_jhdl
+                : 0,
+            },
+          ],
+          [
+            {
+              name: "年发电量",
+              id: "year",
+              value: data?.proplanmap
+                ? data?.proplanmap?.gf_n_sjdl < 0
+                  ? 0
+                  : (data?.proplanmap?.gf_n_sjdl / 10000).toFixed(2)
+                : 0,
+              color: 0,
+              total: data?.proplanmap
+                ? data?.proplanmap?.gf_n_jhdl < 0
+                  ? 0
+                  : data?.proplanmap?.gf_n_jhdl
+                : 0,
+            },
+          ],
+        ];
+      });
+    },
     // 点击地图展示类型
     mapClick(wpId, activeTab) {
       clearInterval(this.timmer);
@@ -625,13 +553,15 @@ export default {
       this.wpIds =
         wpId.includes("FDC") || wpId.includes("GDC") ? wpId : wpId + activeTab;
       this.requestData();
+      this.findProjectPlan();
       this.timmer = setInterval(() => {
         this.requestData();
       }, 5000);
 
       this.timmer2 = setInterval(() => {
+        this.findProjectPlan(); //发电量
         if (this.penetrateType == 3) {
-          this.getData(this.wpIds);
+          this.getData(this.wpIds); //24小时功率曲线
         }
       }, 15 * 60 * 1000);
     },

src/views/Home/components/map.vue

@@ -169,7 +169,7 @@
         <div class="switch-jrqk" v-show="switchShow">
           <div><img src="@/assets/imgs/arrows.png" /> 接入情况</div>
           <ul>
-            <li v-show="tabShow == 0 || tabShow == -1">
+            <li v-show="tabShow == -1 || tabShow == 0">
               <div class="imgs">
                 <img src="@assets/imgs/downF.png" />
                 <img src="@assets/imgs/windup.png" class="qty_img" />
@@ -215,7 +215,7 @@
                 </p>
               </div>
             </li>
-            <li class="line" v-show="activeTab == 0"></li>
+            <li class="line" v-if="tabShow == 0"></li>
             <li v-show="tabShow == 0 || tabShow == -2">
               <div class="imgs">
                 <img src="@assets/imgs/downg.png" />
@@ -388,16 +388,20 @@
           </div>
           <div class="security">
             <div class="lineBox">
-              <span>风电</span
-              ><span class="num font-num">{{
-                StationinformationData?.qt?.fdzzjrl
-              }}</span
-              ><span class="unit">MW</span>
-              <span style="margin: 0 0 0 20px">光伏</span
-              ><span class="num font-num">{{
-                StationinformationData?.qt?.gfzzjrl
-              }}</span
-              ><span class="unit">MW</span>
+              <div v-if="activeTab == -1 || activeTab == 0">
+                <span>风电</span>
+                <span class="num font-num">{{
+                  StationinformationData?.qt?.fdzzjrl
+                }}</span>
+                <span class="unit">MW</span>
+              </div>
+              <div v-if="activeTab == -2 || activeTab == 0">
+                <span>光伏</span>
+                <span class="num font-num">{{
+                  StationinformationData?.qt?.gfzzjrl
+                }}</span>
+                <span class="unit">MW</span>
+              </div>
             </div>
             <div class="text">安全天数:</div>
             <div class="num">
@@ -417,13 +421,13 @@
               <span class="title-name">清洁能源公司</span>
               <span class="title-all-title">总装机容量 :</span>
               <span class="title-all-content" v-if="activeTab == 0">{{
-                Number(StationinformationData?.cblpoint?.qjny_zzjrl) / 1000 || 0
+                Number(StationinformationData?.cblpoint?.qjny_zzjrl) || 0
               }}</span>
               <span class="title-all-content" v-if="activeTab == -1">{{
-                StationinformationData?.cblpoint?.qjny_fd_zjrl / 1000 || 0
+                StationinformationData?.cblpoint?.qjny_fd_zjrl || 0
               }}</span>
               <span class="title-all-content" v-if="activeTab == -2">{{
-                StationinformationData?.cblpoint?.qjny_gf_zjrl / 1000 || 0
+                StationinformationData?.cblpoint?.qjny_gf_zjrl || 0
               }}</span>
               <span class="title-all-unit">MW</span>
             </div>
@@ -502,19 +506,18 @@
           class="energy-system-box box2"
           :class="activeTab == -1 || activeTab == -2 ? 'piggy-tab-width' : ''"
         >
-          <!-- <div class="energy-system-bgc"></div> -->
           <div class="energy-system-content clearfix">
             <div class="title">
               <span class="title-name">系统接入情况</span>
               <span class="title-all-title">总装机容量 :</span>
               <span class="title-all-content" v-if="activeTab == 0">{{
-                Number(StationinformationData?.cblpoint?.jr_zzjrl / 1000) || 0
+                Number(StationinformationData?.cblpoint?.jr_zzjrl) || 0
               }}</span>
               <span class="title-all-content" v-if="activeTab == -1">{{
-                StationinformationData?.cblpoint?.jr_fd_zjrl / 1000 || 0
+                StationinformationData?.cblpoint?.jr_fd_zjrl || 0
               }}</span>
               <span class="title-all-content" v-if="activeTab == -2">{{
-                StationinformationData?.cblpoint?.jr_gf_zjrl / 1000 || 0
+                StationinformationData?.cblpoint?.jr_gf_zjrl || 0
               }}</span>
               <span class="title-all-unit">MW</span>
             </div>
@@ -541,7 +544,7 @@
                     <el-col :span="8"><span>装机容量</span></el-col>
                     <el-col :span="9"
                       ><span>{{
-                        StationinformationData?.cblpoint?.jr_fd_zjrl / 1000
+                        StationinformationData?.cblpoint?.jr_fd_zjrl
                       }}</span></el-col
                     >
                     <el-col :span="7"><span>MW</span></el-col>
@@ -581,7 +584,7 @@
                     <el-col :span="8"><span>装机容量</span></el-col>
                     <el-col :span="9"
                       ><span>{{
-                        StationinformationData?.cblpoint?.jr_gf_zjrl / 1000 || 0
+                        StationinformationData?.cblpoint?.jr_gf_zjrl || 0
                       }}</span></el-col
                     >
                     <el-col :span="7"><span>MW</span></el-col>
@@ -1119,7 +1122,7 @@
             <p>月利用小时</p>
             <p>
               <span>
-                {{ Number(StationinformationData?.qt?.ylyxs).toFixed(2) }}
+                {{ StationinformationData?.qt?.ylyxs?.toFixed(2) }}
               </span>
               <span>小时</span>
             </p>
@@ -1131,9 +1134,7 @@
           >
             <p>年利用小时</p>
             <p>
-              <span>{{
-                Number(StationinformationData?.qt?.nlyxs).toFixed(2)
-              }}</span>
+              <span>{{ StationinformationData?.qt?.nlyxs?.toFixed(2) }}</span>
               <span>小时</span>
             </p>
           </div>
@@ -1344,6 +1345,7 @@ export default {
     mapList: { type: Array, default: () => [] },
     ForecastPowerNewHome_gf: { type: Array, default: () => [] },
     ForecastPowerNewHome_fc: { type: Array, default: () => [] },
+    qyPower: { type: Object, default: () => {} },
     powerDataHome: { type: Object, default: () => {} },
     StationinformationData: { type: Object, default: () => {} },
     CurveValues: { type: Object, default: () => {} },
@@ -1357,38 +1359,15 @@ export default {
   data() {
     return {
       mapName: "KGDL_FGS",
-      switchShow: false,
-      fdlList: [],
-      penetrateType: 0,
-      textType: "期次",
-      fcId: "",
+      switchShow: false, //接入情况弹窗
+      fdlList: [], //山西区域实时负荷列表
+      penetrateType: 0, //24小时功率曲线开关
+      fcId: "", //场站
       showType: "all",
       sourceMap: {},
-      tabs: [
-        {
-          icon: "svg-all",
-          text: "全部",
-          show: "all",
-        },
-        {
-          icon: "svg-wind-site",
-          text: "风电",
-          show: "fc",
-        },
-        {
-          icon: "svg-photovoltaic",
-          text: "光伏",
-          show: "gf",
-        },
-      ],
-      activeTab: 0,
-      img: require("@assets/map/map-nx.png"),
-      nxSvgFile: require("@assets/map/map-nx.svg"),
-      nxmap: true,
-
-      currentTitle: "",
-      currentName: "",
-      currents: 0,
+      activeTab: 0, //当前tab
+      currentTitle: "", //当前名称
+      currents: 0, //当前层级
       stationList: [
         {
           name: "全部",
@@ -1403,11 +1382,11 @@ export default {
       companyid: "",
       companyname: "",
       showName: "",
-      dialogVisible: false,
+      dialogVisible: false, //实时负荷弹窗开关
       chartsData: [],
       electronType: "D",
       showkey: "",
-      dialogElectric: false,
+      dialogElectric: false, //发电量、利用小时弹窗开关
       units: ["万kWh"],
       ratio: 1,
       colors: ["#1c99ff", "#05BB4C"],
@@ -1417,7 +1396,7 @@ export default {
           value: [],
         },
       ],
-      type: "fc",
+      type: "fc", //发电量展示类型
       tabShow: 0,
     };
   },
@@ -1695,23 +1674,23 @@ export default {
     wpId(res) {
       this.fcId = res;
     },
-    StationinformationData(val) {
+    qyPower(val) {
       if (Object.keys(val).length) {
-        let data = val.proplanmap;
+        let data = val;
         this.fdlList = [
           {
             title: "日发电量",
             id: "date",
             value:
-              this.activeTab == 0
+              this.tabShow == 0
                 ? data.qy_r_sjdl
-                : this.activeTab == -1
+                : this.tabShow == -1
                 ? data.fd_r_sjdl
                 : data.gf_r_sjdl,
             value1:
-              this.activeTab == 0
+              this.tabShow == 0
                 ? data.qy_r_jhdl
-                : this.activeTab == -1
+                : this.tabShow == -1
                 ? data.fd_r_jhdl
                 : data.gf_r_jhdl,
           },
@@ -1719,15 +1698,15 @@ export default {
             title: "月发电量",
             id: "month",
             value:
-              this.activeTab == 0
+              this.tabShow == 0
                 ? data.qy_y_sjdl
-                : this.activeTab == -1
+                : this.tabShow == -1
                 ? data.fd_y_sjdl
                 : data.gf_y_sjdl,
             value1:
-              this.activeTab == 0
+              this.tabShow == 0
                 ? data.qy_y_jhdl
-                : this.activeTab == -1
+                : this.tabShow == -1
                 ? data.fd_y_jhdl
                 : data.gf_y_jhdl,
           },
@@ -1735,15 +1714,15 @@ export default {
             title: "年发电量",
             id: "year",
             value:
-              this.activeTab == 0
+              this.tabShow == 0
                 ? data.qy_n_sjdl
-                : this.activeTab == -1
+                : this.tabShow == -1
                 ? data.fd_n_sjdl
                 : data.gf_n_sjdl,
             value1:
-              this.activeTab == 0
+              this.tabShow == 0
                 ? data.qy_n_jhdl
-                : this.activeTab == -1
+                : this.tabShow == -1
                 ? data.fd_n_jhdl
                 : data.gf_n_jhdl,
           },
@@ -2107,6 +2086,10 @@ p {
 
       .security-day {
         .lineBox {
+          display: flex;
+          & > div {
+            margin-right: 20px;
+          }
           margin: 12px 0 15px;
           .num {
             color: @green;

src/views/Home/components/map/SX.vue

@@ -295,7 +295,7 @@
                 font-size="8"
                 @click.stop="clickLabel('DJY_FDC', '右玉丁家窑', penetrateType)"
               >
-                {{}}
+                {{ sourceMap?.station?.SXJ_KGDL_DJY_FDC_STA?.zjts }}
               </text>
               <text
                 class="mapValue"
@@ -916,6 +916,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_HR_GDC_STA', '怀仁初晨', penetrateType)
+            "
           >
             <image
               width="20"
@@ -941,27 +944,27 @@
               <rect
                 x="475"
                 y="27"
-                width="80"
+                width="110"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
               <text class="mapKey" x="478" y="36" fill="#919697" font-size="8">
-                怀仁初晨
+                怀仁初晨 组串式：
               </text>
               <text
                 class="mapValue"
-                x="515"
+                x="545"
                 y="36"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.HR_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_HR_GDC_STA?.zczjts }}
               </text>
               <text
                 class="mapValue"
-                x="535"
+                x="565"
                 y="36"
                 fill="#919697"
                 font-size="8"
@@ -978,6 +981,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_YG_GDC_STA', '阳高蔚家堡', penetrateType)
+            "
           >
             <image
               width="20"
@@ -1001,30 +1007,48 @@
               "
             >
               <rect
-                x="495"
-                y="39"
-                width="80"
+                x="455"
+                y="45"
+                width="160"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
-              <text class="mapKey" x="497" y="48" fill="#919697" font-size="8">
-                阳高蔚家堡
+              <text class="mapKey" x="458" y="54" fill="#919697" font-size="8">
+                阳高蔚家堡 集中式：
               </text>
               <text
                 class="mapValue"
-                x="540"
-                y="48"
+                x="529"
+                y="54"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.YG_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_YG_GDC_STA?.jzzjts }}
               </text>
               <text
                 class="mapValue"
-                x="560"
-                y="48"
+                x="545"
+                y="54"
+                fill="#919697"
+                font-size="8"
+              >
+                台 组串式：
+              </text>
+              <text
+                class="mapValue"
+                x="585"
+                y="54"
+                fill="#05bb4c"
+                font-size="8"
+              >
+                {{ sourceMap?.station?.SXJ_KGDL_YG_GDC_STA?.zczjts }}
+              </text>
+              <text
+                class="mapValue"
+                x="605"
+                y="54"
                 fill="#919697"
                 font-size="8"
               >
@@ -1040,6 +1064,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_YX_GDC_STA', '应县晶辉', penetrateType)
+            "
           >
             <image
               width="20"
@@ -1065,27 +1092,27 @@
               <rect
                 x="452"
                 y="51"
-                width="80"
+                width="110"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
               <text class="mapKey" x="455" y="60" fill="#919697" font-size="8">
-                应县晶辉
+                应县晶辉 集中式：
               </text>
               <text
                 class="mapValue"
-                x="500"
+                x="520"
                 y="60"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.YX_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_YX_GDC_STA?.jzzjts }}
               </text>
               <text
                 class="mapValue"
-                x="520"
+                x="540"
                 y="60"
                 fill="#919697"
                 font-size="8"
@@ -1102,6 +1129,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_YY_GDC_STA', '右玉右卫', penetrateType)
+            "
           >
             <image
               width="20"
@@ -1127,27 +1157,45 @@
               <rect
                 x="440"
                 y="10"
-                width="80"
+                width="160"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
               <text class="mapKey" x="443" y="19" fill="#919697" font-size="8">
-                右玉右卫
+                右玉右卫 集中式：
               </text>
               <text
                 class="mapValue"
-                x="482"
+                x="510"
                 y="19"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.YY_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_YY_GDC_STA?.jzzjts }}
               </text>
               <text
                 class="mapValue"
-                x="505"
+                x="530"
+                y="19"
+                fill="#919697"
+                font-size="8"
+              >
+                台 组串式：
+              </text>
+              <text
+                class="mapValue"
+                x="570"
+                y="19"
+                fill="#05bb4c"
+                font-size="8"
+              >
+                {{ sourceMap?.station?.SXJ_KGDL_YY_GDC_STA?.zczjts }}
+              </text>
+              <text
+                class="mapValue"
+                x="590"
                 y="19"
                 fill="#919697"
                 font-size="8"
@@ -1164,6 +1212,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_JR_GDC_STA', '繁峙均然', penetrateType)
+            "
           >
             <image
               width="20"
@@ -1189,27 +1240,27 @@
               <rect
                 x="462"
                 y="82"
-                width="80"
+                width="110"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
               <text class="mapKey" x="465" y="91" fill="#919697" font-size="8">
-                繁峙均然
+                繁峙均然 组串式：
               </text>
               <text
                 class="mapValue"
-                x="505"
+                x="530"
                 y="91"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.JR_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_JR_GDC_STA?.zczjts }}
               </text>
               <text
                 class="mapValue"
-                x="525"
+                x="545"
                 y="91"
                 fill="#919697"
                 font-size="8"
@@ -1226,6 +1277,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_TL_GDC_STA', '屯留吾元', penetrateType)
+            "
           >
             <image
               v-if="sourceMap.TL_GDC_fczt === 3"
@@ -1251,27 +1305,27 @@
               <rect
                 x="394"
                 y="233"
-                width="70"
+                width="110"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
               <text class="mapKey" x="398" y="242" fill="#919697" font-size="8">
-                屯留吾元
+                屯留吾元 组串式：
               </text>
               <text
                 class="mapValue"
-                x="440"
+                x="460"
                 y="242"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.TL_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_TL_GDC_STA?.zczjts }}
               </text>
               <text
                 class="mapValue"
-                x="455"
+                x="485"
                 y="242"
                 fill="#919697"
                 font-size="8"
@@ -1288,6 +1342,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_FS_GDC_STA', '方山孙家山', penetrateType)
+            "
           >
             <image
               v-if="sourceMap.FS_GDC_fczt === 3"
@@ -1313,27 +1370,27 @@
               <rect
                 x="245"
                 y="117"
-                width="80"
+                width="110"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
               <text class="mapKey" x="247" y="126" fill="#919697" font-size="8">
-                方山孙家山
+                方山孙家山 集中式：
               </text>
               <text
                 class="mapValue"
-                x="295"
+                x="320"
                 y="126"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.FS_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_FS_GDC_STA?.jzzjts }}
               </text>
               <text
                 class="mapValue"
-                x="310"
+                x="340"
                 y="126"
                 fill="#919697"
                 font-size="8"
@@ -1350,6 +1407,9 @@
               showType === 'gf' ||
               companyid == 'SXJ_KGDL_GFFD_ZGS0'
             "
+            @click.stop="
+              clickLabel('SXJ_KGDL_PL_GDC_STA', '平鲁阻虎', penetrateType)
+            "
           >
             <image
               v-if="sourceMap.PL_GDC_fczt === 3"
@@ -1373,30 +1433,30 @@
               "
             >
               <rect
-                x="295"
-                y="45"
-                width="80"
+                x="255"
+                y="38"
+                width="110"
                 height="12"
                 stroke="#46C55A35"
                 fill="#000000"
                 opacity="0.8"
               />
-              <text class="mapKey" x="300" y="54" fill="#919697" font-size="8">
-                平鲁阻虎
+              <text class="mapKey" x="258" y="47" fill="#919697" font-size="8">
+                平鲁阻虎 集中式：
               </text>
               <text
                 class="mapValue"
-                x="345"
-                y="54"
+                x="325"
+                y="47"
                 fill="#05bb4c"
                 font-size="8"
               >
-                {{ sourceMap.PL_GDC_zjts }}
+                {{ sourceMap?.station?.SXJ_KGDL_PL_GDC_STA?.jzzjts }}
               </text>
               <text
                 class="mapValue"
-                x="360"
-                y="54"
+                x="345"
+                y="47"
                 fill="#919697"
                 font-size="8"
               >

src/views/Home/components/map/svg-map-nx.vue

@@ -195,9 +195,9 @@
                   <text class="mapValue" x="520" y="117" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdzjrl || 0}}</text>
                   <text class="mapValue" x="540" y="117" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="440" y="129" fill="#919697" font-size="8">光伏</text>
-                  <text class="mapValue" x="460" y="129" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="460" y="129" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcygfcsl || 0}}</text>
                   <text class="mapValue" x="470" y="129" fill="#919697" font-size="8">个，装机容量</text>
-                  <text class="mapValue" x="520" y="129" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdzjrl || 0}}</text>
+                  <text class="mapValue" x="520" y="129" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcygfzjrl || 0}}</text>
                   <text class="mapValue" x="540" y="129" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="440" y="141" fill="#919697" font-size="8" font-weight="bold">清洁能源公司</text>
                   <text class="mapValue" x="440" y="153" fill="#919697" font-size="8">总装机容量</text>
@@ -227,7 +227,7 @@
                     <text class="mapValue" x="520" y="157" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdzjrl || 0}}</text>
                     <text class="mapValue" x="540" y="157" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="440" y="169" fill="#919697" font-size="8">光伏</text>
-                    <text class="mapValue" x="460" y="169" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="460" y="169" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcygfcsl || 0}}</text>
                     <text class="mapValue" x="470" y="169" fill="#919697" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="520" y="169" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcygfzjrl || 0}}</text>
                     <text class="mapValue" x="540" y="169" fill="#919697" font-size="8">MW</text>
@@ -273,7 +273,7 @@
                   <text class="mapValue" x="560" y="101" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdzjrl || 0}}</text>
                   <text class="mapValue" x="580" y="101" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="480" y="113" fill="#ffffff" font-size="8">光伏</text>
-                  <text class="mapValue" x="500" y="113" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="500" y="113" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcygfcsl || 0}}</text>
                   <text class="mapValue" x="510" y="113" fill="#ffffff" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="560" y="113" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdzjrl || 0}}</text>
                   <text class="mapValue" x="580" y="113" fill="#919697" font-size="8">MW</text>
@@ -305,7 +305,7 @@
                     <text class="mapValue" x="560" y="151" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdzjrl || 0}}</text>
                     <text class="mapValue" x="580" y="151" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="480" y="163" fill="#ffffff" font-size="8">光伏</text>
-                    <text class="mapValue" x="500" y="163" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="500" y="163" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcygfcsl || 0}}</text>
                     <text class="mapValue" x="510" y="163" fill="#ffffff" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="560" y="163" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('河北')]?.hbcygfzjrl || 0}}</text>
                     <text class="mapValue" x="580" y="163" fill="#919697" font-size="8">MW</text>
@@ -353,7 +353,7 @@
                   <text class="mapValue" x="305" y="137" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdzjrl || 0}}</text>
                   <text class="mapValue" x="325" y="137" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="225" y="149" fill="#919697" font-size="8">光伏</text>
-                  <text class="mapValue" x="245" y="149" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="245" y="149" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfcsl || 0}}</text>
                   <text class="mapValue" x="255" y="149" fill="#919697" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="305" y="149" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfzjrl || 0}}</text>
                   <text class="mapValue" x="325" y="149" fill="#919697" font-size="8">MW</text>
@@ -385,7 +385,7 @@
                     <text class="mapValue" x="325" y="187" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdzjrl || 0}}</text>
                     <text class="mapValue" x="345" y="187" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="245" y="199" fill="#919697" font-size="8">光伏</text>
-                    <text class="mapValue" x="265" y="199" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="265" y="199" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfcsl || 0}}</text>
                     <text class="mapValue" x="275" y="199" fill="#919697" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="325" y="199" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfzjrl || 0}}</text>
                     <text class="mapValue" x="345" y="199" fill="#919697" font-size="8">MW</text>
@@ -431,7 +431,7 @@
                   <text class="mapValue" x="375" y="137" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdzjrl || 0}}</text>
                   <text class="mapValue" x="395" y="137" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="295" y="149" fill="#ffffff" font-size="8">光伏</text>
-                  <text class="mapValue" x="315" y="149" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="315" y="149" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfcsl || 0}}</text>
                   <text class="mapValue" x="325" y="149" fill="#ffffff" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="375" y="149" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfzjrl || 0}}</text>
                   <text class="mapValue" x="395" y="149" fill="#919697" font-size="8">MW</text>
@@ -463,7 +463,7 @@
                     <text class="mapValue" x="375" y="187" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdzjrl || 0}}</text>
                     <text class="mapValue" x="395" y="187" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="295" y="199" fill="#ffffff" font-size="8">光伏</text>
-                    <text class="mapValue" x="315" y="199" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="315" y="199" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfcsl || 0}}</text>
                     <text class="mapValue" x="325" y="199" fill="#ffffff" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="375" y="199" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('新疆')]?.xjcygfzjrl || 0}}</text>
                     <text class="mapValue" x="395" y="199" fill="#919697" font-size="8">MW</text>
@@ -510,7 +510,7 @@
                   <text class="mapValue" x="340" y="263" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdzjrl || 0}} </text>
                   <text class="mapValue" x="360" y="263" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="260" y="275" fill="#919697" font-size="8">光伏</text>
-                  <text class="mapValue" x="280" y="275" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="280" y="275" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcygfcsl || 0}}</text>
                   <text class="mapValue" x="290" y="275" fill="#919697" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="340" y="275" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcygfzjrl || 0}}</text>
                   <text class="mapValue" x="360" y="275" fill="#919697" font-size="8">MW</text>
@@ -542,7 +542,7 @@
                     <text class="mapValue" x="340" y="263" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdzjrl || 0}} </text>
                     <text class="mapValue" x="360" y="263" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="260" y="275" fill="#919697" font-size="8">光伏</text>
-                    <text class="mapValue" x="280" y="275" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="280" y="275" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcygfcsl || 0}}</text>
                     <text class="mapValue" x="290" y="275" fill="#919697" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="340" y="275" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcygfzjrl || 0}}</text>
                     <text class="mapValue" x="360" y="275" fill="#919697" font-size="8">MW</text>
@@ -588,7 +588,7 @@
                   <text class="mapValue" x="385" y="243" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdzjrl || 0}} </text>
                   <text class="mapValue" x="405" y="243" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="305" y="255" fill="#ffffff" font-size="8">光伏</text>
-                  <text class="mapValue" x="325" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="325" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcygfcsl || 0}}</text>
                   <text class="mapValue" x="335" y="255" fill="#ffffff" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="385" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdzjrl || 0}}</text>
                   <text class="mapValue" x="405" y="255" fill="#919697" font-size="8">MW</text>
@@ -620,7 +620,7 @@
                     <text class="mapValue" x="385" y="243" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdzjrl || 0}} </text>
                     <text class="mapValue" x="405" y="243" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="305" y="255" fill="#ffffff" font-size="8">光伏</text>
-                    <text class="mapValue" x="325" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="325" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcygfcsl || 0}}</text>
                     <text class="mapValue" x="335" y="255" fill="#ffffff" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="385" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('西藏')]?.xzcygfzjrl || 0}}</text>
                     <text class="mapValue" x="405" y="255" fill="#919697" font-size="8">MW</text>
@@ -667,7 +667,7 @@
                   <text class="mapValue" x="515" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdzjrl || 0}} </text>
                   <text class="mapValue" x="535" y="274" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="435" y="286" fill="#919697" font-size="8">光伏</text>
-                  <text class="mapValue" x="455" y="286" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="455" y="286" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfcsl || 0}}</text>
                   <text class="mapValue" x="465" y="286" fill="#919697" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="515" y="286" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfzjrl || 0}}</text>
                   <text class="mapValue" x="535" y="286" fill="#919697" font-size="8">MW</text>
@@ -699,7 +699,7 @@
                     <text class="mapValue" x="515" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdzjrl || 0}} </text>
                     <text class="mapValue" x="535" y="274" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="435" y="286" fill="#919697" font-size="8">光伏</text>
-                    <text class="mapValue" x="455" y="286" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="455" y="286" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfcsl || 0}}</text>
                     <text class="mapValue" x="465" y="286" fill="#919697" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="515" y="286" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfzjrl || 0}}</text>
                     <text class="mapValue" x="535" y="286" fill="#919697" font-size="8">MW</text>
@@ -745,7 +745,7 @@
                   <text class="mapValue" x="555" y="262" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdzjrl || 0}} </text>
                   <text class="mapValue" x="575" y="262" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="475" y="274" fill="#ffffff" font-size="8">光伏</text>
-                  <text class="mapValue" x="495" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="495" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfcsl || 0}}</text>
                   <text class="mapValue" x="505" y="274" fill="#ffffff" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="555" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfzjrl || 0}}</text>
                   <text class="mapValue" x="575" y="274" fill="#919697" font-size="8">MW</text>
@@ -777,7 +777,7 @@
                     <text class="mapValue" x="555" y="262" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdzjrl || 0}} </text>
                     <text class="mapValue" x="575" y="262" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="475" y="274" fill="#ffffff" font-size="8">光伏</text>
-                    <text class="mapValue" x="495" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="495" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfcsl || 0}}</text>
                     <text class="mapValue" x="505" y="274" fill="#ffffff" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="555" y="274" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山东')]?.sdcygfzjrl || 0}}</text>
                     <text class="mapValue" x="575" y="274" fill="#919697" font-size="8">MW</text>
@@ -824,7 +824,7 @@
                   <text class="mapValue" x="335" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdzjrl || 0}} </text>
                   <text class="mapValue" x="355" y="255" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="255" y="267" fill="#919697" font-size="8">光伏</text>
-                  <text class="mapValue" x="275" y="267" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdcsl || 0}}</text>
+                  <text class="mapValue" x="275" y="267" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfcsl || 0}}</text>
                   <text class="mapValue" x="285" y="267" fill="#919697" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="335" y="267" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfzjrl || 0}}</text>
                   <text class="mapValue" x="355" y="267" fill="#919697" font-size="8">MW</text>
@@ -856,7 +856,7 @@
                     <text class="mapValue" x="335" y="255" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdzjrl || 0}} </text>
                     <text class="mapValue" x="355" y="255" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="255" y="267" fill="#919697" font-size="8">光伏</text>
-                    <text class="mapValue" x="275" y="267" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdcsl || 0}}</text>
+                    <text class="mapValue" x="275" y="267" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfcsl || 0}}</text>
                     <text class="mapValue" x="285" y="267" fill="#919697" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="335" y="267" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfzjrl || 0}}</text>
                     <text class="mapValue" x="355" y="267" fill="#919697" font-size="8">MW</text>
@@ -902,7 +902,7 @@
                   <text class="mapValue" x="385" y="235" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdzjrl || 0}} </text>
                   <text class="mapValue" x="405" y="235" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="305" y="247" fill="#ffffff" font-size="8">光伏</text>
-                  <text class="mapValue" x="325" y="247" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdcsl || 0}}</text>
+                  <text class="mapValue" x="325" y="247" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfcsl || 0}}</text>
                   <text class="mapValue" x="335" y="247" fill="#ffffff" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="385" y="247" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfzjrl || 0}}</text>
                   <text class="mapValue" x="405" y="247" fill="#919697" font-size="8">MW</text>
@@ -934,7 +934,7 @@
                     <text class="mapValue" x="385" y="235" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdzjrl || 0}} </text>
                     <text class="mapValue" x="405" y="235" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="305" y="247" fill="#ffffff" font-size="8">光伏</text>
-                    <text class="mapValue" x="325" y="247" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscyfdcsl || 0}}</text>
+                    <text class="mapValue" x="325" y="247" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfcsl || 0}}</text>
                     <text class="mapValue" x="335" y="247" fill="#ffffff" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="385" y="247" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('陕西')]?.xscygfzjrl || 0}}</text>
                     <text class="mapValue" x="405" y="247" fill="#919697" font-size="8">MW</text>
@@ -981,7 +981,7 @@
                   <text class="mapValue" x="350" y="155" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdzjrl || 0}} </text>
                   <text class="mapValue" x="370" y="155" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="270" y="167" fill="#919697" font-size="8">光伏</text>
-                  <text class="mapValue" x="290" y="167" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="290" y="167" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfcsl || 0}}</text>
                   <text class="mapValue" x="300" y="167" fill="#919697" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="350" y="167" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfzjrl || 0}}</text>
                   <text class="mapValue" x="370" y="167" fill="#919697" font-size="8">MW</text>
@@ -1013,7 +1013,7 @@
                     <text class="mapValue" x="360" y="155" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdzjrl || 0}} </text>
                     <text class="mapValue" x="380" y="155" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="280" y="167" fill="#919697" font-size="8">光伏</text>
-                    <text class="mapValue" x="300" y="167" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="300" y="167" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfcsl || 0}}</text>
                     <text class="mapValue" x="310" y="167" fill="#919697" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="360" y="167" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfzjrl || 0}}</text>
                     <text class="mapValue" x="380" y="167" fill="#919697" font-size="8">MW</text>
@@ -1059,7 +1059,7 @@
                   <text class="mapValue" x="395" y="135" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdzjrl || 0}} </text>
                   <text class="mapValue" x="415" y="135" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="315" y="147" fill="#ffffff" font-size="8">光伏</text>
-                  <text class="mapValue" x="335" y="147" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="335" y="147" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfcsl || 0}}</text>
                   <text class="mapValue" x="345" y="147" fill="#ffffff" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="395" y="147" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfzjrl || 0}}</text>
                   <text class="mapValue" x="415" y="147" fill="#919697" font-size="8">MW</text>
@@ -1091,7 +1091,7 @@
                     <text class="mapValue" x="395" y="135" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdzjrl || 0}} </text>
                     <text class="mapValue" x="415" y="135" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="315" y="147" fill="#ffffff" font-size="8">光伏</text>
-                    <text class="mapValue" x="335" y="147" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="335" y="147" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfcsl || 0}}</text>
                     <text class="mapValue" x="345" y="147" fill="#ffffff" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="395" y="147" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('内蒙')]?.nmcygfzjrl || 0}}</text>
                     <text class="mapValue" x="415" y="147" fill="#919697" font-size="8">MW</text>
@@ -1137,7 +1137,7 @@
                   <text class="mapValue" x="335" y="150" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcyfdzjrl || 0}} </text>
                   <text class="mapValue" x="375" y="150" fill="#919697" font-size="8">MW</text>
                   <text class="mapValue" x="255" y="162" fill="#919697" font-size="8">光伏</text>
-                  <text class="mapValue" x="275" y="162" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcyfdcsl || 0}}</text>
+                  <text class="mapValue" x="275" y="162" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcygfcsl || 0}}</text>
                   <text class="mapValue" x="285" y="162" fill="#919697" font-size="8">个，装机容量</text>
                   <text class="mapValue" x="335" y="162" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcygfzjrl || 0}}</text>
                   <text class="mapValue" x="375" y="162" fill="#919697" font-size="8">MW</text>
@@ -1169,7 +1169,7 @@
                     <text class="mapValue" x="335" y="200" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcyfdzjrl || 0}} </text>
                     <text class="mapValue" x="375" y="200" fill="#919697" font-size="8">MW</text>
                     <text class="mapValue" x="255" y="212" fill="#919697" font-size="8">光伏</text>
-                    <text class="mapValue" x="275" y="212" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcyfdcsl || 0}}</text>
+                    <text class="mapValue" x="275" y="212" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcygfcsl || 0}}</text>
                     <text class="mapValue" x="285" y="212" fill="#919697" font-size="8">个，装机容量</text>
                     <text class="mapValue" x="335" y="212" fill="#05bb4c" font-size="8">{{homeSuspensionWindowsData[getmapName('山西')]?.sxcygfzjrl || 0}}</text>
                     <text class="mapValue" x="375" y="212" fill="#919697" font-size="8">MW</text>

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/zhenqudialog.vue

@@ -10,11 +10,11 @@
       <div class="wt-list">
         <div class="wt-item" v-for="(item, index) in wtlist" :key="index">
           <div class="imgs">
-            <img src="@assets/imgs/sun0.png" v-if="item.status == 1" />
-            <img src="@assets/imgs/sun1.png" v-if="item.status == 0" />
-            <img src="@assets/imgs/sun4.png" v-if="item.status == 4" />
-            <img src="@assets/imgs/sun5.png" v-if="item.status == 5" />
-            <img src="@assets/imgs/sun6.png" v-if="item.status == 6" />
+            <img src="@assets/imgs/nbq_dj.png" v-if="item.status == 0" />
+            <img src="@assets/imgs/nbq_yx.png" v-if="item.status == 1" />
+            <img src="@assets/imgs/nbq_gz.png" v-if="item.status == 2" />
+            <img src="@assets/imgs/nbq_jx.png" v-if="item.status == 3" />
+            <img src="@assets/imgs/nbq_lx.png" v-if="item.status == 6" />
           </div>
           <div class="text" :class="colorlist[item.status]">
             {{ item.wtname }}
@@ -38,7 +38,7 @@ export default {
   data() {
     return {
       diaplay: false,
-      colorlist: ["blue", "green", "red", "orange", "pink", "white", "gary"],
+      colorlist: ["blue", "green", "red", "orange", "pink", "white", "gray"],
       wtlist: [
         {
           wtid: "SXJ_KGDL_JR_G_IN_0078_EQ",
@@ -854,7 +854,6 @@ export default {
     width: 7%;
     height: 48px;
     font-size: 14px;
-    color: #fff;
     display: flex;
     align-items: center;
     .imgs {

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

@@ -668,7 +668,7 @@ export default {
   mounted() {
     this.timer = setInterval(() => {
       this.getSingleMatrix();
-    }, 3000);
+    }, 5000);
   },
   unmounted() {
     clearInterval(this.timer);

src/views/stateMonitor/factoryMonitor/windPowerPlant/matrixMonitor/index.vue

@@ -681,7 +681,9 @@ export default {
     this.getSingleMatrix();
   },
   mounted() {
-    this.timer = setInterval(() => {}, 3000);
+    this.timer = setInterval(() => {
+      this.getSingleMatrix();
+    }, 5000);
   },
   unmounted() {
     clearInterval(this.timer);