修复对比曲线弹窗报错，优化首页地图代码

src/components/chart/powerEcharts.vue

@@ -86,12 +86,7 @@ export default {
           itemGap: 7,
         },
         xAxis: {
-          // type: 'category',
-          // name: 'x',
           axisLabel: {
-            // interval: 2,
-            // showMinLabel: true,
-            // showMaxLabel: true,
             textStyle: {
               color: "#606769",
             },
@@ -102,6 +97,9 @@ export default {
               width: 1, //轴线的宽度
             },
           },
+          axisTick: {
+            alignWithLabel: true,
+          },
           splitLine: { show: false },
           data: this.getTimeStanp,
         },

src/components/headerNav/index.vue

@@ -1,63 +1,4 @@
 <template>
-  <!-- <div>
-    <ul>
-      <li
-        @click="headerCheck(0)"
-        :class="{ active: headerIndex == 0 }"
-        :style="remove ? 'margin-top: 16px;' : ''"
-      >
-        <i class="active_icon icon-menu"></i>
-        <span>全部</span>
-      </li>
-      <li
-        @click="headerCheck(-1)"
-        class="wind"
-        :class="{
-          active: headerIndex == -1,
-          forbidden: parentNode?.ZFJTS == 0,
-        }"
-        :style="remove ? 'margin-top: 16px;' : ''"
-      >
-        <i class="icon-wind-logo1"></i>
-        <span>风电</span>
-      </li>
-      <li
-        @click="headerCheck(-2)"
-        class="light"
-        :class="{
-          active: headerIndex == -2,
-          forbidden: parentNode?.ZGFTS == 0,
-        }"
-        :style="remove ? 'margin-top: 16px;' : ''"
-      >
-        <i class="icon-photovoltaic"></i>
-        <span>光伏</span>
-      </li>
-      <div class="rightTitle">
-        <li
-          class="nav_right"
-          :class="{ active: headerIndexs == -1 }"
-          @click="headerChecks(-1, parentNode.code)"
-          @dblclick="hideChild()"
-          :style="remove ? 'margin-top: 16px;' : ''"
-        >
-          <i class="active_icon icon-enterprise"></i>
-          <span>{{ parentNode && parentNode.aname }}</span>
-        </li>
-        <li
-          v-for="(item, index) in childNode"
-          :key="index"
-          class="nav_right"
-          @click="headerChecks(index, item.code)"
-          :class="{ active: headerIndexs === index }"
-          v-show="isShows"
-          :style="remove ? 'margin-top: 16px;' : ''"
-        >
-          <span>{{ parentNode && item.aname }}</span>
-        </li>
-      </div>
-    </ul>
-  </div> -->
   <div class="heeaderNav">
     <div class="tab-box">
       <div
@@ -105,29 +46,13 @@
       >
         <span>{{ item.aname }}</span>
       </div>
-      <!-- <div
-        :class="{ active: enterpriseIndex == 0 }"
-        class="enterprise-item"
-        @click="handleClickEnterprise(0)"
-      >
-        <span>清洁能源111</span>
-      </div>
-      <div
-        :class="{ active: enterpriseIndex == 1 }"
-        class="enterprise-item"
-        @click="handleClickEnterprise(1)"
-      >
-        <span>清洁能源222</span>
-      </div> -->
     </div>
   </div>
 </template>
 
 <script>
-// import {getOrganization} from "@api/home";
 import SvgIcon from "@/components/coms/icon/svg-icon.vue";
 import { headerCompany } from "@/api/headerNav/header.js";
-import store from "@store/index.js";
 export default {
   name: "HomeNav", //首页标题栏
   props: {
@@ -152,7 +77,6 @@ export default {
       activeTab: 0,
       headerIndexs: -1,
       isShow: true,
-      //   isShows: true,
       nodeCode: "",
       activeNode: "",
       currentMode: "QG",
@@ -195,9 +119,6 @@ export default {
       headerCompany().then(({ data }) => {
         this.childNode = data.data;
       });
-      //   this.OrganizationList = data;
-      //   this.nodeCode = data[0].code;
-      //   this.activeNode = this.nodeCode + this.headerIndex;
     },
     handleClickEnterprise(enterprise, name) {
       this.companyName = name;
@@ -212,11 +133,6 @@ export default {
       );
     },
     headerCheck(index, showType) {
-      //   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(
@@ -227,35 +143,7 @@ export default {
         this.companyName
       );
       this.$emit("typeFlag", this.showType, this.enterpriseIndex);
-    },
-    hideChild() {
-      //   this.isShows = !this.isShows;
-    },
-  },
-  watch: {
-    wpId(val) {
-      //   if (val) {
-      //     if (this.companyidval == "") {
-      //       this.wpIds = val;
-      //     } else {
-      //       this.wpIds = this.companyidval;
-      //     }
-      //   }
-    },
-  },
-  computed: {
-    parentNode() {
-      const datas = this.OrganizationList.filter((item) => {
-        return item.preCode == "";
-      });
-      return datas[0];
-    },
-    // childNode() {
-    //   const datas = this.OrganizationList.filter((item) => {
-    //     return item.preCode != "";
-    //   });
-    //   return datas;
-    // },
+    }
   },
 };
 </script>
@@ -268,12 +156,9 @@ export default {
   margin: 16px 0 16px 20px;
 }
 .tab-box {
-  //   margin: 1.852vh 2.778vh;
   display: inline-block;
   z-index: 2;
-  //   position: absolute;
   display: flex;
-  //   flex-direction: row;
 
   .tab-item {
     display: flex;
@@ -282,9 +167,7 @@ export default {
     font-size: 14px;
     font-family: Microsoft YaHei;
     cursor: pointer;
-    // width: 9vh;
     padding: 3px 14px;
-    // margin-bottom: 1.4815vh;
     margin-right: 5px;
 
     &.active1 {

src/components/lightDetial/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="height: 100%">
-    <div class="wtname" :class="colorList[wtInfo.status]">
-      <div class="wt-status"></div>
+    <div class="wtname">
+      <!--:class="colorList[wtInfo.status]" <div class="wt-status"></div> -->
       <div class="wt-text">{{ wtname }}</div>
     </div>
     <div class="part-info">

src/components/qushi/lineCharts.vue

@@ -242,7 +242,7 @@ export default {
           yAxisIndex: value.yAxisIndex,
           data: value.value.map((t) => {
             if (value.noRatio) {
-              return t.value ? t.value.toFixed(2) : 0.00;
+              return t.value ? t.value.toFixed(2) : 0.0;
             } else {
               return t.value === "" && t.value !== 0
                 ? ""
@@ -412,6 +412,9 @@ export default {
                   fontSize: 12,
                 },
               },
+              axisTick: {
+                alignWithLabel: true,
+              },
               data: this.showXdata ? this.getTimeStanp : this.xdata,
             },
           ] || [],

src/components/qushi/qushiDialog.vue

@@ -480,9 +480,7 @@ export default {
       }
       this.ysetDialogVisible = false;
     },
-    exportDatas() {
-      
-    },
+    exportDatas() {},
     c() {
       this.dialogFull ? (this.dialogFull = false) : (this.dialogFull = true);
     },
@@ -558,17 +556,32 @@ export default {
         wpid,
         uniformcodes: this.tagNames,
       }).then((res) => {
+        let resData = res.data.data.map((item) => {
+          if (item == null) {
+            return {};
+          } else {
+            return { ...item };
+          }
+        });
+        let pointIds = "";
         this.tmpData.forEach((item) => {
-          res.data.data.forEach((i) => {
-            if (item.sts == i.uniformCode) {
-              item.sts = i.nemCode;
-              item.statiomName = i.name;
+          resData.forEach((i) => {
+            if (Object.keys(i).length) {
+              if (item.sts == i.uniformCode) {
+                item.sts = i.nemCode;
+                item.statiomName = i.name;
+              }
+            } else {
+              item.sts = "";
+              item.statiomName = "";
             }
           });
-          // if()
         });
-        let pointIds = "";
-        res.data.data.forEach((value) => {
+
+        resData.forEach((value) => {
+          if (!value) {
+            value.nemCode = "";
+          }
           pointIds += value.nemCode + ",";
         });
         pointIds = pointIds.substring(0, pointIds.length - 1);

src/views/Home/Home.vue

@@ -1,595 +1,20 @@
 <template>
   <div :class="$store.state.themeName === 'light' ? 'home_light' : 'home'">
     <div class="top-mid-panel">
-      <Map
-        ref="map"
-        :wpId="wpId"
-        :wpIds="wpIds"
-        :homeSuspensionWindowsData="homeSuspensionWindowsData"
-        :ForecastPowerNewHome_fc="ForecastPowerNewHome_fc"
-        :ForecastPowerNewHome_gf="ForecastPowerNewHome_gf"
-        :qyPower="qyPower"
-        :powerDataHome="powerDataHome"
-        :mapList="mapList"
-        :StationinformationData="StationinformationData"
-        :CurveValues="CurveValues"
-        @mapClick="mapClick"
-        @mapClicks="mapClicks"
-        @mapClickBack="mapClickBack"
-        @currentActiveTab="currentActiveTab"
-        @backStation="onBackStation"
-      ></Map>
+      <Map ref="map"></Map>
     </div>
-
-    <el-dialog
-      :title="dialogTitle"
-      v-model="dialogShow"
-      width="80%"
-      top="10vh"
-      custom-class="modal"
-      :close-on-click-modal="true"
-      @closed="
-        (res) => {
-          dialogType = '';
-          powerLineChartData = null;
-        }
-      "
-    >
-      <Table :data="dialogData" v-if="dialogType === 'table'" />
-      <multiple-y-line-chart-normal
-        height="800px"
-        :list="powerLineChartData"
-        :yAxises="powerLineChartYAxises"
-        :showLegend="true"
-        v-if="dialogType === 'powerLineChart' && powerLineChartData"
-      />
-      <multiple-y-line-chart-normal
-        height="800px"
-        :list="Powertrend"
-        :yAxises="PowertrendYAxises"
-        :showLegend="true"
-        v-if="dialogType === 'powerLineChart' && !powerLineChartData"
-      />
-      <multiple-bar-chart
-        height="800px"
-        :units="doneLineChartData.units"
-        :list="doneLineChartData.value"
-        v-if="dialogType === 'doneLineChart'"
-      />
-    </el-dialog>
   </div>
 </template>
 
 <script>
-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";
-import PowerReviewHome from "./components/power-review-home.vue";
-
-// @ is an alias to /src
-import Row from "../../components/coms/grid/row.vue";
-import Col from "../../components/coms/grid/col.vue";
-import ComPanel from "../../components/coms/panel/panel";
-// import ListBarChart from "../../components/chart/bar/list-bar-chart.vue";
-import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
-import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
-import MultipleYLineChartNormal from "../../components/chart/line/multiple-y-line-chart-normal.vue";
-import Panel3 from "../../components/coms/panel/panel3.vue";
-import SvgIcon from "../../components/coms/icon/svg-icon.vue";
-import CoulometricAnalysis from "./components/coulometric-analysis.vue";
-import Weather from "./components/weather.vue";
-import PowerReview from "./components/power-review.vue";
-import PowerPlan from "./components/power-plan.vue";
 import Map from "./components/map.vue";
-import ListBarChart2 from "../../components/chart/bar/list-bar-chart2.vue";
-// import ListBarChartNewHome from "../../components/chart/bar/list-bar-chart2-new-home.vue";
-import DoubleLineChart from "@com/chart/line/double-line-chart.vue";
-import api from "@api/cockpit/matrix/index.js";
-import Table from "./dialog/table.vue";
-import dayjs from "dayjs";
 export default {
   name: "Home",
-  components: {
-    PowerReviewHome,
-    ListBarChart2Home,
-    MultipleLineChartHome,
-    Row,
-    Col,
-    ComPanel,
-    Weather,
-    CoulometricAnalysis,
-    // ListBarChart,
-    PowerReview,
-    ToolbarPanel,
-    PowerPlan,
-    MultipleBarChart,
-    MultipleYLineChartNormal,
-    Panel3,
-    SvgIcon,
-    Map,
-    ListBarChart2,
-    // ListBarChartNewHome,
-    Table,
-    DoubleLineChart,
-  },
   data() {
-    return {
-      wpId: "KGDL_FGS",
-      wpIds: "KGDL_FGS0",
-      StationinformationData: [],
-      powerDataHome: {},
-      ForecastPowerNewHome_fc: [],
-      ForecastPowerNewHome_gf: [],
-      qyPower: {},
-      homeSuspensionWindowsData: [],
-      CurveValues: {
-        value: [
-          {
-            title: "",
-            value: [],
-          },
-        ],
-      },
-      activeTab: 0,
-      tabTitle: [
-        { id: 1, title: "日" },
-        { id: 2, title: "月" },
-        { id: 3, title: "年" },
-      ],
-      tabTitle_gf: [
-        { id: 1, title: "日" },
-        { id: 2, title: "月" },
-        { id: 3, title: "年" },
-      ],
-
-      newpointmapData: {},
-
-      //
-      historyWpId: "",
-      historyPlanBtnName: "全部",
-      timmer: null, // 计时器
-      timmer2: null,
-      timmer3: null,
-      powerplanShowSingle: false,
-      fcNum: 0,
-      gfNum: 0,
-
-      powerData: {},
-      weatherChart: [
-        {
-          title: "温度",
-          smooth: true,
-          value: [],
-        },
-        {
-          title: "湿度",
-          smooth: true,
-          value: [],
-        },
-      ],
-      tqmap5: [],
-      jczbmap: {},
-      wxssmap: {},
-      gxkmap: {},
-      mxztmap: {},
-      planData: {},
-      tqmap: {},
-      nowTime: "",
-      planBtnName: "全部",
-      powerLineChartYAxises: [],
-      powerLineChartData: [
-        {
-          title: "",
-          yAxisIndex: 0, // 使用单位
-          value: [],
-        },
-      ],
-      doneLineChartData: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      dialogType: null,
-
-      xtmap: {},
-      dialogShow: false,
-      dialogTitle: "",
-      dialogData: {},
-      // 预测电量
-      ForecastPower: [],
-      // 日发电量
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      PowertrendYAxises: [
-        {
-          name: "功率",
-          min: 0,
-          max: null,
-          unit: "(万kWh)",
-          position: "left",
-        },
-        {
-          name: "风速",
-          min: 0,
-          max: 25,
-          unit: "(m/s)",
-          position: "right",
-        },
-      ],
-      mapList: [
-        { text: "山西", code: "sxqyxx" },
-        { text: "内蒙", code: "nmqyxx" },
-        { text: "新疆", code: "xjqyxx" },
-        { text: "河北", code: "hbqyxx" },
-        { text: "陕西", code: "xsqyxx" },
-        { text: "山东", code: "sdqyxx" },
-        { text: "西藏", code: "xzqyxx" },
-      ],
-      penetrateType: 0,
-    };
+    return {};
   },
-
-  methods: {
-    // 获取场站24小时功率图
-    getData(wpId) {
-      FindPowerInfo({ id: wpId }).then((res) => {
-        if (res.data) {
-          let Powertrend = {
-            // 图表所用单位
-            units: ["(万KWh)", "(风速)"],
-            value: [
-              {
-                title: "保证功率",
-                smooth: true, // 使用单位
-                value: [],
-              },
-              {
-                title: "理论功率",
-                smooth: true, // 使用单位
-                value: [],
-              },
-              {
-                title: "实际功率",
-                smooth: true, // 使用单位
-                value: [],
-              },
-            ],
-          };
-
-          Powertrend.value[0].value = res.data.map((item) => {
-            return {
-              dateTime: dayjs()
-                .startOf("date")
-                .add(item.hours, "hour")
-                .format("YYYY-MM-DD HH:mm:ss"),
-              value: item.bzgl,
-            };
-          });
-          Powertrend.value[1].value = res.data.map((item) => {
-            return {
-              dateTime: dayjs()
-                .startOf("date")
-                .add(item.hours, "hour")
-                .format("YYYY-MM-DD HH:mm:ss"),
-              value: item.llgl,
-            };
-          });
-          Powertrend.value[2].value = res.data.map((item) => {
-            return {
-              dateTime: dayjs()
-                .startOf("date")
-                .add(item.hours, "hour")
-                .format("YYYY-MM-DD HH:mm:ss"),
-              value: item.sjgl,
-            };
-          });
-          this.CurveValues = Powertrend.value;
-        }
-      });
-    },
-    // 请求服务
-    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) {
-          let mapInfos = [];
-          this.mapList.forEach((item) => {
-            for (var key in data.sytc) {
-              if (item.code == key) {
-                data.sytc[key].name = item.text;
-                mapInfos.push({ ...data.sytc[key] });
-              }
-            }
-          });
-          mapInfos.forEach((element) => {
-            element.industryState = true;
-            element.companyState = true;
-            if (element.name == "山西") {
-              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 (!Object.hasOwn(element, "xjgszzjrl")) {
-                element.companyState = false;
-              }
-              if (!Object.hasOwn(element, "xjcyzzjrl")) {
-                element.industryState = false;
-              }
-              this.homeSuspensionWindowsData.xjqyxx = { ...element };
-            } else if (element.name == "内蒙") {
-              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 (!Object.hasOwn(element, "xzgszzjrl")) {
-                element.companyState = false;
-              }
-              if (!Object.hasOwn(element, "xzcyzzjrl")) {
-                element.industryState = false;
-              }
-              this.homeSuspensionWindowsData.xzqyxx = { ...element };
-            } else if (element.name == "山东") {
-              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 (!Object.hasOwn(element, "xsgszzjrl")) {
-                element.companyState = false;
-              }
-              if (!Object.hasOwn(element, "xscyzzjrl")) {
-                element.industryState = false;
-              }
-              this.homeSuspensionWindowsData.xsqyxx = { ...element };
-            } else if (element.name == "河北") {
-              if (!Object.hasOwn(element, "hbgszzjrl")) {
-                element.companyState = false;
-              }
-              if (!Object.hasOwn(element, "hbcyzzjrl")) {
-                element.industryState = false;
-              }
-              this.homeSuspensionWindowsData.hbqyxx = { ...element };
-            }
-          });
-
-          this.powerDataHome = [
-            {
-              title: "清洁能源",
-              value: (data?.qt?.sjgl / 1000).toFixed(2),
-              dialogTitle: "清洁能源",
-              subUrl: "genreset/findGLDetail",
-              targetName: "bzgl",
-              dialogType: "powerLineChart",
-              max: 3000,
-            },
-            {
-              title: "风电",
-              value: (data?.qt?.fdsjgl / 1000).toFixed(2),
-              dialogTitle: "功率详情",
-              subUrl: "genreset/findGLDetail",
-              targetName: "bzgl",
-              dialogType: "powerLineChart",
-              max: 3000,
-            },
-            {
-              title: "光伏",
-              value: (data?.qt?.gfsjgl / 1000).toFixed(2),
-              dialogTitle: "保证功率详情",
-              subUrl: "genreset/findGLDetail",
-              targetName: "bzgl",
-              dialogType: "powerLineChart",
-              max: 3000,
-            },
-          ];
-
-          let sbztmap = {
-            fd: {},
-            gf: {},
-          };
-          for (var key in data.mxztmap) {
-            let a = key.substring(3, key.length);
-            if (key.includes("gf_")) {
-              sbztmap.gf[a] = data.mxztmap[key];
-            } else if (key.includes("fd_")) {
-              sbztmap.fd[a] = data.mxztmap[key];
-            }
-          }
-          this.StationinformationData.sbztmap = sbztmap;
-        }
-      });
-    },
-    // 发电量
-    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);
-      clearInterval(this.timmer2);
-      this.timmer = null;
-      this.timmer2 = null;
-      this.activeTab = activeTab;
-      this.wpId = wpId;
-      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); //24小时功率曲线
-        }
-      }, 15 * 60 * 1000);
-    },
-    mapClicks(wpId, activeTab) {
-      this.historyWpId = wpId;
-      this.mapClick(wpId, activeTab);
-    },
-    mapClickBack(wpId, activeTab) {
-      this.historyWpId = wpId;
-      this.activeTab = activeTab;
-      this.mapClick(this.historyWpId, activeTab);
-    },
-    currentActiveTab(penetrateType) {
-      this.penetrateType = penetrateType;
-      if (penetrateType === 3) {
-        this.getData(this.wpIds);
-      }
-    },
-  },
-
-  created() {},
-  mounted() {},
-  unmounted() {
-    clearInterval(this.timmer);
-    clearInterval(this.timmer2);
-    this.timmer = null;
-    this.timmer2 = null;
+  components: {
+    Map,
   },
 };
 </script>

src/views/Home/components/map.vue

@@ -2,13 +2,13 @@
   <div class="map">
     <HeaderNav
       ref="header"
-      :wpId="fcId"
+      :wpId="wpId"
       @firstRender="firstRender"
       @typeFlag="typeFlag"
       :isShows="false"
     />
     <!-- 山西左侧信息 -->
-    <div v-if="mapName !== 'KGDL_FGS'">
+    <div v-if="currentTitle != '全国'">
       <div class="security-days safe_power">
         <div class="text">安全天数:</div>
         <div class="num">
@@ -319,7 +319,7 @@
       </div>
     </div>
     <!-- 全国左侧信息 -->
-    <div class="leftBox" v-if="mapName == 'KGDL_FGS'">
+    <div class="leftBox" v-if="currentTitle == '全国'">
       <div
         :class="
           $store.state.themeName === 'light' ? 'new-home-light' : 'new-home'
@@ -635,7 +635,7 @@
       </div>
     </div>
     <!-- 展示当前场站名称 -->
-    <div class="name-box" v-if="mapName != 'KGDL_FGS'">
+    <div class="name-box" v-if="currentTitle != '全国'">
       <div class="name-box-title">
         {{ currentTitle }}
       </div>
@@ -660,19 +660,18 @@
     <div class="map-img">
       <!-- 全国 -->
       <SvgMapNX
-        v-if="mapName === 'KGDL_FGS'"
+        v-if="currentTitle == '全国'"
         :homeSuspensionWindowsData="homeSuspensionWindowsData"
         :mapList="mapList"
         :show="showType"
-        :data="sourceMap"
+        :data="StationinformationData"
         @clickLabel="clickLabel"
       >
       </SvgMapNX>
 
       <!-- 山西 -->
       <SX
-        v-if="mapName !== 'KGDL_FGS'"
-        :clickFlag="mapName"
+        v-if="currentTitle != '全国'"
         :showType="showType"
         :companyid="companyid"
         :data="StationinformationData"
@@ -683,7 +682,7 @@
     <!-- 全国右侧信息 -->
     <div
       class="right"
-      v-if="mapName == 'KGDL_FGS'"
+      v-if="currentTitle == '全国'"
       :class="activeTab == -1 || activeTab == -2 ? 'top-distance' : ''"
     >
       <el-dialog
@@ -979,7 +978,7 @@
       </Row>
     </div>
 
-    <div v-if="mapName !== 'KGDL_FGS'">
+    <div v-if="currentTitle != '全国'">
       <!-- 山西右侧信息 -->
       <div class="card wind_card">
         <el-row>
@@ -1319,6 +1318,9 @@ import {
   FindRealtimeInfo,
   FindUtilizationhours,
   FindPlanproject,
+  FindBasicDataInfo,
+  FindPowerInfo,
+  FindProjectplan,
 } from "@/api/home/home.js";
 import dayjs from "dayjs";
 import windChartCom from "./windChartCom.vue";
@@ -1342,35 +1344,54 @@ export default {
     windChartCom,
     BarCharts,
   },
-  props: {
-    wpId: { type: String, default: "KGDL_FGS0" },
-    homeSuspensionWindowsData: { type: Object, 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: () => {} },
-  },
-
-  mounted() {
-    this.fcId = this.wpId;
-    this.sourceMap = this.data;
-  },
+  mounted() {},
   // 数据
   data() {
     return {
-      mapName: "KGDL_FGS",
-      switchShow: false, //接入情况弹窗
+      activeTab: 0, //当前tab
+      barList: [
+        {
+          name: "",
+          value: [],
+        },
+      ], //发电量利用小时柱状图
+      currentTitle: "全国", //当前地图名称
+      currents: 0, //当前层级
+      CurveValues: {
+        value: [
+          {
+            title: "",
+            value: [],
+          },
+        ],
+      }, //24小时功率曲线
+      companyid: "",
+      companyname: "",
+      chartsData: [], //实时负荷曲线
+      colors: ["#1c99ff", "#05BB4C"],
+      dialogVisible: false, //实时负荷弹窗开关
+      dialogElectric: false, //发电量、利用小时弹窗开关
+      electronType: "day", //日月年切换值
+      flag: false, //判断场站id
+      ForecastPowerNewHome_fc: [], //全国的风电发电量列表
+      ForecastPowerNewHome_gf: [], //全国的光伏发电量列表
       fdlList: [], //山西区域实时负荷列表
+      homeSuspensionWindowsData: [], //全国区域所有地区数据
+      historyWpId: "", //历史场站id
+      mapList: [
+        { text: "山西", code: "sxqyxx" },
+        { text: "内蒙", code: "nmqyxx" },
+        { text: "新疆", code: "xjqyxx" },
+        { text: "河北", code: "hbqyxx" },
+        { text: "陕西", code: "xsqyxx" },
+        { text: "山东", code: "sdqyxx" },
+        { text: "西藏", code: "xzqyxx" },
+      ],
       penetrateType: 0, //24小时功率曲线开关
-      fcId: "", //场站
+      powerDataHome: {},
+      qyPower: {},
+      ratio: 1,
       showType: "all",
-      sourceMap: {},
-      activeTab: 0, //当前tab
-      currentTitle: "", //当前名称
-      currents: 0, //当前层级
       stationList: [
         {
           name: "全部",
@@ -1381,26 +1402,18 @@ export default {
           wpId: "SXJ_RGN",
         },
       ],
-      flag: false,
-      companyid: "",
-      companyname: "",
+      switchShow: false, //接入情况弹窗
       showName: "",
-      dialogVisible: false, //实时负荷弹窗开关
-      chartsData: [],
-      electronType: "D",
+      StationinformationData: [],
       showkey: "",
-      dialogElectric: false, //发电量、利用小时弹窗开关
-      units: ["万kWh"],
-      ratio: 1,
-      colors: ["#1c99ff", "#05BB4C"],
-      barList: [
-        {
-          name: "",
-          value: [],
-        },
-      ],
+
       type: "fc", //发电量展示类型
       tabShow: 0,
+      timmer: null, // 计时器
+      timmer2: null,
+      units: ["万kWh"],
+      wpId: "KGDL_FGS",
+      wpIds: "KGDL_FGS0",
     };
   },
   emits: {
@@ -1409,6 +1422,335 @@ export default {
   },
   // 函数
   methods: {
+    // 点击地图展示类型
+    mapClick(wpId, activeTab) {
+      clearInterval(this.timmer);
+      clearInterval(this.timmer2);
+      this.timmer = null;
+      this.timmer2 = null;
+      this.activeTab = activeTab;
+      this.wpId = wpId;
+      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); //24小时功率曲线
+        }
+      }, 15 * 60 * 1000);
+    },
+    mapClicks(wpId, activeTab) {
+      this.historyWpId = wpId;
+      this.mapClick(wpId, activeTab);
+    },
+    mapClickBack(wpId, activeTab) {
+      this.historyWpId = wpId;
+      this.activeTab = activeTab;
+      this.mapClick(this.historyWpId, activeTab);
+    },
+    currentActiveTab(penetrateType) {
+      this.penetrateType = penetrateType;
+      if (penetrateType === 3) {
+        this.getData(this.wpIds);
+      }
+    },
+    // 请求服务
+    requestData() {
+      FindBasicDataInfo({ wpId: this.wpIds }).then(({ data }) => {
+        this.StationinformationData = data;
+        if (Object.keys(data).length) {
+          let mapInfos = [];
+          this.mapList.forEach((item) => {
+            for (var key in data.sytc) {
+              if (item.code == key) {
+                data.sytc[key].name = item.text;
+                mapInfos.push({ ...data.sytc[key] });
+              }
+            }
+          });
+          mapInfos.forEach((element) => {
+            element.industryState = true;
+            element.companyState = true;
+            if (element.name == "山西") {
+              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 (!Object.hasOwn(element, "xjgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "xjcyzzjrl")) {
+                element.industryState = false;
+              }
+              this.homeSuspensionWindowsData.xjqyxx = { ...element };
+            } else if (element.name == "内蒙") {
+              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 (!Object.hasOwn(element, "xzgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "xzcyzzjrl")) {
+                element.industryState = false;
+              }
+              this.homeSuspensionWindowsData.xzqyxx = { ...element };
+            } else if (element.name == "山东") {
+              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 (!Object.hasOwn(element, "xsgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "xscyzzjrl")) {
+                element.industryState = false;
+              }
+              this.homeSuspensionWindowsData.xsqyxx = { ...element };
+            } else if (element.name == "河北") {
+              if (!Object.hasOwn(element, "hbgszzjrl")) {
+                element.companyState = false;
+              }
+              if (!Object.hasOwn(element, "hbcyzzjrl")) {
+                element.industryState = false;
+              }
+              this.homeSuspensionWindowsData.hbqyxx = { ...element };
+            }
+          });
+
+          this.powerDataHome = [
+            {
+              title: "清洁能源",
+              value: (data?.qt?.sjgl / 1000).toFixed(2),
+              dialogTitle: "清洁能源",
+              subUrl: "genreset/findGLDetail",
+              targetName: "bzgl",
+              dialogType: "powerLineChart",
+              max: 3000,
+            },
+            {
+              title: "风电",
+              value: (data?.qt?.fdsjgl / 1000).toFixed(2),
+              dialogTitle: "功率详情",
+              subUrl: "genreset/findGLDetail",
+              targetName: "bzgl",
+              dialogType: "powerLineChart",
+              max: 3000,
+            },
+            {
+              title: "光伏",
+              value: (data?.qt?.gfsjgl / 1000).toFixed(2),
+              dialogTitle: "保证功率详情",
+              subUrl: "genreset/findGLDetail",
+              targetName: "bzgl",
+              dialogType: "powerLineChart",
+              max: 3000,
+            },
+          ];
+
+          let sbztmap = {
+            fd: {},
+            gf: {},
+          };
+          for (var key in data.mxztmap) {
+            let a = key.substring(3, key.length);
+            if (key.includes("gf_")) {
+              sbztmap.gf[a] = data.mxztmap[key];
+            } else if (key.includes("fd_")) {
+              sbztmap.fd[a] = data.mxztmap[key];
+            }
+          }
+          this.StationinformationData.sbztmap = sbztmap;
+        }
+      });
+    },
+    // 发电量
+    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,
+            },
+          ],
+        ];
+      });
+    },
+    // 获取场站24小时功率图
+    getData(wpId) {
+      FindPowerInfo({ id: wpId }).then((res) => {
+        if (res.data) {
+          let Powertrend = {
+            // 图表所用单位
+            units: ["(万KWh)", "(风速)"],
+            value: [
+              {
+                title: "保证功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "理论功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "实际功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+            ],
+          };
+
+          Powertrend.value[0].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.bzgl,
+            };
+          });
+          Powertrend.value[1].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.llgl,
+            };
+          });
+          Powertrend.value[2].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.sjgl,
+            };
+          });
+          this.CurveValues = Powertrend.value;
+        }
+      });
+    },
     firstRender(activeTab, showType, wpId, name) {
       this.activeTab = activeTab;
       this.tabShow = activeTab;
@@ -1417,50 +1759,26 @@ export default {
       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;
-            }
-          }
+          fcId = this.historyWpId;
         } else {
           fcId = "SXJ_RGN";
         }
         this.flag = true;
         this.penetrateType = 3;
         this.currents = 1;
-        this.mapName =
-          this.currents == 0
-            ? "KGDL_FGS"
-            : name
-            ? name
-            : this.stationList[this.currents].wpId;
-        this.companyid = fcId;
-        this.companyname = name;
-        this.currentTitle = name;
-      } else {
-        this.mapName =
-          this.currents == 0
-            ? "KGDL_FGS"
-            : name
-            ? name
-            : this.stationList[this.currents].wpId;
-        this.companyid = wpId;
-        this.companyname = name;
-        this.currentTitle = name;
       }
-
-      this.$emit("mapClicks", fcId, activeTab);
-      this.$emit("currentActiveTab", this.penetrateType);
+      this.companyid = fcId;
+      this.companyname = name;
+      this.currentTitle = name || "全国";
+      this.mapClicks(fcId, activeTab);
+      this.currentActiveTab(this.penetrateType);
     },
     backMap(wpId, planBtnName) {
       this.penetrateType = this.currents == 0 ? 0 : 3;
       this.currents--;
-      this.mapName =
-        this.currents == 0 ? "KGDL_FGS" : this.stationList[this.currents].wpId;
       this.currentTitle =
         this.currents == 0
-          ? ""
+          ? "全国"
           : this.companyname
           ? this.companyname
           : planBtnName;
@@ -1471,8 +1789,8 @@ export default {
           ? this.companyid
           : wpId;
       this.tabShow = this.activeTab;
-      this.$emit("mapClickBack", wpIds, this.activeTab);
-      this.$emit("currentActiveTab", this.penetrateType);
+      this.mapClickBack(wpIds, this.activeTab);
+      this.currentActiveTab(this.penetrateType);
     },
     clickLabel(wpId, planBtnName, penetrateType) {
       this.penetrateType = penetrateType;
@@ -1480,8 +1798,7 @@ export default {
       if (this.currents > 1) {
         this.currents = 2;
       }
-      this.mapName = wpId;
-      this.fcId =
+      this.wpId =
         wpId.includes("FDC") || wpId.includes("GDC")
           ? wpId
           : this.companyname
@@ -1493,11 +1810,10 @@ export default {
           : this.companyname
           ? this.companyname
           : planBtnName;
-
-      this.$emit("mapClick", this.fcId, this.activeTab);
+      this.mapClick(this.wpId, this.activeTab);
       this.tabShow = wpId.includes("FDC") ? -1 : wpId.includes("GDC") ? -2 : 0;
       this.flag = wpId.includes("FDC") || wpId.includes("GDC") ? true : false;
-      this.$emit("currentActiveTab", penetrateType);
+      this.currentActiveTab(penetrateType);
     },
     handleClick(uniformCode, title) {
       let key = "";
@@ -1521,8 +1837,8 @@ export default {
       FindRealtimeInfo({
         uniformCode,
         wpId:
-          this.fcId +
-          (this.fcId.includes("FDC") || this.fcId.includes("GDC")
+          this.wpId +
+          (this.wpId.includes("FDC") || this.wpId.includes("GDC")
             ? ""
             : this.activeTab),
       }).then(({ data }) => {
@@ -1532,7 +1848,7 @@ export default {
             dateTime: dayjs()
               .startOf("date")
               .add(item.hours, "hour")
-              .format("YYYY-MM-DD HH:mm:ss"),
+              .format("MM-DD HH:mm"),
             value: item[key],
           };
         });
@@ -1695,10 +2011,16 @@ export default {
       });
     },
   },
+  unmounted() {
+    clearInterval(this.timmer);
+    clearInterval(this.timmer2);
+    this.timmer = null;
+    this.timmer2 = null;
+  },
   watch: {
-    wpId(res) {
-      this.fcId = res;
-    },
+    // wpId(res) {
+    //   this.fcId = res;
+    // },
     qyPower(val) {
       if (Object.keys(val).length) {
         let data = val;
@@ -1754,9 +2076,6 @@ export default {
         ];
       }
     },
-    data(res) {
-      this.sourceMap = res;
-    },
   },
   computed: {
     // 实时风速

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

@@ -167,13 +167,7 @@
               <text class="mapKey" x="446" y="11" fill="#919697" font-size="8">
                 右玉小五台
               </text>
-              <text
-                class="mapValue"
-                x="498"
-                y="11"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="498" y="11" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_XWT_FDC_STA?.zjts }}
               </text>
               <text class="mapKey" x="508" y="11" fill="#919697" font-size="8">
@@ -254,7 +248,6 @@
                 平鲁禹丰
               </text>
               <text
-                class="mapValue"
                 x="410"
                 y="-1"
                 fill="#05bb4c"
@@ -266,7 +259,6 @@
                 {{ sourceMap?.station?.SXJ_KGDL_YF_FDC_STA?.zjts }}
               </text>
               <text
-                class="mapValue"
                 x="425"
                 y="-1"
                 fill="#919697"
@@ -283,27 +275,43 @@
                 y="14"
                 fill="#919697"
                 font-size="8"
-                @click.stop="clickLabel('SXJ_KGDL_DJY_FDC_STA', '右玉丁家窑', penetrateType)"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_DJY_FDC_STA',
+                    '右玉丁家窑',
+                    penetrateType
+                  )
+                "
               >
                 右玉丁家窑
               </text>
               <text
-                class="mapValue"
                 x="410"
                 y="14"
                 fill="#05bb4c"
                 font-size="8"
-                @click.stop="clickLabel('SXJ_KGDL_DJY_FDC_STA', '右玉丁家窑', penetrateType)"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_DJY_FDC_STA',
+                    '右玉丁家窑',
+                    penetrateType
+                  )
+                "
               >
                 {{ sourceMap?.station?.SXJ_KGDL_DJY_FDC_STA?.zjts }}
               </text>
               <text
-                class="mapValue"
                 x="425"
                 y="14"
                 fill="#919697"
                 font-size="8"
-                @click.stop="clickLabel('SXJ_KGDL_DJY_FDC_STA', '右玉丁家窑', penetrateType)"
+                @click.stop="
+                  clickLabel(
+                    'SXJ_KGDL_DJY_FDC_STA',
+                    '右玉丁家窑',
+                    penetrateType
+                  )
+                "
               >
                 台
               </text>
@@ -386,7 +394,6 @@
                 平鲁败虎堡
               </text>
               <text
-                class="mapValue"
                 x="375"
                 y="19"
                 fill="#05bb4c"
@@ -402,7 +409,6 @@
                 {{ sourceMap?.station?.SXJ_KGDL_BHB_FDC_STA?.zjts }}
               </text>
               <text
-                class="mapValue"
                 x="390"
                 y="19"
                 fill="#919697"
@@ -434,7 +440,6 @@
                 平鲁败虎堡三期
               </text>
               <text
-                class="mapValue"
                 x="375"
                 y="34"
                 fill="#05bb4c"
@@ -450,7 +455,6 @@
                 {{ sourceMap?.station?.SXJ_KGDL_BHB3_FDC_STA?.zjts }}
               </text>
               <text
-                class="mapValue"
                 x="390"
                 y="34"
                 fill="#919697"
@@ -546,7 +550,6 @@
                 寿阳平头镇
               </text>
               <text
-                class="mapValue"
                 x="468"
                 y="135"
                 fill="#05bb4c"
@@ -562,7 +565,6 @@
                 {{ sourceMap?.station?.SXJ_KGDL_PTZ_FDC_STA?.zjts }}
               </text>
               <text
-                class="mapValue"
                 x="485"
                 y="135"
                 fill="#919697"
@@ -594,7 +596,6 @@
                 寿阳羊头崖
               </text>
               <text
-                class="mapValue"
                 x="468"
                 y="120"
                 fill="#05bb4c"
@@ -610,7 +611,6 @@
                 {{ sourceMap?.station?.SXJ_KGDL_YTY_FDC_STA?.zjts }}
               </text>
               <text
-                class="mapValue"
                 x="485"
                 y="120"
                 fill="#919697"
@@ -642,7 +642,6 @@
                 寿阳尹灵芝
               </text>
               <text
-                class="mapValue"
                 x="468"
                 y="150"
                 fill="#05bb4c"
@@ -658,7 +657,6 @@
                 {{ sourceMap?.station?.SXJ_KGDL_YLZ_FDC_STA?.zjts }}
               </text>
               <text
-                class="mapValue"
                 x="485"
                 y="150"
                 fill="#919697"
@@ -744,24 +742,10 @@
               <text class="mapKey" x="313" y="139" fill="#919697" font-size="8">
                 平遥朱坑
               </text>
-              <text
-                class="mapValue"
-                x="355"
-                y="139"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="355" y="139" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_ZK_FDC_STA?.zjts }}
               </text>
-              <text
-                class="mapValue"
-                x="375"
-                y="139"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="375" y="139" fill="#919697" font-size="8">台</text>
             </g>
           </g>
           <g
@@ -805,24 +789,10 @@
               <text class="mapKey" x="518" y="26" fill="#919697" font-size="8">
                 天镇旭升
               </text>
-              <text
-                class="mapValue"
-                x="555"
-                y="26"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="555" y="26" fill="#05bb4c" font-size="8">
                 {{ sourceMap.TZ_GDC_zjts }}
               </text>
-              <text
-                class="mapValue"
-                x="575"
-                y="26"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="575" y="26" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -870,42 +840,14 @@
               <text class="mapKey" x="458" y="71" fill="#919697" font-size="8">
                 山阴荣新
               </text>
-              <text
-                class="mapValue"
-                x="495"
-                y="71"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="495" y="71" fill="#05bb4c" font-size="8">
                 集中式:{{ sourceMap?.station?.SXJ_KGDL_SY_GDC_STA?.jzzjts }}
               </text>
-              <text
-                class="mapValue"
-                x="535"
-                y="71"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
-              <text
-                class="mapValue"
-                x="555"
-                y="71"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="535" y="71" fill="#919697" font-size="8">台</text>
+              <text x="555" y="71" fill="#05bb4c" font-size="8">
                 组串式:{{ sourceMap?.station?.SXJ_KGDL_SY_GDC_STA?.zczjts }}
               </text>
-              <text
-                class="mapValue"
-                x="600"
-                y="71"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="600" y="71" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -953,24 +895,10 @@
               <text class="mapKey" x="478" y="36" fill="#919697" font-size="8">
                 怀仁初晨 组串式：
               </text>
-              <text
-                class="mapValue"
-                x="545"
-                y="36"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="545" y="36" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_HR_GDC_STA?.zczjts }}
               </text>
-              <text
-                class="mapValue"
-                x="565"
-                y="36"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="565" y="36" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -1018,42 +946,16 @@
               <text class="mapKey" x="458" y="54" fill="#919697" font-size="8">
                 阳高蔚家堡 集中式：
               </text>
-              <text
-                class="mapValue"
-                x="529"
-                y="54"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="529" y="54" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_YG_GDC_STA?.jzzjts }}
               </text>
-              <text
-                class="mapValue"
-                x="545"
-                y="54"
-                fill="#919697"
-                font-size="8"
-              >
+              <text x="545" y="54" fill="#919697" font-size="8">
                 台 组串式：
               </text>
-              <text
-                class="mapValue"
-                x="585"
-                y="54"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text 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"
-              >
-                台
-              </text>
+              <text x="605" y="54" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -1101,24 +1003,10 @@
               <text class="mapKey" x="455" y="60" fill="#919697" font-size="8">
                 应县晶辉 集中式：
               </text>
-              <text
-                class="mapValue"
-                x="520"
-                y="60"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="520" y="60" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_YX_GDC_STA?.jzzjts }}
               </text>
-              <text
-                class="mapValue"
-                x="540"
-                y="60"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="540" y="60" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -1166,42 +1054,16 @@
               <text class="mapKey" x="443" y="19" fill="#919697" font-size="8">
                 右玉右卫 集中式：
               </text>
-              <text
-                class="mapValue"
-                x="510"
-                y="19"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="510" y="19" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_YY_GDC_STA?.jzzjts }}
               </text>
-              <text
-                class="mapValue"
-                x="530"
-                y="19"
-                fill="#919697"
-                font-size="8"
-              >
+              <text x="530" y="19" fill="#919697" font-size="8">
                 台 组串式：
               </text>
-              <text
-                class="mapValue"
-                x="570"
-                y="19"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text 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"
-              >
-                台
-              </text>
+              <text x="590" y="19" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -1249,24 +1111,10 @@
               <text class="mapKey" x="465" y="91" fill="#919697" font-size="8">
                 繁峙均然 组串式：
               </text>
-              <text
-                class="mapValue"
-                x="530"
-                y="91"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="530" y="91" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_JR_GDC_STA?.zczjts }}
               </text>
-              <text
-                class="mapValue"
-                x="545"
-                y="91"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="545" y="91" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -1314,24 +1162,10 @@
               <text class="mapKey" x="398" y="242" fill="#919697" font-size="8">
                 屯留吾元 组串式：
               </text>
-              <text
-                class="mapValue"
-                x="460"
-                y="242"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="460" y="242" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_TL_GDC_STA?.zczjts }}
               </text>
-              <text
-                class="mapValue"
-                x="485"
-                y="242"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="485" y="242" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -1379,24 +1213,10 @@
               <text class="mapKey" x="247" y="126" fill="#919697" font-size="8">
                 方山孙家山 集中式：
               </text>
-              <text
-                class="mapValue"
-                x="320"
-                y="126"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="320" y="126" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_FS_GDC_STA?.jzzjts }}
               </text>
-              <text
-                class="mapValue"
-                x="340"
-                y="126"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="340" y="126" fill="#919697" font-size="8">台</text>
             </g>
           </g>
 
@@ -1444,24 +1264,10 @@
               <text class="mapKey" x="258" y="47" fill="#919697" font-size="8">
                 平鲁阻虎 集中式：
               </text>
-              <text
-                class="mapValue"
-                x="325"
-                y="47"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="325" y="47" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_PL_GDC_STA?.jzzjts }}
               </text>
-              <text
-                class="mapValue"
-                x="345"
-                y="47"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="345" y="47" fill="#919697" font-size="8">台</text>
             </g>
           </g>
           <g
@@ -1545,24 +1351,10 @@
                   >
                     平鲁高家堰
                   </text>
-                  <text
-                    class="mapValue"
-                    x="375"
-                    y="57"
-                    fill="#05bb4c"
-                    font-size="8"
-                  >
+                  <text x="375" y="57" fill="#05bb4c" font-size="8">
                     {{ sourceMap?.station?.SXJ_KGDL_GJY_FDC_STA?.zjts }}
                   </text>
-                  <text
-                    class="mapValue"
-                    x="390"
-                    y="57"
-                    fill="#919697"
-                    font-size="8"
-                  >
-                    台
-                  </text>
+                  <text x="390" y="57" fill="#919697" font-size="8">台</text>
                 </g>
                 <g
                   @click.stop="
@@ -1582,24 +1374,10 @@
                   >
                     平鲁红石峁
                   </text>
-                  <text
-                    class="mapValue"
-                    x="375"
-                    y="69"
-                    fill="#05bb4c"
-                    font-size="8"
-                  >
+                  <text x="375" y="69" fill="#05bb4c" font-size="8">
                     {{ sourceMap?.station?.SXJ_KGDL_HSM_FDC_STA?.zjts }}
                   </text>
-                  <text
-                    class="mapValue"
-                    x="390"
-                    y="69"
-                    fill="#919697"
-                    font-size="8"
-                  >
-                    台
-                  </text>
+                  <text x="390" y="69" fill="#919697" font-size="8">台</text>
                 </g>
                 <g
                   @click.stop="
@@ -1619,24 +1397,10 @@
                   >
                     牛家岭
                   </text>
-                  <text
-                    class="mapValue"
-                    x="375"
-                    y="82"
-                    fill="#05bb4c"
-                    font-size="8"
-                  >
+                  <text x="375" y="82" fill="#05bb4c" font-size="8">
                     {{ sourceMap?.station?.SXJ_KGDL_NJL_FDC_STA?.zjts }}
                   </text>
-                  <text
-                    class="mapValue"
-                    x="390"
-                    y="82"
-                    fill="#919697"
-                    font-size="8"
-                  >
-                    台
-                  </text>
+                  <text x="390" y="82" fill="#919697" font-size="8">台</text>
                 </g>
               </g>
             </g>
@@ -1710,24 +1474,10 @@
               <text class="mapKey" x="433" y="58" fill="#919697" font-size="8">
                 宁武盘道梁
               </text>
-              <text
-                class="mapValue"
-                x="480"
-                y="58"
-                fill="#05bb4c"
-                font-size="8"
-              >
+              <text x="480" y="58" fill="#05bb4c" font-size="8">
                 {{ sourceMap?.station?.SXJ_KGDL_PDL_FDC_STA?.zjts }}
               </text>
-              <text
-                class="mapValue"
-                x="495"
-                y="58"
-                fill="#919697"
-                font-size="8"
-              >
-                台
-              </text>
+              <text x="495" y="58" fill="#919697" font-size="8">台</text>
             </g>
           </g>
         </g>
@@ -1737,14 +1487,11 @@
 </template>
 
 <script>
-import Windmill from "../../../WindSite/components/Windmill.vue";
 export default {
   // 名称
   name: "SvgMap",
   // 使用组件
-  components: {
-    Windmill,
-  },
+  components: {},
   // 传入参数
   props: {
     data: {
@@ -1759,10 +1506,6 @@ export default {
       type: String,
       default: "SXJ_RGN",
     },
-    clickFlag: {
-      type: String,
-      default: "sx",
-    },
   },
   // 自定义事件
   emits: {
@@ -1772,7 +1515,6 @@ export default {
   data() {
     return {
       penetrateType: 3,
-      activeId: "all",
       sourceMap: {},
       c1: false,
       c2: false,
@@ -1784,32 +1526,13 @@ export default {
   },
   // 函数
   methods: {
-    clickGF() {
-      this.$router.replace({
-        path: `/monitor/windsite/matrix/SY_GDC`,
-      });
-    },
     clickLabel(wpId, planBtnName, penetrateType) {
       this.$emit("clickLabel", wpId, planBtnName, penetrateType);
     },
-    // changeshowType(id, planBtnName) {
-    //   this.activeId = id;
-    //   this.$emit("clickFj", id, planBtnName);
-    //   this.$emit("changePeriod", "牛首山", planBtnName.substring(planBtnName.length - 2),1);
-    // },
-    // clickFj(id, planBtnName) {
-    //   this.$emit("clickFj", id, planBtnName);
-    //   this.$emit("changePeriod", "牛首山", planBtnName.substring(planBtnName.length - 2));
-    // },
-    click: function (id) {
-      this.activeId = id;
-    },
-    mouseover() {},
     // 绑定鼠标浮动事件
     initMapFloat: function () {
       const els = this.$el.querySelectorAll(".map-float"); // 获取全部map-float元素
       const elsImage = this.$el.querySelectorAll(".map-float-image"); // 获取全部map-float元素
-      const that = this;
       Array.prototype.forEach.call(els, (element, index) => {
         // 遍历map-float元素
         element.addEventListener("mouseover", function () {
@@ -1829,17 +1552,6 @@ export default {
             els[index].style.opacity = 0;
           });
           elsImage[index].style.display = "block";
-          let period = this.getAttribute("data-period");
-          let strs = period.split(",");
-          that.$emit(
-            "changePeriod",
-            "牛首山",
-            strs[1].substring(strs[1].length - 2),
-            1
-          );
-          that.changeshowType(strs[0], strs[1]);
-          //   that.$emit("clickFj", strs[0], strs[1]);
-          this.style.opacity = 0.2;
         });
       });
     },
@@ -1858,25 +1570,12 @@ export default {
       }, 500);
     }, 2000);
   },
-  beforeMount() {
-    // 渲染前
-  },
   mounted() {
     // 渲染后
     this.svgWidth = this.$el.scrollWidth.toFixed(0);
     this.svgHeight = this.$el.scrollHeight.toFixed(0);
     this.svgTop = `calc(50% - ${this.svgHeight / 2}px)`;
     this.svgLeft = `calc(50% - ${this.svgWidth / 2}px)`;
-    // 绑定事件
-    // this.initMapFloat();
-    // 切换名称
-    // this.$emit("changePeriod", "牛首山", "ZERO");
-  },
-  beforeUpdate() {
-    // 数据更新前
-  },
-  updated() {
-    // 数据更新后
   },
   watch: {
     data(res) {
@@ -2056,7 +1755,7 @@ export default {
   }
 
   .nx-map-down-circle-loop {
-    animation: nxMapDownCircleLoop 2s linear infinite;
+    // animation: nxMapDownCircleLoop 2s linear infinite;
   }
 
   @keyframes nxMapDownCircleLoop {

src/views/Home/components/windChartCom.vue

@@ -81,12 +81,12 @@ export default {
           itemGap: 7,
         },
         xAxis: {
-          // type: 'category',
-          // name: 'x',
+          type: "category",
+          axisTick: {
+            alignWithLabel: true,
+          },
           axisLabel: {
-            interval: 11,
-            showMinLabel: true,
-            showMaxLabel: true,
+            show: true,
             textStyle: {
               color: "#606769",
             },
@@ -97,8 +97,8 @@ export default {
               width: 1, //轴线的宽度
             },
           },
-          splitLine: { show: false },
-          data: this.windCurveValues.map((item) => item.dateTime),
+          //   splitLine: { show: false },
+          //   data: this.windCurveValues.map((item) => item.dateTime),
         },
         yAxis: {
           type: "value",
@@ -118,7 +118,7 @@ export default {
         },
         grid: [
           {
-            left: 60,
+            left: 80,
             right: 40,
             top: 20,
             bottom: 30,
@@ -147,7 +147,9 @@ export default {
               width: 1,
             },
             color: "#3596EB",
-            data: this.windCurveValues,
+            data: this.windCurveValues.map((item) => {
+              return [item.dateTime, item.value];
+            }),
           },
         ],
       };

src/views/stateMonitor/DetailMatrix/detailMatrix.vue

@@ -1622,6 +1622,7 @@ export default {
           align-items: center;
           width: 93%;
           height: 100%;
+          white-space: nowrap;
         }
 
         .sub-title-item {
@@ -2729,6 +2730,7 @@ export default {
           align-items: center;
           width: 93%;
           height: 100%;
+          white-space: nowrap;
         }
 
         .sub-title-item {

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/fs-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/hr-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/jr-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/pl-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/sy-map.vue

@@ -161,9 +161,8 @@
               fill="#000000"
               opacity="0.8"
             />
-            <!-- <text class="mapValue" :x="Number(item.x) + 60" :y="Number(item.y) + 40" fill="#ffffff" font-size="14">{{ item.fs }}m/s</text> -->
+            <!-- <text  :x="Number(item.x) + 60" :y="Number(item.y) + 40" fill="#ffffff" font-size="14">{{ item.fs }}m/s</text> -->
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 35"
               fill="#ffffff"
@@ -237,10 +236,10 @@
                     <g class="isshow">
                         <rect :x="Number(item.x) + 55" :y="Number(item.y) + 20" width="70" height="50"
                             stroke="#46C55A35" fill="#000000" opacity="0.8" />
-                        <text class="mapValue" :x="Number(item.x) + 60" :y="Number(item.y) + 40" fill="#ffffff"
+                        <text  :x="Number(item.x) + 60" :y="Number(item.y) + 40" fill="#ffffff"
                             font-size="14">{{ item.fs }}
                             m/s</text>
-                        <text class="mapValue" :x="Number(item.x) + 60" :y="Number(item.y) + 60" fill="#ffffff"
+                        <text  :x="Number(item.x) + 60" :y="Number(item.y) + 60" fill="#ffffff"
                             font-size="14">{{ item.gl }}
                             kw</text>
                     </g>

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/sy2-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 35"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/wy-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/yg-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/yx-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/yy-map.vue

@@ -148,7 +148,7 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
+              
               :x="Number(item.x) - 10"
               :y="Number(item.y) + 100"
               fill="#ffffff"

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

@@ -647,17 +647,6 @@ export default {
 
           sts: "SSZGL",
         },
-        {
-          statiomName: "AGC指令",
-          stse: "CZMC",
-
-          sts: "AGC002",
-        },
-        {
-          statiomName: "出线功率",
-          stse: "CZMC",
-          sts: "AGC001",
-        },
       ],
       glStsee: [],
       singleMatrixInfo: {},
@@ -1535,6 +1524,7 @@ p {
         width: 93%;
         height: 100%;
         margin-left: 30px;
+        white-space: nowrap;
         .sub-title-item {
           display: flex;
           flex-direction: row;

src/views/stateMonitor/factoryMonitor/windPowerPlant/components/barCharts.vue

@@ -490,12 +490,16 @@ export default {
             axisPointer: {
               type: "shadow",
             },
+            axisTick: {
+              alignWithLabel: true,
+            },
             axisLabel: {
               interval: 0,
               fontSize: 12,
               textStyle: {
                 color: "rgb(116,124,128)",
               },
+              hideOverlap: true,
             },
           },
         ],

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/bhb-map.vue

@@ -204,7 +204,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -213,7 +212,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/bhb2-map.vue

@@ -184,7 +184,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -193,7 +192,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/bhb3-map.vue

@@ -204,7 +204,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -213,7 +212,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/djy-map.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/djy-map2.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/gjy-map.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/gjy-map2.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/hsm-map.vue.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/mlj-map.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/njl-map.vue

@@ -204,7 +204,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -213,7 +212,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"
@@ -617,7 +615,6 @@ export default {
   },
   methods: {
     getData() {
-
       this.dataList.forEach((item) => {
         this.list.forEach((i, num) => {
           if (item.name == i.wtname) {

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/njl-map2.vue

@@ -184,7 +184,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -193,7 +192,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/pdl-map.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/pldhb-map.vue

@@ -184,7 +184,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -193,7 +192,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"
@@ -544,7 +542,6 @@ export default {
   },
   methods: {
     getData() {
-    
       this.dataList.forEach((item) => {
         this.list.forEach((i, num) => {
           if (item.name == i.wtname) {

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/ptz-map.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"
@@ -594,7 +592,6 @@ export default {
   },
   methods: {
     getData() {
-     
       this.dataList.forEach((item) => {
         this.list.forEach((i, num) => {
           if (item.name == i.wtname) {

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/ptz2-map.vue

@@ -184,7 +184,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -193,7 +192,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/xwt-map.vue

@@ -204,7 +204,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -213,7 +212,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"
@@ -671,7 +669,6 @@ export default {
   },
   methods: {
     getData() {
-    
       this.dataList.forEach((item) => {
         this.list.forEach((i, num) => {
           if (item.name == i.wtname) {

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/yf2-map.vue

@@ -206,7 +206,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -215,7 +214,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/ylz-map.vue.vue

@@ -204,7 +204,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -213,7 +212,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/yty-map.vue

@@ -204,7 +204,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -213,7 +212,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/zkyq-map.vue

@@ -205,7 +205,6 @@
               opacity="0.8"
             />
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 40"
               fill="#ffffff"
@@ -214,7 +213,6 @@
               {{ item.fs }}m/s
             </text>
             <text
-              class="mapValue"
               :x="Number(item.x) + 60"
               :y="Number(item.y) + 60"
               fill="#ffffff"
@@ -774,7 +772,6 @@ export default {
   },
   methods: {
     getData() {
-    
       this.dataList.forEach((item) => {
         this.list.forEach((i, num) => {
           if (item.name == i.wtname) {

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

@@ -660,17 +660,17 @@ export default {
 
           sts: "SSZGL",
         },
-        {
-          statiomName: "AGC指令",
-          stse: "CZMC",
-
-          sts: "AGC002",
-        },
-        {
-          statiomName: "出线功率",
-          stse: "CZMC",
-          sts: "AGC001",
-        },
+        // {
+        //   statiomName: "AGC指令",
+        //   stse: "CZMC",
+
+        //   sts: "AGC002",
+        // },
+        // {
+        //   statiomName: "出线功率",
+        //   stse: "CZMC",
+        //   sts: "AGC001",
+        // },
       ],
       glStsee: [],
       singleMatrixInfo: {},
@@ -1550,6 +1550,7 @@ p {
         width: 93%;
         height: 100%;
         margin-left: 30px;
+        white-space: nowrap;
         .sub-title-item {
           display: flex;
           flex-direction: row;

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

@@ -375,7 +375,7 @@
 import headerButton from "../../components/headerButton";
 import powerEcharts from "@/components/chart/powerEcharts.vue";
 import PieChart from "../components/pieChart.vue";
-import BarCharts from "../components/barCharts.vue";
+import BarCharts from "@/views/stateMonitor/factoryMonitor/windPowerPlant/components/barCharts.vue";
 import LineCharts from "../components/lineCharts.vue";
 import { GetWpInfos, GetWpHisdata } from "@/api/factoryMonitor/index.js";
 import { GetWpPoints, GetPointFitting } from "@/api/points/index.js";