修复首页展示地图和选项不一致问题，修复数据指标弹窗问题

src/App.vue

@@ -315,7 +315,7 @@ body {
     top: @headerHeight;
     // top: 59px;
     background-color: fade(#192a26, 75%);
-    z-index: 8;
+    z-index: 2002;
     opacity: 0;
     transition: opacity 0.2s;
     transition-timing-function: ease-in;

src/assets/styles/dialog.less

@@ -69,7 +69,7 @@
   }
 
   .el-menu {
-    z-index: 999 !important;
+    z-index: 2002 !important;
   }
   .el-menu .el-menu-item:hover {
     background-color: transparent !important;

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

@@ -91,7 +91,7 @@ export default {
               lineStyle: {
                 color: [
                   [
-                    (this.value<0?0:this.value )/ this.max,
+                    (this.value < 0 ? 0 : this.value) / this.max,
                     new echarts.graphic.LinearGradient(0, 0, 1, 0, [
                       {
                         offset: 0,
@@ -157,7 +157,7 @@ export default {
             },
             data: [
               {
-                value: (this.value<0?0:this.value ),
+                value: this.value < 0 ? 0 : this.value,
               },
             ],
             itemStyle: {
@@ -237,7 +237,7 @@ export default {
             hoverAnimation: false,
             data: [
               {
-                value: (this.value<0?0:this.value ),
+                value: this.value < 0 ? 0 : this.value,
                 itemStyle: {
                   normal: {
                     color: "transition",
@@ -249,8 +249,8 @@ export default {
                       return params.value;
                     },
                     color: $("#appBody").is(".dark")
-                  ? partten.getColor(this.color)
-                  : "rgb(57, 54, 143)",
+                      ? partten.getColor(this.color)
+                      : "rgb(57, 54, 143)",
                     fontSize: util.vh(12),
                     fontWeight: "bold",
                     position: "center",

src/components/headerNav/index.vue

@@ -86,7 +86,7 @@
           class="svg-icon svg-icon-sm"
           :class="
             $store.state.themeName === 'dark'
-              ? activeTab == index
+              ? enterpriseIndex == 'all'
                 ? 'svg-icon-green'
                 : 'svg-icon-write'
               : 'svg-icon-black'
@@ -178,6 +178,7 @@ export default {
         },
       ],
       enterpriseIndex: "all",
+      companyName: "清洁能源",
       showType: "all",
       safeDay: "",
       childNode: [],
@@ -199,6 +200,7 @@ export default {
       //   this.activeNode = this.nodeCode + this.headerIndex;
     },
     handleClickEnterprise(enterprise, name) {
+      this.companyName = name;
       this.enterpriseIndex = enterprise;
       this.$emit("typeFlag", this.showType, this.enterpriseIndex);
       this.$emit(
@@ -206,18 +208,24 @@ export default {
         this.activeTab,
         this.showType,
         enterprise == "all" ? "SXJ_RGN" : enterprise,
-        enterprise == "all" ? "山西省" : name
+        enterprise == "all" ? "清洁能源" : name
       );
     },
     headerCheck(index, showType) {
-      let wpId =
-        this.wpId.includes("FDC") || this.wpId.includes("GDC")
-          ? "SXJ_RGN"
-          : this.wpId;
+      //   let wpId =
+      //     this.wpId.includes("FDC") || this.wpId.includes("GDC")
+      //       ? "SXJ_RGN"
+      //       : this.wpId;
       //   let flag = wpId == "SXJ_RGN" ? true : false;
       this.activeTab = index;
       this.showType = showType;
-      this.$emit("firstRender", this.activeTab, this.showType, wpId);
+      this.$emit(
+        "firstRender",
+        this.activeTab,
+        this.showType,
+        this.wpId,
+        this.companyName
+      );
       this.$emit("typeFlag", this.showType, this.enterpriseIndex);
     },
     hideChild() {
@@ -271,7 +279,8 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
-    font-size: 16px;
+    font-size: 14px;
+    font-family: Microsoft YaHei;
     cursor: pointer;
     // width: 9vh;
     padding: 3px 14px;
@@ -308,14 +317,17 @@ export default {
   margin-left: 72px;
   z-index: 5;
   .active1 {
-    background: rgba(84, 183, 90, 0.4);
+    // background: rgba(84, 183, 90, 0.4);
+    color: #05bb4c;
   }
   div {
     display: flex;
-    padding: 15px;
+    padding: 0 14px;
     align-items: center;
     height: 25px;
-    // line-height: 25px;
+    line-height: 25px;
+    font-size: 15px;
+    font-family: Microsoft YaHei;
     background: rgba(84, 183, 90, 0.16);
     border-radius: 16px;
     text-align: center;

src/components/menuNav/index.vue

@@ -111,7 +111,7 @@ export default {
   border-image: linear-gradient(180deg, transparent, #1a7ccd, #1a7ccd, transparent) 2 1;
   border-color: #002767;
   backdrop-filter: blur(5px);
-  z-index: 99;
+  z-index: 2001;
   overflow: revert !important;
 
   .el-sub-menu a i {

src/components/windDetail/index.vue

@@ -808,6 +808,7 @@ export default {
         height: 100%;
         display: flex;
         align-items: center;
+        color: #b3bdc0;
         justify-content: center;
         // background: rgba(67, 81, 107, 0.2);
         background: rgba(96, 103, 105, 0.2);

src/components/zbDialog/index.vue

@@ -27,7 +27,9 @@
           @visible-change="handleClearSelected"
         >
           <el-option
-            v-for="item in moreTargetData"
+            v-for="item in allMoreTargetData.length
+              ? allMoreTargetData
+              : moreTargetData"
             :key="item.name"
             :label="item.name"
             :value="item.uniformCode"
@@ -207,19 +209,32 @@ export default {
     },
     // 全选按钮变化
     handleCheckAllChange(val) {
-      this.checkList = val ? this.moreTargetData.map((item) => item.name) : [];
+      this.checkList = val
+        ? this.allMoreTargetData.length
+          ? this.allMoreTargetData.map((item) => item.name)
+          : this.moreTargetData.map((item) => item.name)
+        : [];
       this.isIndeterminate = false;
     },
     //各标签按钮变化
     handleCheckedChange(checked) {
       const checkedCount = checked.length;
-      this.checkAll = checkedCount === this.moreTargetData.length;
+      this.checkAll =
+        checkedCount ===
+        (this.allMoreTargetData.length
+          ? this.allMoreTargetData.length
+          : this.moreTargetData.length);
       this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.moreTargetData.length;
+        checkedCount > 0 &&
+        checkedCount <
+          (this.allMoreTargetData.length
+            ? this.allMoreTargetData.length
+            : this.moreTargetData.length);
     },
     handleSelectedChange(val) {
-      console.log(val);
-      let select = this.moreTargetData.find((obj) => val == obj.uniformCode);
+      let select = this.allMoreTargetData.length
+        ? this.allMoreTargetData.find((obj) => val == obj.uniformCode)
+        : this.moreTargetData.find((obj) => val == obj.uniformCode);
       if (Object.keys(select).length) {
         this.checkList.push(select.name);
       }
@@ -233,6 +248,8 @@ export default {
 <style lang="less" scoped>
 .dialog-form {
   display: flex;
+  align-items: center;
+  margin-bottom: 10px;
   .checkall {
     margin-right: 10px;
     width: 80px;

src/views/Home/Home.vue

@@ -397,7 +397,7 @@ export default {
             {
               title: "风电",
               value: (data?.qt?.fdsjgl / 1000).toFixed(2),
-              dialogTitle: "保证功率详情",
+              dialogTitle: "功率详情",
               subUrl: "genreset/findGLDetail",
               targetName: "bzgl",
               dialogType: "powerLineChart",

src/views/Home/components/barCharts.vue

@@ -38,208 +38,7 @@ export default {
     // 传入数据
     list: {
       type: Array,
-      default: () => [
-        {
-          title: "日发电量",
-          yAxisIndex: 0,
-          value: [
-            {
-              text: "1日",
-              value: 1,
-            },
-            {
-              text: "2日",
-              value: 2,
-            },
-            {
-              text: "3日",
-              value: 5,
-            },
-            {
-              text: "4日",
-              value: 25,
-            },
-            {
-              text: "5日",
-              value: 4,
-            },
-            {
-              text: "6日",
-              value: 9,
-            },
-          ],
-        },
-        {
-          title: "上网电量",
-          yAxisIndex: 0,
-          value: [
-            {
-              text: "1日",
-              value: 1,
-            },
-            {
-              text: "2日",
-              value: 6,
-            },
-            {
-              text: "3日",
-              value: 2,
-            },
-            {
-              text: "4日",
-              value: 3,
-            },
-            {
-              text: "5日",
-              value: 3,
-            },
-            {
-              text: "6日",
-              value: 6,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-        {
-          title: "购网电量",
-          yAxisIndex: 0,
-          value: [
-            {
-              text: "1日",
-              value: 3,
-            },
-            {
-              text: "2日",
-              value: 11,
-            },
-            {
-              text: "3日",
-              value: 1,
-            },
-            {
-              text: "4日",
-              value: 7,
-            },
-            {
-              text: "5日",
-              value: 9,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-        {
-          title: "风速",
-          yAxisIndex: 1,
-          value: [
-            {
-              text: "1日",
-              value: 8,
-            },
-            {
-              text: "2日",
-              value: 15,
-            },
-            {
-              text: "3日",
-              value: 3,
-            },
-            {
-              text: "4日",
-              value: 8,
-            },
-            {
-              text: "5日",
-              value: 12,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-        {
-          title: "风速1",
-          yAxisIndex: 1,
-          value: [
-            {
-              text: "1日",
-              value: 8,
-            },
-            {
-              text: "2日",
-              value: 15,
-            },
-            {
-              text: "3日",
-              value: 3,
-            },
-            {
-              text: "4日",
-              value: 8,
-            },
-            {
-              text: "5日",
-              value: 12,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-        {
-          title: "风速2",
-          yAxisIndex: 1,
-          value: [
-            {
-              text: "1日",
-              value: 8,
-            },
-            {
-              text: "2日",
-              value: 15,
-            },
-            {
-              text: "3日",
-              value: 3,
-            },
-            {
-              text: "4日",
-              value: 8,
-            },
-            {
-              text: "5日",
-              value: 12,
-            },
-            {
-              text: "6日",
-              value: 3,
-            },
-            {
-              text: "7日",
-              value: 3,
-            },
-          ],
-        },
-      ],
+      default: () => [],
     },
     // 单位
     units: {
@@ -556,6 +355,8 @@ export default {
           textStyle: {
             color: "#fff",
             fontSize: 12,
+            fontFamily: "Arial",
+            fontWeight: "normal",
           },
           axisPointer: {
             type: "shadow",

src/views/Home/components/map.vue

@@ -320,59 +320,6 @@
     </div>
     <!-- 全国左侧信息 -->
     <div class="leftBox" v-if="mapName == 'KGDL_FGS'">
-      <el-dialog
-        class="dialogs"
-        width="80%"
-        v-model="dialogElectric"
-        :show-close="true"
-      >
-        <template #title>
-          <div class="dialog-title">
-            <img class="dialog-title-img" src="@assets/imgs/dialog-title.png" />
-            <div class="title">{{ showName }}</div>
-          </div>
-        </template>
-        <div class="dialog-body" style="height: 40vh">
-          <img class="dialog-img" src="@assets/imgs/dialog.png" />
-          <div class="date">
-            <div
-              class="day"
-              :class="electronType === 'day' ? 'active' : ''"
-              @click="handleElectricDetail('day', '日发电量', type)"
-            >
-              日
-            </div>
-            <div
-              class="mouth"
-              :class="electronType === 'month' ? 'active' : ''"
-              @click="handleElectricDetail('month', '月发电量', type)"
-            >
-              月
-            </div>
-            <div
-              class="year"
-              :class="electronType === 'year' ? 'active' : ''"
-              @click="handleElectricDetail('year', '年发电量', type)"
-            >
-              年
-            </div>
-          </div>
-          <BarCharts
-            :list="barList"
-            width="100%"
-            height="45vh"
-            :ratio="10000"
-            :showLegend="true"
-            :top="30"
-            :units="units"
-            :interval="electronType === 'day' ? 1 : 0"
-            :showkey="showkey"
-            :showName="showName"
-            :color="colors"
-          >
-          </BarCharts>
-        </div>
-      </el-dialog>
       <div
         :class="
           $store.state.themeName === 'light' ? 'new-home-light' : 'new-home'
@@ -739,6 +686,59 @@
       v-if="mapName == 'KGDL_FGS'"
       :class="activeTab == -1 || activeTab == -2 ? 'top-distance' : ''"
     >
+      <el-dialog
+        class="dialogs"
+        width="80%"
+        v-model="dialogElectric"
+        :show-close="true"
+      >
+        <template #title>
+          <div class="dialog-title">
+            <img class="dialog-title-img" src="@assets/imgs/dialog-title.png" />
+            <div class="title">{{ showName }}</div>
+          </div>
+        </template>
+        <div class="dialog-body" style="height: 40vh">
+          <img class="dialog-img" src="@assets/imgs/dialog.png" />
+          <div class="date">
+            <div
+              class="day"
+              :class="electronType === 'day' ? 'active' : ''"
+              @click="handleElectricDetail('day', '日发电量', type)"
+            >
+              日
+            </div>
+            <div
+              class="mouth"
+              :class="electronType === 'month' ? 'active' : ''"
+              @click="handleElectricDetail('month', '月发电量', type)"
+            >
+              月
+            </div>
+            <div
+              class="year"
+              :class="electronType === 'year' ? 'active' : ''"
+              @click="handleElectricDetail('year', '年发电量', type)"
+            >
+              年
+            </div>
+          </div>
+          <BarCharts
+            :list="barList"
+            width="100%"
+            height="45vh"
+            :ratio="10000"
+            :showLegend="true"
+            :top="30"
+            :units="units"
+            :interval="electronType === 'day' ? 1 : 0"
+            :showkey="showkey"
+            :showName="showName"
+            :color="colors"
+          >
+          </BarCharts>
+        </div>
+      </el-dialog>
       <Row type="flex" style="margin-bottom: 20px">
         <Col :span="24">
           <div class="model-bg-new">
@@ -1096,7 +1096,7 @@
           style="cursor: pointer"
           v-for="(item, index) in fdlList"
           :key="index"
-          @click="handleElectricDetail(item.id)"
+          @click="handleElectricDetail(item.id, item.title)"
         >
           <el-col :span="4">{{ item.title }}</el-col>
           <el-col :span="14">
@@ -1104,7 +1104,10 @@
               <div
                 class="progress_bar"
                 :style="{
-                  width: (item.value / 10000 / item.value1) * 100 + '%',
+                  width:
+                    item.value && item.value1
+                      ? (item.value / 10000 / item.value1) * 100 + '%'
+                      : '0',
                 }"
               >
                 <span class="count">{{ (item.value / 10000).toFixed(2) }}</span>
@@ -1374,7 +1377,7 @@ export default {
           wpId: "KGDL_FGS",
         },
         {
-          name: "山西省",
+          name: "清洁能源",
           wpId: "SXJ_RGN",
         },
       ],
@@ -1410,8 +1413,19 @@ export default {
       this.activeTab = activeTab;
       this.tabShow = activeTab;
       this.showType = showType;
-      //当wpId是FDC/GDC时,此时点击全部、风电、光伏按钮，展示山西地图及信息
-      if ((wpId == "SXJ_RGN" && this.flag) || name) {
+      //当wpId是FDC/GDC时,此时点击全部、风电、光伏按钮，展示山西地图及对应的公司信息
+      let fcId = wpId;
+      if ((wpId.includes("FDC") || wpId.includes("GDC")) && this.flag) {
+        if (name != "清洁能源") {
+          // 如果公司不是清洁能源，查找当前wpid对应的公司id并赋值给wpId
+          for (var key in this.StationinformationData.station) {
+            if (key == wpId) {
+              fcId = this.StationinformationData.station[key].companyid;
+            }
+          }
+        } else {
+          fcId = "SXJ_RGN";
+        }
         this.flag = true;
         this.penetrateType = 3;
         this.currents = 1;
@@ -1421,11 +1435,11 @@ export default {
             : name
             ? name
             : this.stationList[this.currents].wpId;
-        this.companyid = wpId;
+        this.companyid = fcId;
         this.companyname = name;
-        this.currentTitle = wpId == "SXJ_RGN" ? "山西省" : name;
+        this.currentTitle = name;
       }
-      this.$emit("mapClicks", wpId, activeTab);
+      this.$emit("mapClicks", fcId, activeTab);
       this.$emit("currentActiveTab", this.penetrateType);
     },
     backMap(wpId, planBtnName) {
@@ -1680,7 +1694,7 @@ export default {
         this.fdlList = [
           {
             title: "日发电量",
-            id: "date",
+            id: "day",
             value:
               this.tabShow == 0
                 ? data.qy_r_sjdl

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

@@ -1118,7 +1118,7 @@
           </g>
           <!-- 山西 -->
           <g v-if="showPoint && $store.state.themeName === 'dark'">
-            <g class="item-label" @click="clickLabel('SXJ_RGN', '山西', 3)"
+            <g class="item-label" @click="clickLabel('SXJ_RGN', '清洁能源', 3)"
               @mouseover="mouseoverIncident('山西')"
               @mouseout="mouseoutIncident('山西')"
             >
@@ -1195,7 +1195,7 @@
             </g>
           </g>
           <g v-if="showPoint && $store.state.themeName === 'light'">
-            <g class="item-label" @click.stop="clickLabel('SXJ_RGN', '山西')"
+            <g class="item-label" @click.stop="clickLabel('SXJ_RGN', '清洁能源')"
               @mouseover="mouseoverIncident('山西')"
               @mouseout="mouseoutIncident('山西')"
             >

src/views/Home/components/power-review-home.vue

@@ -12,19 +12,13 @@
         />
       </Col>
     </Row>
-    <!--   @click="openDialog(
-              item.dialogTitle,
-              item.subUrl,
-              item.targetName,
-              item.dialogType
-            )" -->
   </div>
 </template>
 
 <script>
 import Col from "@/components/coms/grid/col.vue";
 import Row from "../../../components/coms/grid/row.vue";
-import DashPieChart from "../../../components/chart/pie/dash-pie-chart.vue";
+import DashPieChart from "@/components/chart/pie/dash-pie-chart.vue";
 import api from "@api/cockpit/matrix/index.js";
 
 export default {

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

@@ -110,7 +110,7 @@ import {  GetWtTargetsList } from "@/api/factoryMonitor/index.js";
 import { getNewObj, deepClone } from "@/utills/func.js";
 
 export default {
-  name: "DataTarget",
+  name: "LightDataTarget",
   components: {
     headerButton,
     dialogCheck,