update

public/index.html

@@ -16,6 +16,7 @@
     }
   </script>
   <script src="./static/js/hlslib/hls.min.js"></script>
+  <script src="./static/config/modeConfig.js"></script>
   <style type="text/css">
     #ie_dialog {
       width: 350px;

public/static/config/modeConfig.js

@@ -15,6 +15,9 @@ const tilesMaxLevel = 18;
 // 适配器地址
 const adapterUrl = "http://10.155.32.4:8011/";
 
+// 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
+const showModuleName = 1;
+
 if (localTest) {
     // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
     // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
@@ -23,6 +26,7 @@ if (localTest) {
     tilesUrl = "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII";
 } else {
     baseURL = "http://10.155.32.4:8082/" // 正式环境
+    // baseURL = "http://192.168.1.103:8082/" // 正式环境
 
     tilesUrl = "http://10.155.32.4:8070/zhfx/new_tiles";
 }
@@ -34,5 +38,6 @@ window.__MODE__ = {
     websocketUrl,
     adapterUrl,
     tilesUrl,
-    tilesMaxLevel
+    tilesMaxLevel,
+    showModuleName
 };

src/App.vue

@@ -241,7 +241,7 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
       :class="{ hover: isShowMenu }"
       @mouseenter="showMenu"
       @mouseleave="hideMenu"
-      v-if="$store.state.themeName === 'dark'"
+      v-show="$store.state.themeName === 'dark'"
     >
       <Menu :root="root" />
     </div>
@@ -249,49 +249,36 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
       <el-menu
         class="lightMenu"
         :class="$store.state.themeName === 'light' ? 'show' : 'hidden'"
-        default-active="2"
         :collapse="true"
         text-color="#ffffff"
         active-text-color="#6262a2"
         background-color="#36348e"
+        @select="selectMenu"
       >
-        <el-sub-menu index="1" title="菜单1">
-          <template #title>
-            <el-icon>
-              <SvgIcon svgid="svg-matrix" />
-            </el-icon>
-          </template>
-          <el-menu-item-group>
-            <template #title><span>Group One</span></template>
-            <el-menu-item index="1-1">item one</el-menu-item>
-            <el-menu-item index="1-2">item two</el-menu-item>
-          </el-menu-item-group>
-          <el-menu-item-group title="Group Two">
-            <el-menu-item index="1-3">item three</el-menu-item>
-          </el-menu-item-group>
-          <el-sub-menu index="1-4">
-            <template #title><span>item four</span></template>
-            <el-menu-item index="1-4-1">item one</el-menu-item>
-          </el-sub-menu>
-        </el-sub-menu>
-        <el-sub-menu index="2" title="菜单2">
+        <el-sub-menu
+          :index="index"
+          :title="item.text"
+          v-for="(item, index) in menuData"
+          :key="index"
+        >
           <template #title>
-            <el-icon>
-              <SvgIcon svgid="svg-matrix" />
-            </el-icon>
+            <router-link :to="item.path">
+              <el-icon>
+                <SvgIcon :svgid="item.icon" />
+              </el-icon>
+            </router-link>
           </template>
-          <el-menu-item-group>
-            <template #title><span>Group One</span></template>
-            <el-menu-item index="2-1">item one</el-menu-item>
-            <el-menu-item index="2-2">item two</el-menu-item>
+          <el-menu-item-group
+            v-for="(menu, idx) in item.children"
+            :index="idx"
+            :key="idx"
+          >
+            <router-link :to="menu.path">
+              <el-menu-item :index="index + '-' + idx">{{
+                menu.text
+              }}</el-menu-item>
+            </router-link>
           </el-menu-item-group>
-          <el-menu-item-group title="Group Two">
-            <el-menu-item index="2-3">item three</el-menu-item>
-          </el-menu-item-group>
-          <el-sub-menu index="2-4">
-            <template #title><span>item four</span></template>
-            <el-menu-item index="2-4-1">item one</el-menu-item>
-          </el-sub-menu>
         </el-sub-menu>
       </el-menu>
     </div>
@@ -316,9 +303,6 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
 // 导入header.vue文件
 import Menu from "@/views/layout/Menu.vue";
 import Header from "@/views/layout/Header.vue";
-
-import { mapMutations } from "vuex";
-
 import LoginPage from "./views/layout/login-page.vue";
 import sisView from "./views/sisView/index.vue";
 
@@ -342,12 +326,18 @@ export default {
       isLogined: true,
       showSisView: false,
       memuCloseTimeout: null,
+      menuData: [],
     };
   },
 
   created() {
     let that = this;
-    $("#appBody").attr("class", that.$store.state.themeName);
+    const themeName = that.$store.state.themeName;
+    $("#appBody").attr(
+      "class",
+      themeName === "dark" || themeName === "light" ? themeName : "dark"
+    );
+
     // that.$nextTick(() => {
     //   that.API.requestData({
     //     isMust: false, // 请求是否携带 token ，默认为 true ，可缺省
@@ -395,11 +385,40 @@ export default {
     login(params) {
       if (params.username && params.password) this.isLogined = true;
     },
+    selectMenu(menuIndex) {
+      this.menuIndex = menuIndex;
+    },
   },
 
   watch: {
     $route(res) {
       this.showSisView = res.fullPath === "/sisView";
+      let ActiveModule = null;
+      this.menuData.forEach((pEle) => {
+        if (pEle.path === res.fullPath) {
+          ActiveModule = pEle;
+        }
+        pEle?.children?.forEach((cEle) => {
+          if (cEle.path === res.fullPath) {
+            ActiveModule = cEle;
+          }
+        });
+      });
+      if (ActiveModule) {
+        this.$store.dispatch("changeModuleName", ActiveModule.text);
+      }
+    },
+    "$store.state.menuData"(res) {
+      this.menuData = res;
+    },
+    "$store.state.moudleName"(msg) {
+      if (window.__MODE__.showModuleName && msg) {
+        this.BASE.showMsg({
+          type: this.$store.state.themeName === "dark" ? "success" : "warning",
+          showClose: true,
+          msg,
+        });
+      }
     },
   },
 };
@@ -418,12 +437,12 @@ export default {
 
   &::-webkit-scrollbar-track-piece {
     background-color: rgba(255, 255, 255, 0.05);
-    -webkit-border-radius: 4px;
+    border-radius: 4px;
   }
 
   &::-webkit-scrollbar-thumb {
     background-color: fade(@gray, 75);
-    -webkit-border-radius: 4px;
+    border-radius: 4px;
     outline: none;
     outline-offset: 0px;
     border: none;
@@ -540,7 +559,7 @@ body {
 .el-tree-node__label {
   font-size: 18px !important;
 }
-.el-pagination.is-background .el-pager li:not(.disabled).active{
+.el-pagination.is-background .el-pager li:not(.disabled).active {
   background-color: #05bb4c !important;
 }
 </style>

src/assets/dataService/arcgis-nx-fc1-line.json

@@ -1,234 +0,0 @@
-[
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "paths": [
-                [
-                    107.0644069,
-                    37.30000218
-                ],
-                [
-                    107.0609736,
-                    37.29027221
-                ],
-                [
-                    107.0545363,
-                    37.29431798
-                ],
-                [
-                    107.0488715,
-                    37.29385708
-                ],
-                [
-                    107.04561,
-                    37.29752713
-                ],
-                [
-                    107.0409322,
-                    37.30025821
-                ],
-                [
-                    107.0374346,
-                    37.30382554
-                ],
-                [
-                    107.0325208,
-                    37.30630038
-                ],
-                [
-                    107.0349455,
-                    37.30909941
-                ],
-                [
-                    107.0286155,
-                    37.30956022
-                ],
-                [
-                    107.0238519,
-                    37.31106208
-                ]
-            ]
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "width": 3
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "paths": [
-                [
-                    107.0649004,
-                    37.30542993
-                ],
-                [
-                    107.0527768,
-                    37.30129941
-                ],
-                [
-                    107.048614,
-                    37.30432051
-                ],
-                [
-                    107.0456958,
-                    37.30819486
-                ],
-                [
-                    107.0414472,
-                    37.31130101
-                ],
-                [
-                    107.0348811,
-                    37.31508967
-                ],
-                [
-                    107.0305467,
-                    37.31749588
-                ],
-                [
-                    107.0199444,
-                    37.31830556
-                ],
-                [
-                    107.0611238,
-                    37.30860447
-                ],
-                [
-                    107.0571327,
-                    37.31169354
-                ],
-                [
-                    107.0521975,
-                    37.31369028
-                ]
-            ]
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "width": 3
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "paths": [
-                [
-                    107.0693851,
-                    37.30322815
-                ],
-                [
-                    107.0744705,
-                    37.30041183
-                ],
-                [
-                    107.0696425,
-                    37.29628104
-                ],
-                [
-                    107.0717883,
-                    37.29213295
-                ],
-                [
-                    107.0662093,
-                    37.28824071
-                ],
-                [
-                    107.0567894,
-                    37.31587468
-                ],
-                [
-                    107.0560169,
-                    37.31988494
-                ],
-                [
-                    107.0506954,
-                    37.32184734
-                ],
-                [
-                    107.0727539,
-                    37.31087435
-                ],
-                [
-                    107.0761871,
-                    37.3067612
-                ],
-                [
-                    107.0820665,
-                    37.30641985
-                ]
-            ]
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "width": 3
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "paths": [
-                [
-                    107.0360184,
-                    37.32406563
-                ],
-                [
-                    107.0318985,
-                    37.32969639
-                ],
-                [
-                    107.0269525,
-                    37.33528407
-                ],
-                [
-                    107.0515966,
-                    37.32539657
-                ],
-                [
-                    107.0396662,
-                    37.33669159
-                ],
-                [
-                    107.0315766,
-                    37.34420644
-                ],
-                [
-                    107.0183909,
-                    37.34223611
-                ],
-                [
-                    107.0164329,
-                    37.33144098
-                ],
-                [
-                    107.0044997,
-                    37.32873236
-                ],
-                [
-                    107.0019168,
-                    37.33337322
-                ]
-            ]
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "width": 3
-        },
-        "popupTemplate": null
-    }
-]

src/assets/dataService/arcgis-nx-fc1.json

@@ -1,707 +0,0 @@
-[
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0674069,
-            "y": 37.3040218
-        },
-        "symbol": null,
-        "attributes": {
-            "objectid": 1,
-            "fc_code": "fc01",
-            "code": "升压站",
-            "type": "升压站"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0644069,
-            "y": 37.30000218
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG01",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0609736,
-            "y": 37.29027221
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG02",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0545363,
-            "y": 37.29431798
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG03",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0488715,
-            "y": 37.29385708
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG04",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.04561,
-            "y": 37.29752713
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG05",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0409322,
-            "y": 37.30025821
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG06",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0374346,
-            "y": 37.30382554
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG07",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0325208,
-            "y": 37.30630038
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG08",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0349455,
-            "y": 37.30909941
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG09",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0286155,
-            "y": 37.30956022
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG10",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0238519,
-            "y": 37.31106208
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG11",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0649004,
-            "y": 37.30542993
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG12",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0527768,
-            "y": 37.30129941
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG13",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.048614,
-            "y": 37.30432051
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG14",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0456958,
-            "y": 37.30819486
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG15",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0414472,
-            "y": 37.31130101
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG16",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0348811,
-            "y": 37.31508967
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG17",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0305467,
-            "y": 37.31749588
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG18",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0199444,
-            "y": 37.31830556
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG19",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0611238,
-            "y": 37.30860447
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG20",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0571327,
-            "y": 37.31169354
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG21",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0521975,
-            "y": 37.31369028
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG22",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0693851,
-            "y": 37.30322815
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG23",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0744705,
-            "y": 37.30041183
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG24",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0696425,
-            "y": 37.29628104
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG25",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0717883,
-            "y": 37.29213295
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG26",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0662093,
-            "y": 37.28824071
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG27",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0567894,
-            "y": 37.31587468
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG28",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0560169,
-            "y": 37.31988494
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG29",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0506954,
-            "y": 37.32184734
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG30",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0727539,
-            "y": 37.31087435
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG31",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0761871,
-            "y": 37.3067612
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG32",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0820665,
-            "y": 37.30641985
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG33",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0360184,
-            "y": 37.32406563
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG34",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0318985,
-            "y": 37.32969639
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG35",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0269525,
-            "y": 37.33528407
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG36",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0515966,
-            "y": 37.32539657
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG37",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0396662,
-            "y": 37.33669159
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG38",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0315766,
-            "y": 37.34420644
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG39",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0183909,
-            "y": 37.34223611
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG40",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0164329,
-            "y": 37.33144098
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG41",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0044997,
-            "y": 37.32873236
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG42",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "x": 107.0019168,
-            "y": 37.33337322
-        },
-        "symbol": null,
-        "attributes": {
-            "fc_code": "MHS",
-            "code": "MG43",
-            "type": "风场"
-        },
-        "popupTemplate": null
-    }
-]

src/assets/dataService/arcgis-sbq.json

@@ -1489,8 +1489,8 @@
 		"spatialReference": {
 			"wkid": 4326
 		},
-		"x": 106.5236833,
-		"y": 37.77213333
+		"x": 106.5286833,
+		"y": 37.62013333
 	},
 	"symbol": null,
 	"attributes": {
@@ -1504,7 +1504,7 @@
 		"spatialReference": {
 			"wkid": 4326
 		},
-		"x": 106.2033167,
+		"x": 106.5013167,
 		"y": 37.62301667
 	},
 	"symbol": null,
@@ -1519,7 +1519,7 @@
 		"spatialReference": {
 			"wkid": 4326
 		},
-		"x": 106.5059833,
+		"x": 106.459833,
 		"y": 37.61241667
 	},
 	"symbol": null,

src/assets/styles/common/color.less

@@ -20,4 +20,7 @@
 @greenLinearRight: linear-gradient(to right, fade(@green, 50%), fade(@green, 0));
 @redLinearRight: linear-gradient(to right, fade(@red, 50%), fade(@red, 0));
 
+@deepblueLinearTop: linear-gradient(to top, fade(@deepblue, 50%), fade(@deepblue, 0));
+@deepblueLinearRight: linear-gradient(to right, fade(@deepblue, 50%), fade(@deepblue, 0));
+
 @font-color: #7a8385;

src/assets/styles/common/common.less

@@ -21,5 +21,10 @@
 @import "../theme/light/light-sp.less"; // 沙盘
 @import "../theme/light/light-qt.less"; // 其他
 
+@import "../theme/light/jsc.less"; // 驾驶舱
+@import "../theme/light/jjyx.less"; // 经济运行
+@import "../theme/light/zhjx.less"; // 智慧检修	
+@import "../theme/light/aqgk.less"; // 安全管控
+
 // 暗色主题
 @import "../theme/dark/dark-jsc.less"; // 驾驶舱

src/assets/styles/el-override/el-input.less

@@ -377,6 +377,13 @@ body {
       color: @green;
     }
   }
+  .el-time-panel__btn.confirm {
+    color: @green;
+  }
+  
+  .el-time-panel__btn.cancel {
+    color: @gray;
+  }
 }
 
 .el-popper__arrow::before {

src/assets/styles/theme/light/light-jsc.less

@@ -372,7 +372,18 @@
         color     : #fff;
         transition: @transition;
     }
-
+	
+	.el-popper.is-light.is-pure .el-menu--popup {
+	  padding:0;
+	  .el-menu-item-group__title{padding:0;}
+	  .el-menu-item{height: 46px;line-height: 46px;}
+	}
+	
+	.el-popper.is-light{
+		border:none;
+		.el-menu{border-radius: 0px;}
+	}
+	
     .com-panel-3 {
         border    : 0;
         transition: @transition;
@@ -401,11 +412,11 @@
 
     .name-box {
         .name-box-title {
-            color     : #000;
+            color     : @black;
             transition: @transition;
         }
     }
-
+	
     background: rgb(220, 221, 223);
     transition: @transition;
 }

src/assets/styles/theme/light/light-qt.less

@@ -5,26 +5,257 @@
 #appBody.light {
 
     .sjcx-item {
-        color     : @black;
+        color: @black;
         transition: @transition;
     }
 
     .sjcx-item:hover {
-        color     : @deepblue;
+        color: @deepblue;
         transition: @transition;
     }
 
     .imgTitle {
-        color     : @black;
+        color: @black;
         transition: @transition;
     }
 
     .imgItem1:hover .imgTitle {
-        color     : @deepblue;
+        color: @deepblue;
         transition: @transition;
     }
 
     .el-carousel__item {
         border-radius: @borderRaduis;
     }
+
+    //统计分析
+    // .el-date-table td.end-date span, .el-date-table td.start-date span{
+    //     background-color: @deepblue;
+    // }
+
+    //原始数据查询-测点历史数据查询
+    .el-date-editor.is-active,
+    body .el-date-editor.is-active:hover,
+    body .el-date-editor.is-focus .el-input__inner {
+        border-color: @deepblue;
+    }
+
+    .el-date-editor .el-range__icon {
+        color: @black;
+    }
+
+    .el-date-editor .el-range__close-icon {
+        color: @black;
+    }
+
+    .el-picker-panel .el-picker-panel__footer {
+        background: @deepblue;
+        border-color: @deepblue;
+    }
+
+    .el-picker-panel .el-picker-panel__footer .el-button.is-plain {
+        color: @deepblue;
+    }
+
+    .el-date-editor.el-date-editor--datetimerange .el-range-input {
+        color: @black;
+    }
+
+    .el-date-editor.el-date-editor--datetimerange .el-range-separator {
+        color: @black;
+    }
+
+    .main-body .el-card .el-card__header {
+        color: @black;
+        background: @white;
+    }
+
+    .el-radio.is-bordered.el-radio--small .el-radio__label {
+        color: @black;
+    }
+
+    .el-radio.is-bordered.is-checked {
+        border-color: @deepblue;
+    }
+
+    .el-radio.is-checked .el-radio__inner {
+        background: @deepblue;
+        border-color: @deepblue;
+    }
+
+    .el-radio.is-checked .el-radio__label {
+        color: @deepblue;
+    }
+
+    .el-tree {
+        color: @black;
+        background: @white;
+    }
+
+    .el-tree-node__expand-icon {
+        color: @black;
+    }
+
+    .el-tree.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+        color: @deepblue;
+    }
+
+    .el-tree .el-tree-node__content:hover,
+    body .el-tree .el-upload-list__item:hover {
+        color: @deepblue;
+        font-weight: bold;
+    }
+
+    .el-tree .el-checkbox__inner:hover {
+        border-color: @blue;
+    }
+
+    .el-picker-panel.el-date-range-picker .el-date-range-picker__content .el-date-table td.end-date span,
+    .el-picker-panel.el-date-range-picker .el-date-range-picker__content .el-date-table td.start-date span {
+        background: rgba(@deepblueBg, 0.2);
+    }
+
+    //原始数据查询-测点数据查询
+    .com-table tbody tr:nth-child(2n){
+        background: @white;
+    }
+    // 原始数据查询-数据导出
+    .com-table td {
+        color: @black  !important;
+    }
+
+    .el-input__prefix {
+        color: @black;
+    }
+
+    .el-input__suffix {
+        color: @black;
+    }
+    .el-popper.el-select__popper[role="tooltip"]{
+        background: @white;
+    }
+    .el-popper__arrow::before{
+        background: @white !important;
+        border: 1px solid @white !important;
+    }
+    .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item.selected {
+        color: @deepblue;
+    }
+
+    .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item.hover {
+        background: @deepblue;
+        color: @white;
+    }
+
+    .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item:hover {
+        background: @deepblue;
+        color: @white;
+    }
+
+    .el-select .el-input .el-select__caret {
+        color: @black;
+    }
+
+    //设备管理
+    .el-tabs--card>.el-tabs__header .el-tabs__nav {
+        border: 1px solid @deepblue;
+        background: rgba(@deepblueBg, 0.2);
+    }
+
+    .tab .el-tabs__item.is-active {
+        color: @deepblue;
+        font-weight: bold;
+    }
+
+    .el-tabs--card>.el-tabs__header .el-tabs__item {
+        border-bottom: 1px solid @deepblue;
+    }
+
+    .tab .el-tabs__item {
+        color: @black;
+    }
+
+    .el-pagination .btn-next .el-icon,
+    .el-pagination .btn-prev .el-icon {
+        color: @black;
+    }
+
+    .el-pagination.is-background .el-pager li:not(.disabled).active {
+        background: linear-gradient(to top, #4b55ae, #36348e);
+        color: @white;
+    }
+
+    .el-table__row {
+        background: @white;
+    }
+
+    .el-popper.el-cascader__dropdown[role="tooltip"] .el-cascader-node.is-selectable.in-checked-path {
+        color: @black;
+    }
+
+    .el-popper.el-cascader__dropdown[role="tooltip"] .el-cascader-node:not(.is-disabled):hover {
+        color: @deepblue;
+    }
+
+    //预警记录-预警管理
+    .alarm-center .fj .fj-item .fj-title {
+        color: @black;
+    }
+
+    .action-bar .selections .item {
+        background: @white;
+    }
+
+    //预警记录-升压站报警
+    .number {
+        background: @white;
+        color: @black;
+    }
+
+    //预警记录-自定义报警记录
+    .custom-report-items .title {
+        background: @white;
+        color: @black;
+    }
+
+    .el-pagination .el-pager li {
+        color: @black;
+    }
+
+    .title {
+        background: @white;
+    }
+
+    //专家知识-故障知识列表
+    .know-info .table-card tr[data-v-68c7e6e4] {
+        font-size: 12px;
+        color: @black;
+    }
+
+    //样本库-故障训练样本库
+    .mg-b-8 {
+        background: @gray-2;
+    }
+
+    .mg-b-8[data-v-85e4c29a] {
+        width: 150vh;
+    }
+
+    .main-body .query .query-items[data-v-2fab00f5] {
+        padding-bottom: 1vh;
+    }
+
+    .main-body .query .query-items[data-v-2d26d8fa] {
+        padding-bottom: 1vh;
+    }
+
+    //样本库-知识库
+    .el-table th.el-table__cell>.cell {
+        color: @black;
+        height: 3.8vh;
+        padding-top: 0.6vh;
+    }
+    .swiperBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover, .itemBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover{
+        border: 3px solid @deepblue;
+    }
 }

src/assets/styles/theme/light/light-sp.less

@@ -110,8 +110,8 @@
             }
 
             .el-input__inner {
-                background   : rgba(0, 0, 0, 0.5);
-                border-color : rgba(0, 0, 0, 0.5);
+                // background   : rgba(0, 0, 0, 0.5);
+                border :1px solid rgba(0, 0, 0, 0.5);
                 border-radius: @borderRaduis;
                 transition   : @transition;
             }

src/assets/styles/theme/light/setting.less

@@ -3,4 +3,11 @@
 @black      : #000;
 @transition : 0.25s;
 @deepblue   : #36348e;
-@borderRaduis: 12px;
+@borderRaduis: 12px;
+@blue : #159AFA;
+@white : #ffffff;
+@gray-l     : #B3BDC0;
+@darkgray-1 : #7b7d7e;
+@green      : #05bb4c;
+@deepblueBg : 54, 52, 142;
+@gray-2:#dcdddf;

src/components/arcgis/NSS_FDC.vue

@@ -247,7 +247,6 @@ export default {
             item.attributes.dur = 8;
             break;
         }
-		console.log(item.geometry.x)
         this.$refs.arcgis.addHtmlPoint(
           [item.geometry.x, item.geometry.y],
           item.attributes.code,

src/components/arcgis/PL_GDC.vue

@@ -165,12 +165,11 @@
                 @click.prevent="clickEl(panel)"
               >
                 <text
-                  x="420"
+                  x="365"
                   y="220"
                   fill="#ffffff"
                   font-size="150"
                   text-anchor="middle"
-                  transform="rotate(-90 400 180)"
                 >
                   {{ panel.code }}
                 </text>
@@ -257,7 +256,6 @@
                   fill="#ffffff"
                   font-size="150"
                   text-anchor="middle"
-                  transform="rotate(-90 400 700)"
                 >
                   {{ panel.code }}
                 </text>
@@ -302,7 +300,7 @@ export default {
       arcgisData: {
         mode: "2D", // 模式 2D 3D
         title: "宁夏地图", // 标题
-        center: [106.48638888888888, 38.924166666666665], // 初始中心点
+        center: [106.2850, 38.5528], // 初始中心点
         height: 654, // 3D地图初始相机高度
         tilt: 65, // 俯视角
         scale: 15000,
@@ -311,192 +309,26 @@ export default {
       tempImg: require("@assets/temp1.png"),
       syzImg: require("@assets/png/booster-station.png"),
       showPopup: true,
-      panels: [
-        // fill top bottom none syz // red blue deepblue
-        { id: "00", type: "fill", code: "", state: "", line: "" },
-        { id: "01", type: "fill", code: "", state: "", line: "" },
-        { id: "02", type: "fill", code: "", state: "", line: "" },
-        { id: "03", type: "fill", code: "", state: "", line: "" },
-        { id: "04", type: "fill", code: "", state: "", line: "" },
-        { id: "05", type: "fill", code: "", state: "", line: "" },
-        {
-          id: "06",
-          type: "bottom",
-          code: "12",
-          state: "deepblue",
-          line: "bottom",
-        },
-        { id: "07", type: "none", code: "", state: "", line: "bottom" },
-        { id: "08", type: "fill", code: "", state: "", line: "" },
-        { id: "09", type: "fill", code: "", state: "", line: "" },
-
-        {
-          id: "10",
-          type: "top",
-          code: "36",
-          state: "deepblue",
-          line: "top left",
-        },
-        {
-          id: "11",
-          type: "top",
-          code: "32",
-          state: "deepblue",
-          line: "top left",
-        },
-        { id: "12", type: "top", code: "28", state: "deepblue", line: "top" },
-        { id: "13", type: "top", code: "24", state: "deepblue", line: "top" },
-        { id: "14", type: "top", code: "20", state: "deepblue", line: "top" },
-        {
-          id: "15",
-          type: "top",
-          code: "16",
-          state: "deepblue",
-          line: "top right",
-        },
-        { id: "16", type: "fill", code: "", state: "", line: "bottom right" },
-        { id: "17", type: "syz", code: "", state: "", line: "bottom right" },
-        { id: "18", type: "top", code: "5", state: "deepblue", line: "top" },
-        {
-          id: "19",
-          type: "top",
-          code: "4",
-          state: "deepblue",
-          line: "top right",
-        },
-
-        {
-          id: "20",
-          type: "bottom",
-          code: "37",
-          state: "deepblue",
-          line: "bottom left",
-        },
-        { id: "21", type: "fill", code: "", state: "deepblue", line: "left" },
-        { id: "22", type: "fill", code: "", state: "deepblue", line: "" },
-        { id: "23", type: "fill", code: "", state: "deepblue", line: "" },
-        { id: "24", type: "fill", code: "", state: "deepblue", line: "" },
-        { id: "25", type: "fill", code: "", state: "deepblue", line: "" },
-        {
-          id: "26",
-          type: "bottom",
-          code: "13",
-          state: "deepblue",
-          line: "bottom",
-        },
-        { id: "27", type: "fill", code: "", state: "", line: "" },
-        { id: "28", type: "fill", code: "", state: "deepblue", line: "" },
-        { id: "29", type: "fill", code: "", state: "deepblue", line: "right" },
-
-        { id: "30", type: "none", code: "", state: "", line: "" },
-        { id: "31", type: "top", code: "33", state: "deepblue", line: "top" },
-        { id: "32", type: "top", code: "29", state: "deepblue", line: "top" },
-        { id: "33", type: "top", code: "25", state: "deepblue", line: "top" },
-        { id: "34", type: "top", code: "21", state: "deepblue", line: "top" },
-        {
-          id: "35",
-          type: "top",
-          code: "17",
-          state: "deepblue",
-          line: "top right",
-        },
-        { id: "36", type: "fill", code: "", state: "deepblue", line: "" },
-        { id: "37", type: "top", code: "1", state: "deepblue", line: "top" },
-        { id: "38", type: "top", code: "2", state: "deepblue", line: "top" },
-        { id: "39", type: "top", code: "3", state: "deepblue", line: "top" },
-
-        { id: "40", type: "none", code: "", state: "", line: "" },
-        { id: "41", type: "fill", code: "", state: "", line: "" },
-        { id: "42", type: "fill", code: "", state: "", line: "" },
-        { id: "43", type: "fill", code: "", state: "", line: "" },
-        { id: "44", type: "fill", code: "", state: "", line: "" },
-        { id: "45", type: "fill", code: "", state: "", line: "" },
-        {
-          id: "46",
-          type: "bottom",
-          code: "14",
-          state: "deepblue",
-          line: "bottom left",
-        },
-        {
-          id: "47",
-          type: "bottom",
-          code: "10",
-          state: "deepblue",
-          line: "bottom",
-        },
-        {
-          id: "48",
-          type: "bottom",
-          code: "8",
-          state: "deepblue",
-          line: "bottom",
-        },
-        {
-          id: "49",
-          type: "bottom",
-          code: "6",
-          state: "deepblue",
-          line: "bottom",
-        },
-
-        { id: "50", type: "none", code: "", state: "", line: "" },
-        { id: "51", type: "top", code: "34", state: "red", line: "top left" },
-        { id: "52", type: "top", code: "30", state: "deepblue", line: "top" },
-        { id: "53", type: "top", code: "26", state: "deepblue", line: "top" },
-        { id: "54", type: "top", code: "22", state: "deepblue", line: "top" },
-        { id: "55", type: "top", code: "18", state: "deepblue", line: "top" },
-        { id: "56", type: "fill", code: "", state: "", line: "" },
-        { id: "57", type: "fill", code: "", state: "", line: "" },
-        { id: "58", type: "fill", code: "", state: "", line: "" },
-        { id: "59", type: "fill", code: "", state: "", line: "right" },
-
-        { id: "60", type: "none", code: "", state: "", line: "" },
-        { id: "61", type: "fill", code: "", state: "", line: "left" },
-        { id: "62", type: "fill", code: "", state: "", line: "" },
-        { id: "63", type: "fill", code: "", state: "", line: "" },
-        { id: "64", type: "fill", code: "", state: "", line: "" },
-        { id: "65", type: "fill", code: "", state: "", line: "" },
-        {
-          id: "66",
-          type: "bottom",
-          code: "15",
-          state: "deepblue",
-          line: "bottom",
-        },
-        {
-          id: "67",
-          type: "bottom",
-          code: "11",
-          state: "deepblue",
-          line: "bottom",
-        },
-        {
-          id: "68",
-          type: "bottom",
-          code: "9",
-          state: "deepblue",
-          line: "bottom",
-        },
-        {
-          id: "69",
-          type: "bottom",
-          code: "7",
-          state: "deepblue",
-          line: "bottom right",
-        },
-
-        { id: "70", type: "none", code: "", state: "", line: "" },
-        { id: "71", type: "top", code: "35", state: "blue", line: "top" },
-        { id: "72", type: "top", code: "31", state: "deepblue", line: "top" },
-        { id: "73", type: "top", code: "27", state: "deepblue", line: "top" },
-        { id: "74", type: "top", code: "23", state: "deepblue", line: "top" },
-        { id: "75", type: "top", code: "19", state: "deepblue", line: "top" },
-        { id: "76", type: "fill", code: "", state: "", line: "" },
-        { id: "77", type: "fill", code: "", state: "", line: "" },
-        { id: "78", type: "fill", code: "", state: "", line: "" },
-        { id: "79", type: "fill", code: "", state: "", line: "" },
-      ],
+      panels: 
+	  [{"id":"00","type":"top","code":1,"state":"deepblue","line":"top left"},
+	  {"id":"01","type":"top","code":2,"state":"deepblue","line":"top right"},
+	  {"id":"02","type":"top","code":3,"state":"deepblue","line":"top"},
+	  {"id":"03","type":"top","code":4,"state":"deepblue","line":"top right"},
+	  {"id":"04","type":"top","code":5,"state":"deepblue","line":"top"},
+	  {"id":"05","type":"top","code":6,"state":"deepblue","line":"top right"},
+	  {"id":"06","type":"top","code":7,"state":"deepblue","line":"top"},
+	  {"id":"07","type":"top","code":8,"state":"deepblue","line":"top right"},
+	  {"id":"08","type":"top","code":9,"state":"deepblue","line":"top"},
+	  {"id":"09","type":"top","code":10,"state":"deepblue","line":"top right"},
+	  {"id":"10","type":"top","code":11,"state":"deepblue","line":"top left"},
+	  {"id":"11","type":"top","code":12,"state":"deepblue","line":"top right"},
+	  {"id":"12","type":"top","code":13,"state":"deepblue","line":"top"},
+	  {"id":"13","type":"top","code":14,"state":"deepblue","line":"top right"},
+	  {"id":"14","type":"top","code":15,"state":"deepblue","line":"top"},
+	  {"id":"15","type":"top","code":16,"state":"deepblue","line":"top right"},
+	  {"id":"16","type":"top","code":17,"state":"deepblue","line":"top"},
+	  {"id":"17","type":"top","code":18,"state":"deepblue","line":"top right"},
+	  {"id":"18","type":"top","code":19,"state":"deepblue","line":"top right"}]
     };
   },
   created() {
@@ -517,12 +349,12 @@ export default {
     clickMap: function (info) {
       console.log(info);
     },
-    popupBack: function () {
-      this.showPopup = false;
-    },
     clickEl: function (item) {
-      console.log(item);
-      this.showPopup = true;
+		let wpId = this.$route.path.split('/').pop(),
+			wtId = wpId.split('_')[0] +'01_'+ item.id;
+		this.$router.push({
+		  path: `/monitor/windsite/inverter-info/`+wpId+`/`+wtId,
+		});
     },
   },
   watch: {

src/components/arcgis/QS_FDC.vue

@@ -1,444 +1,502 @@
 <template>
-	<div style="width: 100%; height: 100%">
-		<arcgis class="arcgis-layer" @when="when" ref="arcgis" :data="arcgisData" @clickMap="clickMap">
-			<template v-for="(fan, index) of fans" :key="index" v-slot:[fan.attributes.code]>
-				<svg v-if="fan.attributes.code != '升压站'" @click="clickFan(fan.attributes.code)"
-					class="can-click esri-component" version="1.1" xmlns="http://www.w3.org/2000/svg"
-					xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 200 240" enable-background="new 0 0 200 240"
-					xml:space="preserve" width="66" height="66">
-					<!-- 底座 -->
-					<g>
-						<path fill-rule="evenodd" clip-rule="evenodd" :fill="colors[fan.attributes.state][2]"
-							d="M100.681,156.137c24.579,0,44.505,8.548,44.505,19.094
-                            c0,10.545-19.926,19.093-44.505,19.093c-24.577,0-42.878-8.548-42.878-19.093C57.803,164.685,76.104,156.137,100.681,156.137z" />
-					</g>
-					<!-- 后面的脑袋 -->
-					<g>
-						<path fill-rule="evenodd" clip-rule="evenodd" :fill="colors[fan.attributes.state][0]" d="M92.875,76.372l27.897-18.417c0,0,4.108-0.096,7.891,2.681
-                                c4.305,3.156,1.86,9.235,1.86,9.235l-24.374,23.292L92.875,76.372z" />
-					</g>
-					<!-- 柱 -->
-					<g>
-						<path fill-rule="evenodd" clip-rule="evenodd" :fill="colors[fan.attributes.state][0]"
-							d="M92.152,175.229h18.689l-4.876-94.254H97.84L92.152,175.229z" />
-					</g>
-					<!-- 风扇 -->
-					<g>
-						<path fill-rule="evenodd" clip-rule="evenodd" :fill="colors[fan.attributes.state][1]"
-							d="M109.007,85.525l-16.061,0.268l7.396-83.773L109.007,85.525z" />
-						<path fill-rule="evenodd" clip-rule="evenodd" :fill="colors[fan.attributes.state][1]" d="M95.219,75.597l8.265,13.771l-76.25,35.483L95.219,75.597z
-                            M99.108,89.634l7.795-14.04l68.854,48.291L99.108,89.634z" />
-						<animateTransform v-if="fan.attributes.rotate" attributeName="transform" attributeType="XML"
-							type="rotate" from="0 100 82" to="359 100 82" :dur="fan.attributes.dur + 's'"
-							repeatCount="indefinite" />
-					</g>
-					<!-- 前面的尖 -->
-					<g>
-						<path fill-rule="evenodd" clip-rule="evenodd" :fill="colors[fan.attributes.state][2]" d="M92.863,72.903c0,0,13.912-0.343,17.098,4.352
-                            c2.984,4.397-2.58,15.473-2.58,15.473l-24.376,0.436L92.863,72.903z" />
-					</g>
-					<!-- 文字 -->
-					<g>
-						<text x="100" y="240" fill="#ffffff" font-size="40" text-anchor="middle"
-							alignment-baseline="baseline">
-							{{ fan.attributes.code }}
-						</text>
-					</g>
-				</svg>
-				<div v-if="fan.attributes.code == '升压站'">
-					<div class="syz-img">
-						<img :src="syzImg" />
-					</div>
-					<div class="white font-sm mr-t-8" style="text-align: center">
-						{{ fan.attributes.code }}
-					</div>
-				</div>
-			</template>
-		</arcgis>
-	</div>
+  <div style="width: 100%; height: 100%">
+    <arcgis
+      class="arcgis-layer"
+      @when="when"
+      ref="arcgis"
+      :data="arcgisData"
+      @clickMap="clickMap"
+    >
+      <template
+        v-for="(fan, index) of fans"
+        :key="index"
+        v-slot:[fan.attributes.code]
+      >
+        <svg
+          v-if="fan.attributes.code != '升压站'"
+          @click="clickFan(fan.attributes.code)"
+          class="can-click esri-component"
+          version="1.1"
+          xmlns="http://www.w3.org/2000/svg"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          viewBox="0 0 200 240"
+          enable-background="new 0 0 200 240"
+          xml:space="preserve"
+          width="66"
+          height="66"
+        >
+          <!-- 底座 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][2]"
+              d="M100.681,156.137c24.579,0,44.505,8.548,44.505,19.094
+                            c0,10.545-19.926,19.093-44.505,19.093c-24.577,0-42.878-8.548-42.878-19.093C57.803,164.685,76.104,156.137,100.681,156.137z"
+            />
+          </g>
+          <!-- 后面的脑袋 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][0]"
+              d="M92.875,76.372l27.897-18.417c0,0,4.108-0.096,7.891,2.681
+                                c4.305,3.156,1.86,9.235,1.86,9.235l-24.374,23.292L92.875,76.372z"
+            />
+          </g>
+          <!-- 柱 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][0]"
+              d="M92.152,175.229h18.689l-4.876-94.254H97.84L92.152,175.229z"
+            />
+          </g>
+          <!-- 风扇 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][1]"
+              d="M109.007,85.525l-16.061,0.268l7.396-83.773L109.007,85.525z"
+            />
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][1]"
+              d="M95.219,75.597l8.265,13.771l-76.25,35.483L95.219,75.597z
+                            M99.108,89.634l7.795-14.04l68.854,48.291L99.108,89.634z"
+            />
+            <animateTransform
+              v-if="fan.attributes.rotate"
+              attributeName="transform"
+              attributeType="XML"
+              type="rotate"
+              from="0 100 82"
+              to="359 100 82"
+              :dur="fan.attributes.dur + 's'"
+              repeatCount="indefinite"
+            />
+          </g>
+          <!-- 前面的尖 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][2]"
+              d="M92.863,72.903c0,0,13.912-0.343,17.098,4.352
+                            c2.984,4.397-2.58,15.473-2.58,15.473l-24.376,0.436L92.863,72.903z"
+            />
+          </g>
+          <!-- 文字 -->
+          <g>
+            <text
+              x="100"
+              y="240"
+              fill="#ffffff"
+              font-size="40"
+              text-anchor="middle"
+              alignment-baseline="baseline"
+            >
+              {{ fan.attributes.code }}
+            </text>
+          </g>
+        </svg>
+        <div v-if="fan.attributes.code == '升压站'">
+          <div class="syz-img">
+            <img :src="syzImg" />
+          </div>
+          <div class="white font-sm mr-t-8" style="text-align: center">
+            {{ fan.attributes.code }}
+          </div>
+        </div>
+      </template>
+    </arcgis>
+  </div>
 </template>
 
 <script>
-	import arcgis from "./arcgis.vue";
-	import dataService from "@/helper/data.js";
-
-	export default {
-		// 名称
-		name: "Map",
-		// 使用组件
-		components: {
-			arcgis,
-		},
-		props: {
-			wpId: {
-				type: String,
-				default: "",
-			},
-		},
-		// 数据
-		data() {
-			return {
-				wpnumMap: {}, //风机监视数量
-				wpInfoMap: {}, //风机详情
-				fjmap: [], // 风机名
-				sourceId: "",
-				arcgisData: {
-					mode: "2D", // 模式 2D 3D
-					title: "宁夏地图", // 标题
-					center: [107.217636108398, 37.5134917819943], // 初始中心点 106.230909, 38.487193
-					height: 654, // 3D地图初始相机高度
-					tilt: 65, // 俯视角
-					scale: 55000,
-					rotation: -45,
-					ox: -600,
-					oy: -50,
-				},
-				showPopup: false,
-				mapToolIndex: 0,
-				fans: [],
-				colors: {
-					0: ["#05bb4c", "#4ad476", "#9fedb2"],
-					1: ["#4b55ae", "#959dc7", "#d3d6e0"],
-					2: ["#BA3237", "#d4807d", "#eddad8"],
-					3: ["#606769", "#757575", "#AFAFAF"],
-					4: ["#e17e23", "#fabf78", "#ffebcc"],
-					5: ["#c531c7", "#e080dc", "#fadef7"],
-					6: ["#c531c7", "#e080dc", "#fadef7"],
-				},
-				syzImg: require("@assets/png/booster-station.png"),
-			};
-		},
-		created() {
-			let that = this;
-			that.sourceId = this.wpId;
-			that.$nextTick(() => {
-				that.requestData();
-			});
-		},
-		// 函数
-		methods: {
-			select(res) {
-				this.$router.replace({
-					path: `/monitor/windsite/map/${res.code}`,
-				});
-			},
-			// 风机状态监视
-			requestData() {
-				let that = this;
-				that.API.requestData({
-					method: "POST",
-					subUrl: "monitor/findGeneralAppearance",
-					data: {
-						wpId: that.wpId,
-					},
-					success(res) {
-						if (res.code == 200) {
-							that.wpnumMap = res.data.fczbmap.jczbmap;
-							that.wpInfoMap = res.data.wxssmap;
-							that.fjmap = res.data.fjmap[0];
-							that.when();
-						}
-					},
-				});
-			},
-			when: function() {
-				let jsonObj = dataService.get("arcgis-qs");
-				this.fans = jsonObj;
-				jsonObj.forEach((item) => {
-					let obj = this.fjmap.find((t) => {
-						let wtid = t.wtId.replace("01_", "");
-						if (wtid == item.attributes.code) return t;
-					});
-					if (obj) {
-						item.attributes.state = String(obj.fjzt);
-					} else {
-						item.attributes.state = "4";
-					}
-					switch (item.attributes.state) {
-						case "0": //待机
-							item.attributes.rotate = false; // 转
-							item.attributes.dur = 8; // 转一圈时间
-							break;
-						case "1": //运行
-							item.attributes.rotate = true; // 转
-							item.attributes.dur = 2; // 转一圈时间
-							break;
-						case "2": //故障
-							item.attributes.rotate = false; // 不转
-							item.attributes.dur = 8;
-							break;
-						case "3": //中断
-							item.attributes.rotate = false; // 不转
-							item.attributes.dur = 8;
-							break;
-						case "4": //维护
-							item.attributes.rotate = false; // 不转
-							item.attributes.dur = 8;
-							break;
-						case "5": //限电
-							item.attributes.rotate = true; // 转
-							item.attributes.dur = 6;
-							break;
-						case "6": //停机
-							item.attributes.rotate = false; // 不转
-							item.attributes.dur = 8;
-							break;
-						default:
-							item.attributes.rotate = false;
-							item.attributes.dur = 8;
-							break;
-					}
-					this.$refs.arcgis.addHtmlPoint(
-						[item.geometry.x, item.geometry.y],
-						item.attributes.code,
-						33,
-						50,
-						false
-					);
-				});
-				let lineJsonObj = dataService.get("arcgis-qs-line");
-				this.$refs.arcgis.addFanByJson(jsonObj, lineJsonObj);
-			},
-			clickMap: function(info) {
-				console.log(info);
-			},
-			clickFan: function(code) {
-				let wtId = code.replace("G", "G01_");
-				this.$router.push(`/monitor/windsite/info/${this.wpId}/${wtId}`);
-			},
-			popupBack: function() {
-				this.showPopup = false;
-			},
-			clickMapTool: function(index) {
-				//   this.mapToolIndex = index;
-				this.showPopup = !this.showPopup;
-			},
-		},
-		watch: {
-			wpId(res) {
-				this.sourceId = res;
-				if (res) {
-					this.requestData();
-				}
-			},
-		},
-	};
+import arcgis from "./arcgis.vue";
+import dataService from "@/helper/data.js";
+
+export default {
+  // 名称
+  name: "Map",
+  // 使用组件
+  components: {
+    arcgis,
+  },
+  props: {
+    wpId: {
+      type: String,
+      default: "",
+    },
+  },
+  // 数据
+  data() {
+    return {
+      wpnumMap: {}, //风机监视数量
+      wpInfoMap: {}, //风机详情
+      fjmap: [], // 风机名
+      sourceId: "",
+      arcgisData: {
+        mode: "2D", // 模式 2D 3D
+        title: "宁夏地图", // 标题
+        center: [107.217636108398, 37.5134917819943], // 初始中心点 106.230909, 38.487193
+        height: 654, // 3D地图初始相机高度
+        tilt: 65, // 俯视角
+        scale: 55000,
+        rotation: -45,
+        ox: -600,
+        oy: -50,
+      },
+      showPopup: false,
+      mapToolIndex: 0,
+      fans: [],
+      colors: {
+        0: ["#05bb4c", "#4ad476", "#9fedb2"],
+        1: ["#4b55ae", "#959dc7", "#d3d6e0"],
+        2: ["#BA3237", "#d4807d", "#eddad8"],
+        3: ["#606769", "#757575", "#AFAFAF"],
+        4: ["#e17e23", "#fabf78", "#ffebcc"],
+        5: ["#c531c7", "#e080dc", "#fadef7"],
+        6: ["#c531c7", "#e080dc", "#fadef7"],
+      },
+      syzImg: require("@assets/png/booster-station.png"),
+    };
+  },
+  created() {
+    let that = this;
+    that.sourceId = this.wpId;
+    that.$nextTick(() => {
+      that.requestData();
+    });
+  },
+  // 函数
+  methods: {
+    select(res) {
+      this.$router.replace({
+        path: `/monitor/windsite/map/${res.code}`,
+      });
+    },
+    // 风机状态监视
+    requestData() {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "monitor/findGeneralAppearance",
+        data: {
+          wpId: that.wpId,
+        },
+        success(res) {
+          if (res.code == 200) {
+            that.wpnumMap = res.data.fczbmap.jczbmap;
+            that.wpInfoMap = res.data.wxssmap;
+            that.fjmap = res.data.fjmap[0];
+			that.when();
+          }
+        },
+      });
+    },
+    when: function () {
+      let jsonObj = dataService.get("arcgis-qs");
+      this.fans = jsonObj;
+      jsonObj.forEach((item) => {
+        let obj = this.fjmap.find((t) => {
+          let wtid = t.wtId.replace("01_", "");
+          if (wtid == item.attributes.code) return t;
+        });
+        if (obj) {
+          item.attributes.state = String(obj.fjzt);
+        } else {
+          item.attributes.state = "4";
+        }
+        switch (item.attributes.state) {
+          case "0": //待机
+            item.attributes.rotate = false; // 转
+            item.attributes.dur = 8; // 转一圈时间
+            break;
+          case "1": //运行
+            item.attributes.rotate = true; // 转
+            item.attributes.dur = 2; // 转一圈时间
+            break;
+          case "2": //故障
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          case "3": //中断
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          case "4": //维护
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          case "5": //限电
+            item.attributes.rotate = true; // 转
+            item.attributes.dur = 6;
+            break;
+          case "6": //停机
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          default:
+            item.attributes.rotate = false;
+            item.attributes.dur = 8;
+            break;
+        }
+        this.$refs.arcgis.addHtmlPoint(
+          [item.geometry.x, item.geometry.y],
+          item.attributes.code,
+          33,
+          50,
+          false
+        );
+      });
+      let lineJsonObj = dataService.get("arcgis-qs-line");
+      this.$refs.arcgis.addFanByJson(jsonObj, lineJsonObj);
+    },
+    clickMap: function (info) {
+      console.log(info);
+    },
+    clickFan: function (code) {
+      let wtId = code.replace("G", "G01_");
+      this.$router.push(`/monitor/windsite/info/${this.wpId}/${wtId}`);
+    },
+    popupBack: function () {
+      this.showPopup = false;
+    },
+    clickMapTool: function (index) {
+      //   this.mapToolIndex = index;
+      this.showPopup = !this.showPopup;
+    },
+  },
+  watch: {
+    wpId(res) {
+      this.sourceId = res;
+      if (res) {
+        this.requestData();
+      }
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
-	@titleHeight: 40px;
-
-	.map-1 {
-		width: 100%;
-		height: calc(100vh - 90px);
-		display: flex;
-		flex-direction: column;
-
-		.btn-group-tabs {
-			display: flex;
-			flex-direction: row;
-		}
-
-		.can-click {
-			cursor: pointer;
-		}
-
-		.syz-img {
-			width: 65px;
-			height: 47px;
-
-			img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.panel-title {
-			width: 100%;
-			background-color: fade(@darkgray, 40%);
-			margin-top: 16px;
-			padding: 6px;
-			display: flex;
-			align-items: center;
-
-			.panel-title-name {
-				color: @green;
-				display: flex;
-				align-items: center;
-				line-height: 0;
-				font-size: 0;
-
-				i,
-				span {
-					margin: 0 0 0 16px;
-					line-height: 0;
-					font-size: 13px;
-				}
-			}
-
-			.sub-title-item {
-				display: flex;
-				align-items: center;
-				margin-left: 16px;
-
-				.sub-title {
-					font-size: 13px;
-					margin-left: 6px;
-				}
-
-				.sub-count {
-					font-size: 13px;
-					font-weight: 500;
-				}
-
-				img {
-					height: 31px;
-				}
-			}
-		}
-
-		.panel-body {
-			flex-grow: 1;
-			background-color: fade(@darkgray, 20%);
-			padding: 8px;
-			overflow: auto;
-			position: relative;
-
-			.arcgis-layer {
-				z-index: 1;
-			}
-
-			.map-popup-panel {
-				width: 760px;
-				position: absolute;
-				left: 71px;
-				top: 22px;
-				z-index: 2;
-
-				.map-popup-panel-header {
-					width: 100%;
-					background: fade(#152221, 90%);
-					display: flex;
-
-					.map-popup-panel-title {
-						padding: 17px 24px;
-						font-size: @fontsize-s;
-						position: relative;
-
-						&::before,
-						&::after {
-							position: absolute;
-							width: calc(50% - 6px);
-							bottom: 0;
-							border-bottom: 2px solid @green;
-						}
-
-						&::before {
-							content: "";
-							left: 0;
-						}
-
-						&::after {
-							content: "";
-							right: 0;
-						}
-
-						span {
-							position: absolute;
-							width: 11.3px;
-							height: 11.3px;
-							border-left: 2px solid @green;
-							border-top: 2px solid @green;
-							left: calc(50% - 5.65px);
-							bottom: -3px;
-							transform: rotate(45deg);
-						}
-					}
-
-					.map-popup-panel-date {
-						flex-grow: 1;
-						padding: 17px 24px;
-						font-size: @fontsize-s;
-						text-align: right;
-						border-bottom: 2px solid @green;
-					}
-
-					.map-popup-panel-back {
-						margin-left: auto;
-						width: 54px;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						position: relative;
-						cursor: pointer;
-
-						&::after {
-							content: "";
-							position: absolute;
-							left: 0;
-							height: 50%;
-							border-left: 1px solid @gray;
-							top: 25%;
-						}
-					}
-				}
-
-				.map-popup-panel-body {
-					background: fade(#152221, 75%);
-					border: 1px solid fade(@darkgray, 40);
-					border-top: 0px;
-
-					.table-form {
-
-						.text,
-						.unit {
-							font-weight: 400;
-						}
-
-						.unit {
-							min-width: auto;
-						}
-
-						.value,
-						.unit {
-							text-align: left;
-						}
-					}
-				}
-			}
-
-			.map-tool {
-				position: absolute;
-				right: 22px;
-				top: 22px;
-				z-index: 2;
-				background: #152221af;
-				padding: 18px 14px;
-
-				.m-btn {
-					width: 124px;
-					height: 44px;
-					background: #152221bf;
-					border: 1px solid #152221bf;
-					color: #ffffff;
-					transition: all 0.3s;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					cursor: pointer;
-
-					&:hover,
-					&.active {
-						background: #05bb4c33;
-						border: 1px solid #05bb4c;
-						color: #05bb4c;
-					}
-
-					+.m-btn {
-						margin-top: 16px;
-					}
-				}
-			}
-		}
-	}
+@titleHeight: 40px;
+
+.map-1 {
+  width: 100%;
+  height: calc(100vh - 90px);
+  display: flex;
+  flex-direction: column;
+
+  .btn-group-tabs {
+    display: flex;
+    flex-direction: row;
+  }
+
+  .can-click {
+    cursor: pointer;
+  }
+
+  .syz-img {
+    width: 65px;
+    height: 47px;
+
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .panel-title {
+    width: 100%;
+    background-color: fade(@darkgray, 40%);
+    margin-top: 16px;
+    padding: 6px;
+    display: flex;
+    align-items: center;
+
+    .panel-title-name {
+      color: @green;
+      display: flex;
+      align-items: center;
+      line-height: 0;
+      font-size: 0;
+
+      i,
+      span {
+        margin: 0 0 0 16px;
+        line-height: 0;
+        font-size: 13px;
+      }
+    }
+
+    .sub-title-item {
+      display: flex;
+      align-items: center;
+      margin-left: 16px;
+
+      .sub-title {
+        font-size: 13px;
+        margin-left: 6px;
+      }
+
+      .sub-count {
+        font-size: 13px;
+        font-weight: 500;
+      }
+
+      img {
+        height: 31px;
+      }
+    }
+  }
+
+  .panel-body {
+    flex-grow: 1;
+    background-color: fade(@darkgray, 20%);
+    padding: 8px;
+    overflow: auto;
+    position: relative;
+
+    .arcgis-layer {
+      z-index: 1;
+    }
+
+    .map-popup-panel {
+      width: 760px;
+      position: absolute;
+      left: 71px;
+      top: 22px;
+      z-index: 2;
+
+      .map-popup-panel-header {
+        width: 100%;
+        background: fade(#152221, 90%);
+        display: flex;
+
+        .map-popup-panel-title {
+          padding: 17px 24px;
+          font-size: @fontsize-s;
+          position: relative;
+
+          &::before,
+          &::after {
+            position: absolute;
+            width: calc(50% - 6px);
+            bottom: 0;
+            border-bottom: 2px solid @green;
+          }
+
+          &::before {
+            content: "";
+            left: 0;
+          }
+
+          &::after {
+            content: "";
+            right: 0;
+          }
+
+          span {
+            position: absolute;
+            width: 11.3px;
+            height: 11.3px;
+            border-left: 2px solid @green;
+            border-top: 2px solid @green;
+            left: calc(50% - 5.65px);
+            bottom: -3px;
+            transform: rotate(45deg);
+          }
+        }
+
+        .map-popup-panel-date {
+          flex-grow: 1;
+          padding: 17px 24px;
+          font-size: @fontsize-s;
+          text-align: right;
+          border-bottom: 2px solid @green;
+        }
+
+        .map-popup-panel-back {
+          margin-left: auto;
+          width: 54px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          cursor: pointer;
+
+          &::after {
+            content: "";
+            position: absolute;
+            left: 0;
+            height: 50%;
+            border-left: 1px solid @gray;
+            top: 25%;
+          }
+        }
+      }
+
+      .map-popup-panel-body {
+        background: fade(#152221, 75%);
+        border: 1px solid fade(@darkgray, 40);
+        border-top: 0px;
+
+        .table-form {
+          .text,
+          .unit {
+            font-weight: 400;
+          }
+
+          .unit {
+            min-width: auto;
+          }
+
+          .value,
+          .unit {
+            text-align: left;
+          }
+        }
+      }
+    }
+
+    .map-tool {
+      position: absolute;
+      right: 22px;
+      top: 22px;
+      z-index: 2;
+      background: #152221af;
+      padding: 18px 14px;
+
+      .m-btn {
+        width: 124px;
+        height: 44px;
+        background: #152221bf;
+        border: 1px solid #152221bf;
+        color: #ffffff;
+        transition: all 0.3s;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+
+        &:hover,
+        &.active {
+          background: #05bb4c33;
+          border: 1px solid #05bb4c;
+          color: #05bb4c;
+        }
+
+        + .m-btn {
+          margin-top: 16px;
+        }
+      }
+    }
+  }
+}
 </style>

src/components/arcgis/arcgis.vue

@@ -455,6 +455,19 @@
         },
         mounted() {
             // 渲染后
+			basemap = null;
+            map = null;
+            view = null;
+            point_graphicsLayer = null;
+            line_graphicsLayer = null;
+            text_graphicsLayer = null;
+            img_graphicsLayer = null;
+            html_graphicsLayer = null;
+            point_graphics = [];
+            line_graphics = [];
+            text_graphics = [];
+            img_graphics = [];
+            html_graphics = [];
             this.initMap();
         },
         beforeUpdate() {

src/components/chart/bar/percent-bar.vue

@@ -103,17 +103,16 @@ export default {
             backgroundStyle: {
               color:
                 this.$store.state.themeName === "dark"
-                  ? partten.getColor(this.colors) + "30"
-                  : "#fff",
+                    ? partten.getColor(this.colors)
+                    : "rgb(57, 54, 143)",
             },
             data: [this.value],
             coordinateSystem: "polar",
             itemStyle: {
               normal: {
-                color:
-                  this.$store.state.themeName === "dark"
-                    ? partten.getColor(this.colors)
-                    : "rgb(57, 54, 143)",
+                color:this.$store.state.themeName === "dark"
+                  ? 'black'
+                  : "#fff",
                 //    new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                 //     {
                 //       offset: 0,

src/components/chart/combination/area-line-chart.vue

@@ -311,10 +311,10 @@ export default {
           axisPointer: {
             type: "cross",
           },
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: 14,
           },
         },
@@ -325,9 +325,9 @@ export default {
           icon: "ract",
           itemWidth: 8,
           itemHeight: 8,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -335,7 +335,7 @@ export default {
           {
             type: "category",
             axisLabel: {
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
             },
             axisLine: {
               show: false,
@@ -363,12 +363,12 @@ export default {
             name: this.units[0],
             axisLabel: {
               formatter: "{value} ",
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
             },
             axisLine: {
               type: "dashed",
               lineStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
               width: 5,
             },
@@ -379,7 +379,7 @@ export default {
               lineStyle: {
                 type: "dashed",
                 dashOffset: 10,
-                color: partten.getColor("gray") + 80,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 80,
               },
             },
           },
@@ -463,6 +463,11 @@ export default {
       this.initChart();
     });
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

src/components/chart/combination/bar-line-chart.vue

@@ -123,18 +123,26 @@ export default {
           icon: "ract",
           itemWidth: 8,
           itemHeight: 8,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark"
+              ? partten.getColor("grayl")
+              : "#000",
             fontSize: 12,
           },
         },
         tooltip: {
           trigger: "axis",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark"
+              ? "rgba(0,0,0,0.4)"
+              : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
         },
@@ -153,7 +161,9 @@ export default {
             backgroundColor: "transparent",
             // handleIcon: "path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z",
             handleStyle: {
-              color: partten.getColor("green"),
+              color: this.$store.state.themeName === "dark"
+              ? partten.getColor("green")
+              : partten.getColor("blue"),
             },
             moveHandleSize: 0,
             // dataBackground: {
@@ -174,9 +184,13 @@ export default {
             // },
             fillerColor: "transparent",
             textStyle: {
-              color: partten.getColor("grayl"),
+              color: this.$store.state.themeName === "dark"
+              ? partten.getColor("grayl")
+              : "#000",
             },
-            borderColor: partten.getColor("gray"),
+            borderColor: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
             brushSelect: false,
           },
         ],
@@ -184,7 +198,9 @@ export default {
           {
             type: "category",
             axisLabel: {
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
             },
             inverse: true,
             // minInterval: 10,
@@ -202,12 +218,16 @@ export default {
           {
             type: "value",
             axisLabel: {
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
             },
             axisLine: {
               type: "dashed",
               lineStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
               },
               width: 5,
             },
@@ -218,7 +238,7 @@ export default {
               lineStyle: {
                 type: "dashed",
                 dashOffset: 10,
-                color: partten.getColor("gray") + 80,
+                color: this.$store.state.themeName === "dark" ? "#5a6162" : "#000" + 80,
               },
             },
           },
@@ -269,10 +289,14 @@ export default {
           smooth: false, //平滑展示
           xAxisIndex: 1,
           lineStyle: {
-            color: partten.getColor("green"),
+            color: this.$store.state.themeName === "dark"
+              ? partten.getColor("green")
+              : partten.getColor("blue"),
           },
           itemStyle: {
-            color: partten.getColor("green"),
+            color: this.$store.state.themeName === "dark"
+              ? partten.getColor("green")
+              : partten.getColor("blue"),
           },
         });
       }
@@ -315,6 +339,9 @@ export default {
         }
       }
     },
+	"$store.state.themeName"() {
+	  this.initChart();
+	},
   },
 };
 </script>

src/components/chart/combination/multiple-bar-line-chart.vue

@@ -222,6 +222,9 @@ export default {
       },
       deep: true,
     },
+	"$store.state.themeName"() {
+	  this.initChart();
+	},
   },
   computed: {
     legend() {
@@ -310,10 +313,10 @@ export default {
         color: this.color,
         tooltip: {
           trigger: "axis",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: 12,
           },
         },
@@ -324,9 +327,9 @@ export default {
           icon: "ract",
           itemWidth: 8,
           itemHeight: 8,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -359,7 +362,7 @@ export default {
           name: this.newlineData.name,
           axisLabel: {
             formatter: "{value} ",
-            color: partten.getColor("gray"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           },
           axisLine: {
             show: false,
@@ -372,7 +375,7 @@ export default {
             lineStyle: {
               type: "dashed",
               dashOffset: 10,
-              color: partten.getColor("gray") + 80,
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 80,
             },
           },
         });

src/components/chart/combination/scatter-line-chart.vue

@@ -588,14 +588,14 @@ export default {
                 type: "max",
                 name: "最大值",
                 label: {
-                  color: partten.getColor("gray"),
+                  color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
                 },
               },
               {
                 type: "min",
                 name: "最小值",
                 label: {
-                  color: partten.getColor("gray"),
+                  color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
                 },
               },
             ],
@@ -645,11 +645,11 @@ export default {
         tooltip: {
           trigger: "item",
           showDelay: 0,
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
             fontSize: util.vh(16),
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
           },
           formatter(params) {
             if (params.componentType == "markLine") {
@@ -677,9 +677,9 @@ export default {
           right: "40",
           icon: "circle",
           itemWidth: 6,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -698,6 +698,7 @@ export default {
         ],
         yAxis: [
           {
+            min: 0,
             type: "value",
             name: this.yTitle,
             scale: true,
@@ -786,6 +787,11 @@ export default {
   unmounted() {
     window.removeEventListener("resize", this.resize);
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

src/components/chart/combination/vertival-bar-line-chart.vue

@@ -75,6 +75,9 @@ export default {
       },
       deep: true,
     },
+	"$store.state.themeName"() {
+	  this.initChart();
+	},
   },
   computed: {
     legend() {
@@ -95,10 +98,10 @@ export default {
         },
         tooltip: {
           trigger: "axis",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: 14,
           },
         },
@@ -109,9 +112,9 @@ export default {
           icon: "ract",
           itemWidth: 8,
           itemHeight: 8,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -119,7 +122,7 @@ export default {
           {
             type: "category",
             axisLabel: {
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
             },
             axisLine: {
               show: false,
@@ -136,12 +139,12 @@ export default {
             name: this.units[0],
             axisLabel: {
               formatter: "{value} ",
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
             },
             axisLine: {
               type: "dashed",
               lineStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
               width: 5,
             },
@@ -152,7 +155,7 @@ export default {
               lineStyle: {
                 type: "dashed",
                 dashOffset: 10,
-                color: partten.getColor("gray") + 80,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 80,
               },
             },
           },
@@ -161,7 +164,7 @@ export default {
             name: this.units[1],
             axisLabel: {
               formatter: "{value} ",
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               align: "left",
             },
             axisLine: {

src/components/chart/line/marker-line-chart.vue

@@ -120,6 +120,9 @@ export default {
       type: Boolean,
       default: false,
     },
+	myUnit: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -259,7 +262,7 @@ export default {
           },
         },
         grid: {
-          top: 16,
+          top: this.myUnit === 'MW' ? 32 : 16,
           left: 32,
           right: 8,
           bottom: 24,

src/components/chart/line/multi-arrow-line-chart.vue

@@ -128,7 +128,7 @@ export default {
           //分格线
           splitLine: {
             lineStyle: {
-              color: partten.getColor("gray") + 55,
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 55,
               type: "dashed",
             },
           },
@@ -182,10 +182,10 @@ export default {
         color: this.color,
         tooltip: {
           trigger: "axis",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
-          textStyle: {
-            color: "#fff",
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+			borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+			textStyle: {
+			  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
         },
@@ -195,9 +195,9 @@ export default {
           right: 56,
           icon: "circle",
           itemWidth: 6,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -215,7 +215,7 @@ export default {
               formatter: "{value}",
               fontSize: util.vh(14),
               textStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             data: this.xdata,

src/components/chart/line/multiple-line-chart.vue

@@ -263,7 +263,7 @@ export default {
           zlevel: index,
           lineStyle: {
             normal: {
-              // color: index != 0 ? partten.getColor("gray") : this.color[index],
+              // color: index != 0 ? this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" : this.color[index],
               color: this.color[index],
               width: 1,
             },
@@ -348,7 +348,7 @@ export default {
           splitLine: {
             show: index == 0,
             lineStyle: {
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               type: "dashed",
             },
           },
@@ -383,11 +383,11 @@ export default {
                   type: "cross",
                 }
               : {},
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
             fontSize: util.vh(16),
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
           },
         },
         legend: {
@@ -396,9 +396,9 @@ export default {
           right: 56,
           icon: "circle",
           itemWidth: 6,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -417,7 +417,7 @@ export default {
               formatter: "{value}",
               fontSize: util.vh(14),
               textStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             axisLine: {

src/components/chart/line/multiple-y-line-chart-normal.vue

@@ -311,7 +311,7 @@ export default {
           min: item.min,
           max: item.max,
           position: item.position,
-          offset: p[item.position] * 50,
+          offset: -15,
           axisLabel: {
             formatter: "{value}",
             fontSize: 12,

src/components/chart/line/multiple-y-line-chart.vue

@@ -32,156 +32,6 @@
                             ["2021/07/01 10:00:00", 69],
                             ["2021/07/01 15:00:00", 134],
                             ["2021/07/01 20:00:00", 262],
-                            ["2021/07/02 00:00:00", 181],
-                            ["2021/07/02 05:00:00", 72],
-                            ["2021/07/02 10:00:00", 221],
-                            ["2021/07/02 15:00:00", 184],
-                            ["2021/07/02 20:00:00", 319],
-                            ["2021/07/03 00:00:00", 283],
-                            ["2021/07/03 05:00:00", 156],
-                            ["2021/07/03 10:00:00", 308],
-                            ["2021/07/03 15:00:00", 153],
-                            ["2021/07/03 20:00:00", 67],
-                            ["2021/07/04 00:00:00", 289],
-                            ["2021/07/04 05:00:00", 194],
-                            ["2021/07/04 10:00:00", 358],
-                            ["2021/07/04 15:00:00", 325],
-                            ["2021/07/04 20:00:00", 345],
-                            ["2021/07/05 00:00:00", 242],
-                            ["2021/07/05 05:00:00", 100],
-                            ["2021/07/05 10:00:00", 225],
-                            ["2021/07/05 15:00:00", 230],
-                            ["2021/07/05 20:00:00", 162],
-                            ["2021/07/06 00:00:00", 235],
-                            ["2021/07/06 05:00:00", 237],
-                            ["2021/07/06 10:00:00", 248],
-                            ["2021/07/06 15:00:00", 350],
-                            ["2021/07/06 20:00:00", 298],
-                            ["2021/07/07 00:00:00", 295],
-                            ["2021/07/07 05:00:00", 192],
-                            ["2021/07/07 10:00:00", 54],
-                            ["2021/07/07 15:00:00", 321],
-                            ["2021/07/07 20:00:00", 104],
-                            ["2021/07/08 00:00:00", 163],
-                            ["2021/07/08 05:00:00", 177],
-                            ["2021/07/08 10:00:00", 185],
-                            ["2021/07/08 15:00:00", 120],
-                            ["2021/07/08 20:00:00", 61],
-                            ["2021/07/09 00:00:00", 104],
-                            ["2021/07/09 05:00:00", 178],
-                            ["2021/07/09 10:00:00", 90],
-                            ["2021/07/09 15:00:00", 331],
-                            ["2021/07/09 20:00:00", 217],
-                            ["2021/07/10 00:00:00", 338],
-                            ["2021/07/10 05:00:00", 155],
-                            ["2021/07/10 10:00:00", 99],
-                            ["2021/07/10 15:00:00", 109],
-                            ["2021/07/10 20:00:00", 221],
-                            ["2021/07/11 00:00:00", 281],
-                            ["2021/07/11 05:00:00", 306],
-                            ["2021/07/11 10:00:00", 246],
-                            ["2021/07/11 15:00:00", 176],
-                            ["2021/07/11 20:00:00", 348],
-                            ["2021/07/12 00:00:00", 94],
-                            ["2021/07/12 05:00:00", 100],
-                            ["2021/07/12 10:00:00", 53],
-                            ["2021/07/12 15:00:00", 269],
-                            ["2021/07/12 20:00:00", 93],
-                            ["2021/07/13 00:00:00", 178],
-                            ["2021/07/13 05:00:00", 100],
-                            ["2021/07/13 10:00:00", 53],
-                            ["2021/07/13 15:00:00", 260],
-                            ["2021/07/13 20:00:00", 114],
-                            ["2021/07/14 00:00:00", 251],
-                            ["2021/07/14 05:00:00", 250],
-                            ["2021/07/14 10:00:00", 97],
-                            ["2021/07/14 15:00:00", 283],
-                            ["2021/07/14 20:00:00", 231],
-                            ["2021/07/15 00:00:00", 359],
-                            ["2021/07/15 05:00:00", 105],
-                            ["2021/07/15 10:00:00", 229],
-                            ["2021/07/15 15:00:00", 81],
-                            ["2021/07/15 20:00:00", 353],
-                            ["2021/07/16 00:00:00", 244],
-                            ["2021/07/16 05:00:00", 231],
-                            ["2021/07/16 10:00:00", 275],
-                            ["2021/07/16 15:00:00", 273],
-                            ["2021/07/16 20:00:00", 199],
-                            ["2021/07/17 00:00:00", 124],
-                            ["2021/07/17 05:00:00", 176],
-                            ["2021/07/17 10:00:00", 149],
-                            ["2021/07/17 15:00:00", 77],
-                            ["2021/07/17 20:00:00", 168],
-                            ["2021/07/18 00:00:00", 256],
-                            ["2021/07/18 05:00:00", 138],
-                            ["2021/07/18 10:00:00", 95],
-                            ["2021/07/18 15:00:00", 313],
-                            ["2021/07/18 20:00:00", 244],
-                            ["2021/07/19 00:00:00", 169],
-                            ["2021/07/19 05:00:00", 199],
-                            ["2021/07/19 10:00:00", 91],
-                            ["2021/07/19 15:00:00", 241],
-                            ["2021/07/19 20:00:00", 344],
-                            ["2021/07/20 00:00:00", 85],
-                            ["2021/07/20 05:00:00", 332],
-                            ["2021/07/20 10:00:00", 189],
-                            ["2021/07/20 15:00:00", 81],
-                            ["2021/07/20 20:00:00", 290],
-                            ["2021/07/21 00:00:00", 214],
-                            ["2021/07/21 05:00:00", 61],
-                            ["2021/07/21 10:00:00", 339],
-                            ["2021/07/21 15:00:00", 286],
-                            ["2021/07/21 20:00:00", 89],
-                            ["2021/07/22 00:00:00", 279],
-                            ["2021/07/22 05:00:00", 229],
-                            ["2021/07/22 10:00:00", 238],
-                            ["2021/07/22 15:00:00", 86],
-                            ["2021/07/22 20:00:00", 163],
-                            ["2021/07/23 00:00:00", 140],
-                            ["2021/07/23 05:00:00", 312],
-                            ["2021/07/23 10:00:00", 134],
-                            ["2021/07/23 15:00:00", 53],
-                            ["2021/07/23 20:00:00", 235],
-                            ["2021/07/24 00:00:00", 97],
-                            ["2021/07/24 05:00:00", 309],
-                            ["2021/07/24 10:00:00", 147],
-                            ["2021/07/24 15:00:00", 258],
-                            ["2021/07/24 20:00:00", 192],
-                            ["2021/07/25 00:00:00", 305],
-                            ["2021/07/25 05:00:00", 282],
-                            ["2021/07/25 10:00:00", 72],
-                            ["2021/07/25 15:00:00", 258],
-                            ["2021/07/25 20:00:00", 312],
-                            ["2021/07/26 00:00:00", 259],
-                            ["2021/07/26 05:00:00", 146],
-                            ["2021/07/26 10:00:00", 93],
-                            ["2021/07/26 15:00:00", 158],
-                            ["2021/07/26 20:00:00", 156],
-                            ["2021/07/27 00:00:00", 362],
-                            ["2021/07/27 05:00:00", 193],
-                            ["2021/07/27 10:00:00", 177],
-                            ["2021/07/27 15:00:00", 313],
-                            ["2021/07/27 20:00:00", 60],
-                            ["2021/07/28 00:00:00", 119],
-                            ["2021/07/28 05:00:00", 142],
-                            ["2021/07/28 10:00:00", 283],
-                            ["2021/07/28 15:00:00", 105],
-                            ["2021/07/28 20:00:00", 121],
-                            ["2021/07/29 00:00:00", 304],
-                            ["2021/07/29 05:00:00", 82],
-                            ["2021/07/29 10:00:00", 326],
-                            ["2021/07/29 15:00:00", 216],
-                            ["2021/07/29 20:00:00", 223],
-                            ["2021/07/30 00:00:00", 218],
-                            ["2021/07/30 05:00:00", 313],
-                            ["2021/07/30 10:00:00", 339],
-                            ["2021/07/30 15:00:00", 125],
-                            ["2021/07/30 20:00:00", 244],
-                            ["2021/07/31 00:00:00", 179],
-                            ["2021/07/31 05:00:00", 360],
-                            ["2021/07/31 10:00:00", 267],
-                            ["2021/07/31 15:00:00", 85],
-                            ["2021/07/31 20:00:00", 309]
                         ],
                     },
                     {
@@ -193,156 +43,6 @@
                             ["2021/07/01 10:00:00", 290],
                             ["2021/07/01 15:00:00", 140],
                             ["2021/07/01 20:00:00", 203],
-                            ["2021/07/02 00:00:00", 280],
-                            ["2021/07/02 05:00:00", 283],
-                            ["2021/07/02 10:00:00", 252],
-                            ["2021/07/02 15:00:00", 155],
-                            ["2021/07/02 20:00:00", 133],
-                            ["2021/07/03 00:00:00", 94],
-                            ["2021/07/03 05:00:00", 191],
-                            ["2021/07/03 10:00:00", 193],
-                            ["2021/07/03 15:00:00", 205],
-                            ["2021/07/03 20:00:00", 301],
-                            ["2021/07/04 00:00:00", 101],
-                            ["2021/07/04 05:00:00", 257],
-                            ["2021/07/04 10:00:00", 82],
-                            ["2021/07/04 15:00:00", 75],
-                            ["2021/07/04 20:00:00", 254],
-                            ["2021/07/05 00:00:00", 184],
-                            ["2021/07/05 05:00:00", 146],
-                            ["2021/07/05 10:00:00", 272],
-                            ["2021/07/05 15:00:00", 100],
-                            ["2021/07/05 20:00:00", 118],
-                            ["2021/07/06 00:00:00", 125],
-                            ["2021/07/06 05:00:00", 80],
-                            ["2021/07/06 10:00:00", 144],
-                            ["2021/07/06 15:00:00", 100],
-                            ["2021/07/06 20:00:00", 232],
-                            ["2021/07/07 00:00:00", 139],
-                            ["2021/07/07 05:00:00", 311],
-                            ["2021/07/07 10:00:00", 152],
-                            ["2021/07/07 15:00:00", 182],
-                            ["2021/07/07 20:00:00", 162],
-                            ["2021/07/08 00:00:00", 175],
-                            ["2021/07/08 05:00:00", 95],
-                            ["2021/07/08 10:00:00", 300],
-                            ["2021/07/08 15:00:00", 290],
-                            ["2021/07/08 20:00:00", 218],
-                            ["2021/07/09 00:00:00", 106],
-                            ["2021/07/09 05:00:00", 301],
-                            ["2021/07/09 10:00:00", 221],
-                            ["2021/07/09 15:00:00", 126],
-                            ["2021/07/09 20:00:00", 149],
-                            ["2021/07/10 00:00:00", 308],
-                            ["2021/07/10 05:00:00", 187],
-                            ["2021/07/10 10:00:00", 164],
-                            ["2021/07/10 15:00:00", 139],
-                            ["2021/07/10 20:00:00", 199],
-                            ["2021/07/11 00:00:00", 71],
-                            ["2021/07/11 05:00:00", 198],
-                            ["2021/07/11 10:00:00", 121],
-                            ["2021/07/11 15:00:00", 242],
-                            ["2021/07/11 20:00:00", 286],
-                            ["2021/07/12 00:00:00", 198],
-                            ["2021/07/12 05:00:00", 275],
-                            ["2021/07/12 10:00:00", 63],
-                            ["2021/07/12 15:00:00", 229],
-                            ["2021/07/12 20:00:00", 272],
-                            ["2021/07/13 00:00:00", 266],
-                            ["2021/07/13 05:00:00", 305],
-                            ["2021/07/13 10:00:00", 218],
-                            ["2021/07/13 15:00:00", 273],
-                            ["2021/07/13 20:00:00", 112],
-                            ["2021/07/14 00:00:00", 243],
-                            ["2021/07/14 05:00:00", 105],
-                            ["2021/07/14 10:00:00", 147],
-                            ["2021/07/14 15:00:00", 301],
-                            ["2021/07/14 20:00:00", 145],
-                            ["2021/07/15 00:00:00", 136],
-                            ["2021/07/15 05:00:00", 153],
-                            ["2021/07/15 10:00:00", 251],
-                            ["2021/07/15 15:00:00", 76],
-                            ["2021/07/15 20:00:00", 296],
-                            ["2021/07/16 00:00:00", 128],
-                            ["2021/07/16 05:00:00", 94],
-                            ["2021/07/16 10:00:00", 236],
-                            ["2021/07/16 15:00:00", 202],
-                            ["2021/07/16 20:00:00", 94],
-                            ["2021/07/17 00:00:00", 169],
-                            ["2021/07/17 05:00:00", 93],
-                            ["2021/07/17 10:00:00", 297],
-                            ["2021/07/17 15:00:00", 110],
-                            ["2021/07/17 20:00:00", 271],
-                            ["2021/07/18 00:00:00", 98],
-                            ["2021/07/18 05:00:00", 169],
-                            ["2021/07/18 10:00:00", 114],
-                            ["2021/07/18 15:00:00", 190],
-                            ["2021/07/18 20:00:00", 62],
-                            ["2021/07/19 00:00:00", 151],
-                            ["2021/07/19 05:00:00", 239],
-                            ["2021/07/19 10:00:00", 135],
-                            ["2021/07/19 15:00:00", 281],
-                            ["2021/07/19 20:00:00", 190],
-                            ["2021/07/20 00:00:00", 65],
-                            ["2021/07/20 05:00:00", 207],
-                            ["2021/07/20 10:00:00", 140],
-                            ["2021/07/20 15:00:00", 272],
-                            ["2021/07/20 20:00:00", 195],
-                            ["2021/07/21 00:00:00", 66],
-                            ["2021/07/21 05:00:00", 163],
-                            ["2021/07/21 10:00:00", 306],
-                            ["2021/07/21 15:00:00", 213],
-                            ["2021/07/21 20:00:00", 154],
-                            ["2021/07/22 00:00:00", 305],
-                            ["2021/07/22 05:00:00", 223],
-                            ["2021/07/22 10:00:00", 201],
-                            ["2021/07/22 15:00:00", 224],
-                            ["2021/07/22 20:00:00", 63],
-                            ["2021/07/23 00:00:00", 226],
-                            ["2021/07/23 05:00:00", 75],
-                            ["2021/07/23 10:00:00", 309],
-                            ["2021/07/23 15:00:00", 191],
-                            ["2021/07/23 20:00:00", 219],
-                            ["2021/07/24 00:00:00", 142],
-                            ["2021/07/24 05:00:00", 162],
-                            ["2021/07/24 10:00:00", 260],
-                            ["2021/07/24 15:00:00", 260],
-                            ["2021/07/24 20:00:00", 249],
-                            ["2021/07/25 00:00:00", 278],
-                            ["2021/07/25 05:00:00", 187],
-                            ["2021/07/25 10:00:00", 101],
-                            ["2021/07/25 15:00:00", 200],
-                            ["2021/07/25 20:00:00", 261],
-                            ["2021/07/26 00:00:00", 161],
-                            ["2021/07/26 05:00:00", 227],
-                            ["2021/07/26 10:00:00", 289],
-                            ["2021/07/26 15:00:00", 85],
-                            ["2021/07/26 20:00:00", 88],
-                            ["2021/07/27 00:00:00", 237],
-                            ["2021/07/27 05:00:00", 198],
-                            ["2021/07/27 10:00:00", 260],
-                            ["2021/07/27 15:00:00", 146],
-                            ["2021/07/27 20:00:00", 288],
-                            ["2021/07/28 00:00:00", 213],
-                            ["2021/07/28 05:00:00", 250],
-                            ["2021/07/28 10:00:00", 77],
-                            ["2021/07/28 15:00:00", 75],
-                            ["2021/07/28 20:00:00", 153],
-                            ["2021/07/29 00:00:00", 263],
-                            ["2021/07/29 05:00:00", 173],
-                            ["2021/07/29 10:00:00", 105],
-                            ["2021/07/29 15:00:00", 239],
-                            ["2021/07/29 20:00:00", 69],
-                            ["2021/07/30 00:00:00", 126],
-                            ["2021/07/30 05:00:00", 238],
-                            ["2021/07/30 10:00:00", 62],
-                            ["2021/07/30 15:00:00", 277],
-                            ["2021/07/30 20:00:00", 61],
-                            ["2021/07/31 00:00:00", 91],
-                            ["2021/07/31 05:00:00", 201],
-                            ["2021/07/31 10:00:00", 238],
-                            ["2021/07/31 15:00:00", 307],
-                            ["2021/07/31 20:00:00", 86]
                         ],
                     },
                     {
@@ -354,156 +54,6 @@
                             ["2021/07/01 10:00:00", 231],
                             ["2021/07/01 15:00:00", 305],
                             ["2021/07/01 20:00:00", 230],
-                            ["2021/07/02 00:00:00", 248],
-                            ["2021/07/02 05:00:00", 295],
-                            ["2021/07/02 10:00:00", 147],
-                            ["2021/07/02 15:00:00", 242],
-                            ["2021/07/02 20:00:00", 317],
-                            ["2021/07/03 00:00:00", 218],
-                            ["2021/07/03 05:00:00", 217],
-                            ["2021/07/03 10:00:00", 274],
-                            ["2021/07/03 15:00:00", 329],
-                            ["2021/07/03 20:00:00", 148],
-                            ["2021/07/04 00:00:00", 316],
-                            ["2021/07/04 05:00:00", 270],
-                            ["2021/07/04 10:00:00", 173],
-                            ["2021/07/04 15:00:00", 318],
-                            ["2021/07/04 20:00:00", 297],
-                            ["2021/07/05 00:00:00", 322],
-                            ["2021/07/05 05:00:00", 182],
-                            ["2021/07/05 10:00:00", 170],
-                            ["2021/07/05 15:00:00", 199],
-                            ["2021/07/05 20:00:00", 258],
-                            ["2021/07/06 00:00:00", 128],
-                            ["2021/07/06 05:00:00", 323],
-                            ["2021/07/06 10:00:00", 142],
-                            ["2021/07/06 15:00:00", 312],
-                            ["2021/07/06 20:00:00", 174],
-                            ["2021/07/07 00:00:00", 158],
-                            ["2021/07/07 05:00:00", 317],
-                            ["2021/07/07 10:00:00", 154],
-                            ["2021/07/07 15:00:00", 262],
-                            ["2021/07/07 20:00:00", 180],
-                            ["2021/07/08 00:00:00", 204],
-                            ["2021/07/08 05:00:00", 307],
-                            ["2021/07/08 10:00:00", 232],
-                            ["2021/07/08 15:00:00", 124],
-                            ["2021/07/08 20:00:00", 126],
-                            ["2021/07/09 00:00:00", 300],
-                            ["2021/07/09 05:00:00", 289],
-                            ["2021/07/09 10:00:00", 278],
-                            ["2021/07/09 15:00:00", 211],
-                            ["2021/07/09 20:00:00", 116],
-                            ["2021/07/10 00:00:00", 271],
-                            ["2021/07/10 05:00:00", 197],
-                            ["2021/07/10 10:00:00", 296],
-                            ["2021/07/10 15:00:00", 107],
-                            ["2021/07/10 20:00:00", 153],
-                            ["2021/07/11 00:00:00", 221],
-                            ["2021/07/11 05:00:00", 196],
-                            ["2021/07/11 10:00:00", 108],
-                            ["2021/07/11 15:00:00", 190],
-                            ["2021/07/11 20:00:00", 141],
-                            ["2021/07/12 00:00:00", 98],
-                            ["2021/07/12 05:00:00", 192],
-                            ["2021/07/12 10:00:00", 190],
-                            ["2021/07/12 15:00:00", 327],
-                            ["2021/07/12 20:00:00", 260],
-                            ["2021/07/13 00:00:00", 221],
-                            ["2021/07/13 05:00:00", 240],
-                            ["2021/07/13 10:00:00", 280],
-                            ["2021/07/13 15:00:00", 234],
-                            ["2021/07/13 20:00:00", 326],
-                            ["2021/07/14 00:00:00", 143],
-                            ["2021/07/14 05:00:00", 329],
-                            ["2021/07/14 10:00:00", 156],
-                            ["2021/07/14 15:00:00", 152],
-                            ["2021/07/14 20:00:00", 316],
-                            ["2021/07/15 00:00:00", 125],
-                            ["2021/07/15 05:00:00", 322],
-                            ["2021/07/15 10:00:00", 174],
-                            ["2021/07/15 15:00:00", 286],
-                            ["2021/07/15 20:00:00", 122],
-                            ["2021/07/16 00:00:00", 145],
-                            ["2021/07/16 05:00:00", 122],
-                            ["2021/07/16 10:00:00", 313],
-                            ["2021/07/16 15:00:00", 144],
-                            ["2021/07/16 20:00:00", 150],
-                            ["2021/07/17 00:00:00", 322],
-                            ["2021/07/17 05:00:00", 130],
-                            ["2021/07/17 10:00:00", 189],
-                            ["2021/07/17 15:00:00", 99],
-                            ["2021/07/17 20:00:00", 165],
-                            ["2021/07/18 00:00:00", 235],
-                            ["2021/07/18 05:00:00", 127],
-                            ["2021/07/18 10:00:00", 104],
-                            ["2021/07/18 15:00:00", 233],
-                            ["2021/07/18 20:00:00", 178],
-                            ["2021/07/19 00:00:00", 171],
-                            ["2021/07/19 05:00:00", 123],
-                            ["2021/07/19 10:00:00", 305],
-                            ["2021/07/19 15:00:00", 113],
-                            ["2021/07/19 20:00:00", 299],
-                            ["2021/07/20 00:00:00", 157],
-                            ["2021/07/20 05:00:00", 165],
-                            ["2021/07/20 10:00:00", 147],
-                            ["2021/07/20 15:00:00", 181],
-                            ["2021/07/20 20:00:00", 261],
-                            ["2021/07/21 00:00:00", 123],
-                            ["2021/07/21 05:00:00", 317],
-                            ["2021/07/21 10:00:00", 203],
-                            ["2021/07/21 15:00:00", 284],
-                            ["2021/07/21 20:00:00", 232],
-                            ["2021/07/22 00:00:00", 124],
-                            ["2021/07/22 05:00:00", 106],
-                            ["2021/07/22 10:00:00", 233],
-                            ["2021/07/22 15:00:00", 169],
-                            ["2021/07/22 20:00:00", 214],
-                            ["2021/07/23 00:00:00", 122],
-                            ["2021/07/23 05:00:00", 145],
-                            ["2021/07/23 10:00:00", 160],
-                            ["2021/07/23 15:00:00", 260],
-                            ["2021/07/23 20:00:00", 310],
-                            ["2021/07/24 00:00:00", 234],
-                            ["2021/07/24 05:00:00", 130],
-                            ["2021/07/24 10:00:00", 248],
-                            ["2021/07/24 15:00:00", 257],
-                            ["2021/07/24 20:00:00", 178],
-                            ["2021/07/25 00:00:00", 239],
-                            ["2021/07/25 05:00:00", 111],
-                            ["2021/07/25 10:00:00", 159],
-                            ["2021/07/25 15:00:00", 101],
-                            ["2021/07/25 20:00:00", 237],
-                            ["2021/07/26 00:00:00", 299],
-                            ["2021/07/26 05:00:00", 319],
-                            ["2021/07/26 10:00:00", 135],
-                            ["2021/07/26 15:00:00", 250],
-                            ["2021/07/26 20:00:00", 308],
-                            ["2021/07/27 00:00:00", 208],
-                            ["2021/07/27 05:00:00", 208],
-                            ["2021/07/27 10:00:00", 324],
-                            ["2021/07/27 15:00:00", 122],
-                            ["2021/07/27 20:00:00", 117],
-                            ["2021/07/28 00:00:00", 129],
-                            ["2021/07/28 05:00:00", 121],
-                            ["2021/07/28 10:00:00", 166],
-                            ["2021/07/28 15:00:00", 303],
-                            ["2021/07/28 20:00:00", 262],
-                            ["2021/07/29 00:00:00", 200],
-                            ["2021/07/29 05:00:00", 229],
-                            ["2021/07/29 10:00:00", 122],
-                            ["2021/07/29 15:00:00", 122],
-                            ["2021/07/29 20:00:00", 225],
-                            ["2021/07/30 00:00:00", 227],
-                            ["2021/07/30 05:00:00", 247],
-                            ["2021/07/30 10:00:00", 102],
-                            ["2021/07/30 15:00:00", 285],
-                            ["2021/07/30 20:00:00", 167],
-                            ["2021/07/31 00:00:00", 119],
-                            ["2021/07/31 05:00:00", 212],
-                            ["2021/07/31 10:00:00", 277],
-                            ["2021/07/31 15:00:00", 159],
-                            ["2021/07/31 20:00:00", 179]
                         ],
                     },
                     {
@@ -515,156 +65,6 @@
                             ["2021/07/01 10:00:00", 296],
                             ["2021/07/01 15:00:00", 87],
                             ["2021/07/01 20:00:00", 273],
-                            ["2021/07/02 00:00:00", 129],
-                            ["2021/07/02 05:00:00", 121],
-                            ["2021/07/02 10:00:00", 65],
-                            ["2021/07/02 15:00:00", 215],
-                            ["2021/07/02 20:00:00", 245],
-                            ["2021/07/03 00:00:00", 288],
-                            ["2021/07/03 05:00:00", 256],
-                            ["2021/07/03 10:00:00", 47],
-                            ["2021/07/03 15:00:00", 207],
-                            ["2021/07/03 20:00:00", 237],
-                            ["2021/07/04 00:00:00", 68],
-                            ["2021/07/04 05:00:00", 186],
-                            ["2021/07/04 10:00:00", 126],
-                            ["2021/07/04 15:00:00", 207],
-                            ["2021/07/04 20:00:00", 59],
-                            ["2021/07/05 00:00:00", 328],
-                            ["2021/07/05 05:00:00", 72],
-                            ["2021/07/05 10:00:00", 54],
-                            ["2021/07/05 15:00:00", 114],
-                            ["2021/07/05 20:00:00", 167],
-                            ["2021/07/06 00:00:00", 164],
-                            ["2021/07/06 05:00:00", 176],
-                            ["2021/07/06 10:00:00", 59],
-                            ["2021/07/06 15:00:00", 196],
-                            ["2021/07/06 20:00:00", 208],
-                            ["2021/07/07 00:00:00", 80],
-                            ["2021/07/07 05:00:00", 119],
-                            ["2021/07/07 10:00:00", 228],
-                            ["2021/07/07 15:00:00", 80],
-                            ["2021/07/07 20:00:00", 182],
-                            ["2021/07/08 00:00:00", 152],
-                            ["2021/07/08 05:00:00", 119],
-                            ["2021/07/08 10:00:00", 236],
-                            ["2021/07/08 15:00:00", 45],
-                            ["2021/07/08 20:00:00", 36],
-                            ["2021/07/09 00:00:00", 34],
-                            ["2021/07/09 05:00:00", 280],
-                            ["2021/07/09 10:00:00", 63],
-                            ["2021/07/09 15:00:00", 53],
-                            ["2021/07/09 20:00:00", 226],
-                            ["2021/07/10 00:00:00", 56],
-                            ["2021/07/10 05:00:00", 234],
-                            ["2021/07/10 10:00:00", 301],
-                            ["2021/07/10 15:00:00", 106],
-                            ["2021/07/10 20:00:00", 80],
-                            ["2021/07/11 00:00:00", 280],
-                            ["2021/07/11 05:00:00", 277],
-                            ["2021/07/11 10:00:00", 104],
-                            ["2021/07/11 15:00:00", 76],
-                            ["2021/07/11 20:00:00", 321],
-                            ["2021/07/12 00:00:00", 93],
-                            ["2021/07/12 05:00:00", 109],
-                            ["2021/07/12 10:00:00", 100],
-                            ["2021/07/12 15:00:00", 128],
-                            ["2021/07/12 20:00:00", 87],
-                            ["2021/07/13 00:00:00", 179],
-                            ["2021/07/13 05:00:00", 189],
-                            ["2021/07/13 10:00:00", 140],
-                            ["2021/07/13 15:00:00", 109],
-                            ["2021/07/13 20:00:00", 156],
-                            ["2021/07/14 00:00:00", 173],
-                            ["2021/07/14 05:00:00", 213],
-                            ["2021/07/14 10:00:00", 331],
-                            ["2021/07/14 15:00:00", 84],
-                            ["2021/07/14 20:00:00", 339],
-                            ["2021/07/15 00:00:00", 157],
-                            ["2021/07/15 05:00:00", 225],
-                            ["2021/07/15 10:00:00", 198],
-                            ["2021/07/15 15:00:00", 46],
-                            ["2021/07/15 20:00:00", 62],
-                            ["2021/07/16 00:00:00", 189],
-                            ["2021/07/16 05:00:00", 159],
-                            ["2021/07/16 10:00:00", 295],
-                            ["2021/07/16 15:00:00", 52],
-                            ["2021/07/16 20:00:00", 238],
-                            ["2021/07/17 00:00:00", 341],
-                            ["2021/07/17 05:00:00", 269],
-                            ["2021/07/17 10:00:00", 126],
-                            ["2021/07/17 15:00:00", 275],
-                            ["2021/07/17 20:00:00", 101],
-                            ["2021/07/18 00:00:00", 348],
-                            ["2021/07/18 05:00:00", 83],
-                            ["2021/07/18 10:00:00", 225],
-                            ["2021/07/18 15:00:00", 42],
-                            ["2021/07/18 20:00:00", 234],
-                            ["2021/07/19 00:00:00", 239],
-                            ["2021/07/19 05:00:00", 265],
-                            ["2021/07/19 10:00:00", 213],
-                            ["2021/07/19 15:00:00", 219],
-                            ["2021/07/19 20:00:00", 52],
-                            ["2021/07/20 00:00:00", 79],
-                            ["2021/07/20 05:00:00", 287],
-                            ["2021/07/20 10:00:00", 340],
-                            ["2021/07/20 15:00:00", 267],
-                            ["2021/07/20 20:00:00", 321],
-                            ["2021/07/21 00:00:00", 176],
-                            ["2021/07/21 05:00:00", 222],
-                            ["2021/07/21 10:00:00", 311],
-                            ["2021/07/21 15:00:00", 82],
-                            ["2021/07/21 20:00:00", 58],
-                            ["2021/07/22 00:00:00", 186],
-                            ["2021/07/22 05:00:00", 186],
-                            ["2021/07/22 10:00:00", 312],
-                            ["2021/07/22 15:00:00", 62],
-                            ["2021/07/22 20:00:00", 40],
-                            ["2021/07/23 00:00:00", 119],
-                            ["2021/07/23 05:00:00", 314],
-                            ["2021/07/23 10:00:00", 45],
-                            ["2021/07/23 15:00:00", 308],
-                            ["2021/07/23 20:00:00", 227],
-                            ["2021/07/24 00:00:00", 54],
-                            ["2021/07/24 05:00:00", 165],
-                            ["2021/07/24 10:00:00", 337],
-                            ["2021/07/24 15:00:00", 278],
-                            ["2021/07/24 20:00:00", 35],
-                            ["2021/07/25 00:00:00", 169],
-                            ["2021/07/25 05:00:00", 344],
-                            ["2021/07/25 10:00:00", 223],
-                            ["2021/07/25 15:00:00", 309],
-                            ["2021/07/25 20:00:00", 227],
-                            ["2021/07/26 00:00:00", 303],
-                            ["2021/07/26 05:00:00", 102],
-                            ["2021/07/26 10:00:00", 238],
-                            ["2021/07/26 15:00:00", 210],
-                            ["2021/07/26 20:00:00", 198],
-                            ["2021/07/27 00:00:00", 180],
-                            ["2021/07/27 05:00:00", 168],
-                            ["2021/07/27 10:00:00", 310],
-                            ["2021/07/27 15:00:00", 210],
-                            ["2021/07/27 20:00:00", 257],
-                            ["2021/07/28 00:00:00", 316],
-                            ["2021/07/28 05:00:00", 52],
-                            ["2021/07/28 10:00:00", 202],
-                            ["2021/07/28 15:00:00", 201],
-                            ["2021/07/28 20:00:00", 150],
-                            ["2021/07/29 00:00:00", 84],
-                            ["2021/07/29 05:00:00", 267],
-                            ["2021/07/29 10:00:00", 199],
-                            ["2021/07/29 15:00:00", 249],
-                            ["2021/07/29 20:00:00", 140],
-                            ["2021/07/30 00:00:00", 56],
-                            ["2021/07/30 05:00:00", 50],
-                            ["2021/07/30 10:00:00", 147],
-                            ["2021/07/30 15:00:00", 158],
-                            ["2021/07/30 20:00:00", 318],
-                            ["2021/07/31 00:00:00", 290],
-                            ["2021/07/31 05:00:00", 338],
-                            ["2021/07/31 10:00:00", 176],
-                            ["2021/07/31 15:00:00", 90],
-                            ["2021/07/31 20:00:00", 136]
                         ],
                     },
                     {
@@ -676,156 +76,6 @@
                             ["2021/07/01 10:00:00", 313],
                             ["2021/07/01 15:00:00", 230],
                             ["2021/07/01 20:00:00", 264],
-                            ["2021/07/02 00:00:00", 272],
-                            ["2021/07/02 05:00:00", 310],
-                            ["2021/07/02 10:00:00", 176],
-                            ["2021/07/02 15:00:00", 182],
-                            ["2021/07/02 20:00:00", 248],
-                            ["2021/07/03 00:00:00", 241],
-                            ["2021/07/03 05:00:00", 225],
-                            ["2021/07/03 10:00:00", 360],
-                            ["2021/07/03 15:00:00", 222],
-                            ["2021/07/03 20:00:00", 237],
-                            ["2021/07/04 00:00:00", 252],
-                            ["2021/07/04 05:00:00", 164],
-                            ["2021/07/04 10:00:00", 320],
-                            ["2021/07/04 15:00:00", 194],
-                            ["2021/07/04 20:00:00", 319],
-                            ["2021/07/05 00:00:00", 155],
-                            ["2021/07/05 05:00:00", 328],
-                            ["2021/07/05 10:00:00", 104],
-                            ["2021/07/05 15:00:00", 157],
-                            ["2021/07/05 20:00:00", 223],
-                            ["2021/07/06 00:00:00", 156],
-                            ["2021/07/06 05:00:00", 345],
-                            ["2021/07/06 10:00:00", 352],
-                            ["2021/07/06 15:00:00", 108],
-                            ["2021/07/06 20:00:00", 167],
-                            ["2021/07/07 00:00:00", 354],
-                            ["2021/07/07 05:00:00", 338],
-                            ["2021/07/07 10:00:00", 232],
-                            ["2021/07/07 15:00:00", 359],
-                            ["2021/07/07 20:00:00", 304],
-                            ["2021/07/08 00:00:00", 271],
-                            ["2021/07/08 05:00:00", 307],
-                            ["2021/07/08 10:00:00", 315],
-                            ["2021/07/08 15:00:00", 280],
-                            ["2021/07/08 20:00:00", 302],
-                            ["2021/07/09 00:00:00", 356],
-                            ["2021/07/09 05:00:00", 196],
-                            ["2021/07/09 10:00:00", 222],
-                            ["2021/07/09 15:00:00", 317],
-                            ["2021/07/09 20:00:00", 292],
-                            ["2021/07/10 00:00:00", 314],
-                            ["2021/07/10 05:00:00", 311],
-                            ["2021/07/10 10:00:00", 292],
-                            ["2021/07/10 15:00:00", 104],
-                            ["2021/07/10 20:00:00", 297],
-                            ["2021/07/11 00:00:00", 235],
-                            ["2021/07/11 05:00:00", 293],
-                            ["2021/07/11 10:00:00", 224],
-                            ["2021/07/11 15:00:00", 137],
-                            ["2021/07/11 20:00:00", 136],
-                            ["2021/07/12 00:00:00", 144],
-                            ["2021/07/12 05:00:00", 150],
-                            ["2021/07/12 10:00:00", 267],
-                            ["2021/07/12 15:00:00", 156],
-                            ["2021/07/12 20:00:00", 201],
-                            ["2021/07/13 00:00:00", 214],
-                            ["2021/07/13 05:00:00", 324],
-                            ["2021/07/13 10:00:00", 352],
-                            ["2021/07/13 15:00:00", 117],
-                            ["2021/07/13 20:00:00", 157],
-                            ["2021/07/14 00:00:00", 166],
-                            ["2021/07/14 05:00:00", 228],
-                            ["2021/07/14 10:00:00", 344],
-                            ["2021/07/14 15:00:00", 281],
-                            ["2021/07/14 20:00:00", 224],
-                            ["2021/07/15 00:00:00", 358],
-                            ["2021/07/15 05:00:00", 200],
-                            ["2021/07/15 10:00:00", 148],
-                            ["2021/07/15 15:00:00", 352],
-                            ["2021/07/15 20:00:00", 246],
-                            ["2021/07/16 00:00:00", 340],
-                            ["2021/07/16 05:00:00", 126],
-                            ["2021/07/16 10:00:00", 205],
-                            ["2021/07/16 15:00:00", 221],
-                            ["2021/07/16 20:00:00", 280],
-                            ["2021/07/17 00:00:00", 127],
-                            ["2021/07/17 05:00:00", 149],
-                            ["2021/07/17 10:00:00", 162],
-                            ["2021/07/17 15:00:00", 297],
-                            ["2021/07/17 20:00:00", 168],
-                            ["2021/07/18 00:00:00", 292],
-                            ["2021/07/18 05:00:00", 100],
-                            ["2021/07/18 10:00:00", 110],
-                            ["2021/07/18 15:00:00", 265],
-                            ["2021/07/18 20:00:00", 185],
-                            ["2021/07/19 00:00:00", 265],
-                            ["2021/07/19 05:00:00", 354],
-                            ["2021/07/19 10:00:00", 106],
-                            ["2021/07/19 15:00:00", 206],
-                            ["2021/07/19 20:00:00", 113],
-                            ["2021/07/20 00:00:00", 193],
-                            ["2021/07/20 05:00:00", 144],
-                            ["2021/07/20 10:00:00", 359],
-                            ["2021/07/20 15:00:00", 335],
-                            ["2021/07/20 20:00:00", 239],
-                            ["2021/07/21 00:00:00", 230],
-                            ["2021/07/21 05:00:00", 357],
-                            ["2021/07/21 10:00:00", 317],
-                            ["2021/07/21 15:00:00", 264],
-                            ["2021/07/21 20:00:00", 355],
-                            ["2021/07/22 00:00:00", 284],
-                            ["2021/07/22 05:00:00", 326],
-                            ["2021/07/22 10:00:00", 184],
-                            ["2021/07/22 15:00:00", 315],
-                            ["2021/07/22 20:00:00", 102],
-                            ["2021/07/23 00:00:00", 206],
-                            ["2021/07/23 05:00:00", 292],
-                            ["2021/07/23 10:00:00", 273],
-                            ["2021/07/23 15:00:00", 156],
-                            ["2021/07/23 20:00:00", 282],
-                            ["2021/07/24 00:00:00", 146],
-                            ["2021/07/24 05:00:00", 129],
-                            ["2021/07/24 10:00:00", 270],
-                            ["2021/07/24 15:00:00", 330],
-                            ["2021/07/24 20:00:00", 302],
-                            ["2021/07/25 00:00:00", 205],
-                            ["2021/07/25 05:00:00", 132],
-                            ["2021/07/25 10:00:00", 124],
-                            ["2021/07/25 15:00:00", 182],
-                            ["2021/07/25 20:00:00", 147],
-                            ["2021/07/26 00:00:00", 319],
-                            ["2021/07/26 05:00:00", 221],
-                            ["2021/07/26 10:00:00", 126],
-                            ["2021/07/26 15:00:00", 299],
-                            ["2021/07/26 20:00:00", 164],
-                            ["2021/07/27 00:00:00", 293],
-                            ["2021/07/27 05:00:00", 337],
-                            ["2021/07/27 10:00:00", 159],
-                            ["2021/07/27 15:00:00", 256],
-                            ["2021/07/27 20:00:00", 118],
-                            ["2021/07/28 00:00:00", 193],
-                            ["2021/07/28 05:00:00", 138],
-                            ["2021/07/28 10:00:00", 273],
-                            ["2021/07/28 15:00:00", 217],
-                            ["2021/07/28 20:00:00", 274],
-                            ["2021/07/29 00:00:00", 138],
-                            ["2021/07/29 05:00:00", 223],
-                            ["2021/07/29 10:00:00", 338],
-                            ["2021/07/29 15:00:00", 340],
-                            ["2021/07/29 20:00:00", 205],
-                            ["2021/07/30 00:00:00", 293],
-                            ["2021/07/30 05:00:00", 170],
-                            ["2021/07/30 10:00:00", 103],
-                            ["2021/07/30 15:00:00", 147],
-                            ["2021/07/30 20:00:00", 231],
-                            ["2021/07/31 00:00:00", 305],
-                            ["2021/07/31 05:00:00", 359],
-                            ["2021/07/31 10:00:00", 115],
-                            ["2021/07/31 15:00:00", 215],
-                            ["2021/07/31 20:00:00", 224]
                         ],
                     }
                 ],
@@ -905,6 +155,7 @@
                 });
             },
             yAxis() {
+				let themeName = this.$store.state.themeName.split(' ')[1];
                 let result = [];
                 let p = {left: 0, right: 0};
                 this.yAxises.forEach((item, index) => {
@@ -923,7 +174,7 @@
                         //分格线
                         splitLine: {
                             lineStyle: {
-                                color: partten.getColor("gray"),
+                                color: themeName === "dark"? partten.getColor("gray"): "#000",
                                 type: "dashed",
                             },
                         },
@@ -984,9 +235,10 @@
         methods: {
             resize() {},
             initChart() {
+				let themeName = this.$store.state.themeName.split(' ')[1];
                 const chart = echarts.init(this.$el);
 
-                let option = this.option();
+                let option = this.option(themeName);
                 console.log(option)
                 chart.clear();
                 chart.setOption(option);
@@ -997,15 +249,15 @@
 
                 window.addEventListener("resize", this.resize);
             },
-            option: function () {
+            option: function (themeName) {
                 return {
                     color: this.color,
                     tooltip: {
                         trigger: "axis",
-                        backgroundColor: "rgba(0,0,0,0.4)",
-                        borderColor: partten.getColor("gray"),
+                        backgroundColor: themeName === "dark"? "rgba(0,0,0,0.4)": "rgba(255,255,255,0.5)",
+                        borderColor: themeName === "dark"? partten.getColor("gray"): "#000",
                         textStyle: {
-                            color: "#fff",
+                            color: themeName === "dark" ? "#fff" : "#000",
                             fontSize: 14,
                         },
                     },
@@ -1015,9 +267,9 @@
                         right: 56,
                         icon: "circle",
                         itemWidth: 6,
-                        inactiveColor: partten.getColor("gray"),
+                        inactiveColor: themeName === "dark"? partten.getColor("gray"): "#000",
                         textStyle: {
-                            color: partten.getColor("grayl"),
+                            color: themeName === "dark"? partten.getColor("grayl"): "#000",
                             fontSize: 12,
                         },
                     },
@@ -1031,13 +283,13 @@
                         handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
                         handleSize: '110%',
                         handleStyle: {
-                            color: "#05bb4c",
+                            color: themeName === "dark"?"#05bb4c":  partten.getColor("deepblue"),
                         },
                         textStyle:{
-                            color:"rgba(204,187,225,0.5)",
+                            color: themeName === "dark"? "rgba(204,187,225,0.5)": "#000",
                         },
-                        fillerColor:"rgba(5,187,76,0.4)",
-                        borderColor: "rgba(5,187,76,0.5)",
+                        fillerColor:themeName === "dark"?"rgba(5,187,76,0.4)":"rgba(54, 52, 142,0.4)",
+                        borderColor:themeName === "dark"?"rgba(5,187,76,0.5)":"rgba(54, 52, 142,0.5)",
 
                     }, {
                         type: "inside",
@@ -1061,7 +313,7 @@
                                 // formatter: "{value}",
                                 fontSize: util.vh(14),
                                 textStyle: {
-                                    color: partten.getColor("gray"),
+                                    color: themeName === "dark"? partten.getColor("gray"): "#000",
                                 },
                             },
                             // data: this.xdata,
@@ -1104,6 +356,11 @@
         unmounted() {
             window.removeEventListener("resize", this.resize);
         },
+		watch: {
+		    "$store.state.themeName"() {
+		      this.initChart();
+		    },
+		  },
     };
 </script>
 

src/components/chart/line/normal-line-chart.vue

@@ -162,7 +162,7 @@ export default {
           //分格线
           splitLine: {
             lineStyle: {
-              color: partten.getColor("gray") + 55,
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 55,
               type: "dashed",
             },
           },
@@ -204,10 +204,10 @@ export default {
         color: this.color,
         tooltip: {
           trigger: "axis",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
-          textStyle: {
-            color: "#fff",
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+			borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+			textStyle: {
+			  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
         },
@@ -217,9 +217,9 @@ export default {
           right: 56,
           icon: "circle",
           itemWidth: 6,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -237,7 +237,7 @@ export default {
               formatter: "{value}",
               fontSize: util.vh(14),
               textStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             data: this.xdata,

src/components/chart/line/zoom-line-chart.vue

@@ -162,7 +162,7 @@ export default {
           //分格线
           splitLine: {
             lineStyle: {
-              color: partten.getColor("gray") + 55,
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000" + 55,
               type: "dashed",
             },
           },
@@ -204,10 +204,10 @@ export default {
         color: this.color,
         tooltip: {
           trigger: "axis",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
         },
@@ -217,9 +217,9 @@ export default {
           right: 56,
           icon: "circle",
           itemWidth: 6,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             fontSize: 12,
           },
         },
@@ -248,10 +248,10 @@ export default {
             moveHandleSize: 0,
             dataBackground: {
               lineStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
               areaStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             selectedDataBackground: {
@@ -264,9 +264,9 @@ export default {
             },
             fillerColor: "transparent",
             textStyle: {
-              color: partten.getColor("grayl"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
             },
-            borderColor: partten.getColor("gray"),
+            borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
             brushSelect: false,
           },
         ],
@@ -278,7 +278,7 @@ export default {
               formatter: "{value}",
               fontSize: util.vh(14),
               textStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("grayl") : "#000",
               },
             },
             data: this.xdata,
@@ -316,6 +316,11 @@ export default {
   unmounted() {
     window.removeEventListener("resize", this.resize);
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

src/components/chart/other/Dashboard2.vue

@@ -37,8 +37,10 @@ export default {
   computed: {},
   methods: {
     initChart() {
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
+		 
       let chart = echarts.init(this.$el);
-
       let value = this.value;
       let option = {
         grid: {
@@ -60,7 +62,7 @@ export default {
                 width: 8,
                 color: [
                   [0, partten.getColor("gray") + "33"],
-                  [value / 100, partten.getColor("green")],
+                  [value / 100,themeName ? partten.getColor("green") : partten.getColor("blue")],
                   [1, partten.getColor("gray") + "33"],
                 ],
               },
@@ -93,7 +95,7 @@ export default {
                 return params;
               },
               textStyle: {
-                color: partten.getColor("green"),
+                color: themeName ? partten.getColor("green") : partten.getColor("blue"),
                 fontSize: util.vh(16),
               },
             },
@@ -115,7 +117,7 @@ export default {
               lineStyle: {
                 width: 1,
                 color: [
-                  [this.value / 100, partten.getColor("green")],
+                  [this.value / 100, themeName ? partten.getColor("green") : partten.getColor("blue")],
                   [1, "#fff5"],
                 ],
               },
@@ -152,6 +154,11 @@ export default {
       this.initChart();
     });
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

src/components/chart/other/thermometer-v-chart.vue

@@ -45,9 +45,9 @@ export default {
       return rgbaColor;
     },
     initChart() {
-      var mercuryColor = "#05BB4C";
       var borderColor = partten.getColor("gray");
-
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
       let option = {
         grid: {
           top: 0,
@@ -98,7 +98,7 @@ export default {
             barWidth: 16,
             itemStyle: {
               normal: {
-                color: mercuryColor,
+                color: themeName ? partten.getColor("green") : partten.getColor("deepblue"),
                 barBorderRadius: 100,
                 borderWidth: 8,
                 borderType: "dashed",
@@ -180,6 +180,11 @@ export default {
   updated() {
     this.initChart();
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

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

@@ -99,10 +99,14 @@ export default {
         color: ["#1893ce", "#edbf00", "#039178", "#ae4802", "#ea8b00"],
         tooltip: {
           trigger: "item",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark"
+              ? "rgba(0,0,0,0.4)"
+              : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
         },
@@ -128,15 +132,21 @@ export default {
           //icon: 'circle',
           itemGap: 12, //图例item间距
           textStyle: {
-            color: partten.getColor("gray"),
+            color: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
             fontSize: util.vh(14),
             rich: {
               name: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
                 fontSize: 12,
               },
               value: {
-                color: partten.getColor("grayl"),
+                color: this.$store.state.themeName === "dark"
+                ? partten.getColor("grayl")
+                : "#000",
                 fontSize: 12,
               },
             },
@@ -175,14 +185,14 @@ export default {
                 // length: 40,
                 // length2: 120,
                 lineStyle: {
-                  color: "#fff",
+                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
                   fontSize: util.vh(14),
                 },
               },
             },
             itemStyle: {
               normal: {
-                borderWidth: util.vh(14),
+                borderWidth:this.$store.state.themeName === "dark" ? util.vh(14): util.vh(8),
                 borderColor: "#071812",
               },
             },
@@ -193,10 +203,10 @@ export default {
                 },
                 padding: [0, 0, 0, 0],
                 rich: {
-                  color: "#ffffff" + "cc",
+                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
                   percent: {
                     fontSize: util.vh(14),
-                    color: "#ffffff" + "cc",
+                    color: this.$store.state.themeName === "dark" ? "#FFFFFF" : "#000000" ,
                   },
                 },
               },
@@ -220,6 +230,11 @@ export default {
   updated() {
     this.initChart();
   },
+  watch: {
+    "$store.state.themeName"() {
+      this.initChart();
+    },
+  },
 };
 </script>
 

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

@@ -60,10 +60,10 @@ export default {
         color: ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b", "#1a93cf", "#c531c7", "#bd3338"],
         tooltip: {
           trigger: "item",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
         },
@@ -80,7 +80,7 @@ export default {
           right: "0",
           align: "left",
           textStyle: {
-            color: "#fff",
+            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
           },
           itemGap: 8,
         },

src/components/chart/radar/direction-radar-chart.vue

@@ -215,7 +215,7 @@ export default {
                     },
                     {
                       offset: 1,
-                      color: partten.getColor("green") + 60, // 100% 处的颜色
+                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") : partten.getColor("deepblue") + 60, // 100% 处的颜色
                     },
                   ],
                   global: false, // 缺省为 false
@@ -268,11 +268,11 @@ export default {
                     new echarts.graphic.LinearGradient(0, 0, 1, 0, [
                       {
                         offset: 0,
-                        color: partten.getColor(this.color) + 10,
+                        color: this.$store.state.themeName === "dark" ? partten.getColor(this.color) + 10 : partten.getColor("deepblue") + 10,
                       },
                       {
                         offset: 1,
-                        color: partten.getColor(this.color) + 99,
+                        color: this.$store.state.themeName === "dark" ? partten.getColor(this.color) + 99 : partten.getColor("deepblue") + 99,
                       },
                     ]),
                   ],
@@ -369,6 +369,11 @@ export default {
   updated() {
     this.initChart();
   },
+  watch: {
+    "$store.state.themeName"() {
+      this.initChart();
+    },
+  },
 };
 </script>
 

src/components/chart/radar/normal-radar-chart.vue

@@ -52,34 +52,33 @@ export default {
     return {
       id: "",
       chart: null,
-      lineStyles: [
-        {
+      lineStyles: [],
+	  green:{
           areaStyle: {
-            color: "rgba(75,85,174, 0.9)",
+            color: "rgba(165,228,175, 0.9)",
           },
           lineStyle: {
             color: "rgba(255,255,255, 0.85)",
           },
           itemStyle: {
-            color: "rgba(75,85,174, 0.5)",
+            color: "rgba(165,228,175, 0.5)",
             borderColor: "rgba(255,255,255, 0.5)",
             borderWidth: 0.5,
           },
         },
-        {
+	blue:{
           areaStyle: {
-            color: "rgba(165,228,175, 0.9)",
+            color: 'rgba(75,85,174, 0.9)',
           },
           lineStyle: {
             color: "rgba(255,255,255, 0.85)",
           },
           itemStyle: {
-            color: "rgba(165,228,175, 0.5)",
+            color:'rgba(75,85,174, 0.9)',
             borderColor: "rgba(255,255,255, 0.5)",
             borderWidth: 0.5,
           },
-        },
-      ],
+        }
     };
   },
   methods: {
@@ -95,10 +94,22 @@ export default {
       return result;
     },
     initChart() {
+		let themeName = '';
+		let theme = this.$store.state.themeName;
+		if(theme == 'dark' || theme == 'light'){
+			themeName = theme;
+		}else{
+			themeName = theme.split(' ')[1];
+		}
       let chart = echarts.init(this.$el);
-
       let maxValue = -1;
-
+		
+		if(themeName === "dark"){
+			this.lineStyles = [this.green,this.blue];
+		}else{
+			this.lineStyles = [this.blue,this.green];
+		}
+		
       if (this.value.length > 0)
         this.value[0].data.forEach((item, index) => {
           item.value.forEach((value) => {
@@ -130,20 +141,32 @@ export default {
         },
         tooltip: {
           trigger: "item",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor:
+            themeName === "dark"
+              ? "rgba(0,0,0,0.4)"
+              : "rgba(255,255,255,0.5)",
+          borderColor:
+            themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
-            color: "#fff",
+            color: themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
         },
         legend: {
           show: this.showLegend,
           bottom: 16,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor:
+            themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
             fontSize: 12,
+            color:
+              themeName === "dark"
+                ? partten.getColor("grayl")
+                : "#000",
           },
         },
         radar: [
@@ -155,19 +178,25 @@ export default {
             nameGap: "16",
             name: {
               textStyle: {
-                color: partten.getColor("gray") + 99,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 99
+              : "#000",
                 fontSize: 12,
               },
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
               },
             },
             splitArea: {
@@ -188,7 +217,9 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
                 shadowBlur: 1,
                 shadowColor: "#fff",
                 shadowOffsetX: 0.5,
@@ -198,7 +229,9 @@ export default {
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
                 shadowColor: "#fff",
                 shadowBlur: 0,
                 shadowOffsetX: 0.5,
@@ -222,13 +255,17 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
               },
             },
             splitArea: {
@@ -246,7 +283,9 @@ export default {
                     },
                     {
                       offset: 1,
-                      color: partten.getColor("green") + 60, // 100% 处的颜色
+                      color: themeName === "dark"
+              ? partten.getColor("green") + 60
+              : partten.getColor("deepblue") + 60, // 100% 处的颜色
                     },
                   ],
                   global: false, // 缺省为 false
@@ -265,13 +304,17 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
               },
             },
             splitArea: {
@@ -289,7 +332,9 @@ export default {
                     },
                     {
                       offset: 1,
-                      color: partten.getColor("green") + 60, // 100% 处的颜色
+                      color: themeName === "dark"
+              ? partten.getColor("green") + 60
+              : partten.getColor("deepblue") + 60, // 100% 处的颜色
                     },
                   ],
                   global: false, // 缺省为 false
@@ -308,13 +353,17 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
               },
             },
             splitArea: {
@@ -335,13 +384,17 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: themeName === "dark"
+              ? partten.getColor("gray") + 40
+              : "#000" + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
               },
             },
             splitArea: {
@@ -374,6 +427,11 @@ export default {
       this.initChart();
     });
   },
+  watch: {
+    "$store.state.themeName"() {
+      this.initChart();
+    },
+  },
 };
 </script>
 

src/components/chart/radar/radar-chart.vue

@@ -63,29 +63,53 @@ export default {
     return {
       id: "",
       chart: null,
-      lineStyles: [
-        {
-          areaStyle: {
-            color: "rgba(75,85,174, 0.9)",
-          },
-          lineStyle: {
-            color: "rgba(255,255,255, 0.85)",
-          },
-          itemStyle: {
-            color: "rgba(75,85,174, 0.5)",
-            borderColor: "rgba(255,255,255, 0.5)",
-            borderWidth: 0.5,
-          },
-        },
-      ],
+      lineStyles: [],
+	  green:{
+	        areaStyle: {
+	          color: "rgba(165,228,175, 0.9)",
+	        },
+	        lineStyle: {
+	          color: "rgba(255,255,255, 0.85)",
+	        },
+	        itemStyle: {
+	          color: "rgba(165,228,175, 0.5)",
+	          borderColor: "rgba(255,255,255, 0.5)",
+	          borderWidth: 0.5,
+	        },
+	      },
+	  blue:{
+	        areaStyle: {
+	          color: 'rgba(75,85,174, 0.9)',
+	        },
+	        lineStyle: {
+	          color: "rgba(255,255,255, 0.85)",
+	        },
+	        itemStyle: {
+	          color:'rgba(75,85,174, 0.9)',
+	          borderColor: "rgba(255,255,255, 0.5)",
+	          borderWidth: 0.5,
+	        },
+	      }
     };
   },
   computed: {},
   methods: {
     initChart() {
+		let themeName = '';
+		let theme = this.$store.state.themeName;
+		if(theme == 'dark' || theme == 'light'){
+			themeName = theme;
+		}else{
+			themeName = theme.split(' ')[1];
+		}
       let chart = echarts.init(this.$el);
 
       let maxValue = -1;
+	  if(themeName === "dark"){
+	  	this.lineStyles = [this.green,this.blue];
+	  }else{
+	  	this.lineStyles = [this.blue,this.green];
+	  }
       if (this.value.data)
         this.value.data.forEach((item, index) => {
           item.value.forEach((value) => {
@@ -116,10 +140,10 @@ export default {
         },
         tooltip: {
           trigger: "item",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
-          textStyle: {
-            color: "#fff",
+          backgroundColor: this.$store.state.themeName === "dark" ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+			borderColor: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+			textStyle: {
+			  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
             fontSize: util.vh(16),
           },
           position: function(pos, params, dom, rect, size) {
@@ -140,20 +164,20 @@ export default {
             nameGap: "4",
             name: {
               textStyle: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
                 fontSize: 12,
                 padding: [0, 16],
               },
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
               },
             },
             splitArea: {
@@ -174,7 +198,7 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
                 shadowBlur: 1,
                 shadowColor: "#fff",
                 shadowOffsetX: 0.5,
@@ -184,7 +208,7 @@ export default {
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
                 shadowColor: "#fff",
                 shadowBlur: 0,
                 shadowOffsetX: 0.5,
@@ -208,13 +232,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             splitArea: {
@@ -232,7 +256,7 @@ export default {
                     },
                     {
                       offset: 1,
-                      color: partten.getColor("green") + 60, // 100% 处的颜色
+                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") + 60 : partten.getColor("deepblue") + 60, // 100% 处的颜色
                     },
                   ],
                   global: false, // 缺省为 false
@@ -251,13 +275,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             splitArea: {
@@ -275,7 +299,7 @@ export default {
                     },
                     {
                       offset: 1,
-                      color: partten.getColor("green") + 60, // 100% 处的颜色
+                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") + 60 : partten.getColor("deepblue") + 60, // 100% 处的颜色
                     },
                   ],
                   global: false, // 缺省为 false
@@ -294,13 +318,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             splitArea: {
@@ -321,13 +345,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: partten.getColor("gray") + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
               },
             },
             splitArea: {
@@ -366,6 +390,11 @@ export default {
       this.initChart();
     });
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

src/components/three/wave.vue

@@ -1,153 +1,176 @@
 <template>
-    <div class="wave"></div>
+  <div class="wave"></div>
 </template>
 
 <script>
-    import * as THREE from 'three';
+import * as THREE from "three";
+import $ from "jquery";
 
-    let scene, camera, renderer, particles;
+let scene, camera, renderer, particles;
 
-    export default {
-        // 名称
-        name: "wave",
-        // 使用组件
-        components: {},
-        // 传入参数
-        props: {},
-        // 自定义事件
-        emits: {},
-        // 数据
-        data() {
-            return {
-                SEPARATION: 100,
-                AMOUNTX: 100,
-                AMOUNTY: 100,
-                count: 0,
-                mouseX: 0,
-                mouseY: -400,
-                windowHalfX: window.innerWidth / 2,
-                windowHalfY: window.innerHeight / 2,
-            }
+export default {
+  // 名称
+  name: "wave",
+  // 使用组件
+  components: {},
+  // 传入参数
+  props: {},
+  // 自定义事件
+  emits: {},
+  // 数据
+  data() {
+    return {
+      SEPARATION: 100,
+      AMOUNTX: 100,
+      AMOUNTY: 100,
+      count: 0,
+      mouseX: 0,
+      mouseY: -400,
+      windowHalfX: window.innerWidth / 2,
+      windowHalfY: window.innerHeight / 2,
+    };
+  },
+  // 函数
+  methods: {
+    init() {
+      camera = new THREE.PerspectiveCamera(
+        50,
+        window.innerWidth / window.innerHeight,
+        1,
+        10000
+      );
+      camera.position.z = 1000;
+      scene = new THREE.Scene();
+      const numParticles = this.AMOUNTX * this.AMOUNTY;
+      const positions = new Float32Array(numParticles * 3);
+      const scales = new Float32Array(numParticles);
+      let i = 0,
+        j = 0;
+      for (let ix = 0; ix < this.AMOUNTX; ix++) {
+        for (let iy = 0; iy < this.AMOUNTY; iy++) {
+          positions[i] =
+            ix * this.SEPARATION - (this.AMOUNTX * this.SEPARATION) / 2; // x
+          positions[i + 1] = 0; // y
+          positions[i + 2] =
+            iy * this.SEPARATION - (this.AMOUNTY * this.SEPARATION) / 2; // z
+          scales[j] = 1;
+          i += 3;
+          j++;
+        }
+      }
+      const geometry = new THREE.BufferGeometry();
+      geometry.setAttribute(
+        "position",
+        new THREE.BufferAttribute(positions, 3)
+      );
+      geometry.setAttribute("scale", new THREE.BufferAttribute(scales, 1));
+      const material = new THREE.ShaderMaterial({
+        uniforms: {
+          color: {
+            value: new THREE.Color(
+              this.$store.state.themeName === "dark" ? 0x05bb4c : 0x36348e
+            ),
+          },
         },
-        // 函数
-        methods: {
-            init: function() {
-                camera = new THREE.PerspectiveCamera(50, window.innerWidth / window.innerHeight, 1, 10000);
-                camera.position.z = 1000;
-                scene = new THREE.Scene();
-                const numParticles = this.AMOUNTX * this.AMOUNTY;
-                const positions = new Float32Array(numParticles * 3);
-                const scales = new Float32Array(numParticles);
-                let i = 0,
-                    j = 0;
-                for (let ix = 0; ix < this.AMOUNTX; ix++) {
-                    for (let iy = 0; iy < this.AMOUNTY; iy++) {
-                        positions[i] = ix * this.SEPARATION - ((this.AMOUNTX * this.SEPARATION) / 2); // x
-                        positions[i + 1] = 0; // y
-                        positions[i + 2] = iy * this.SEPARATION - ((this.AMOUNTY * this.SEPARATION) / 2); // z
-                        scales[j] = 1;
-                        i += 3;
-                        j++;
-                    }
-                }
-                const geometry = new THREE.BufferGeometry();
-                geometry.setAttribute('position', new THREE.BufferAttribute(positions, 3));
-                geometry.setAttribute('scale', new THREE.BufferAttribute(scales, 1));
-                const material = new THREE.ShaderMaterial({
-                    uniforms: {
-                        color: {
-                            value: new THREE.Color(0x05bb4c),
-                        },
-                    },
-                    vertexShader: `attribute float scale;
+        vertexShader: `attribute float scale;
                         void main() {
                             vec4 mvPosition = modelViewMatrix * vec4( position, 2.0 );
                             gl_PointSize = scale * ( 200.0 / - mvPosition.z );
                             gl_Position = projectionMatrix * mvPosition;
                         }`,
-                    fragmentShader: `uniform vec3 color;
+        fragmentShader: `uniform vec3 color;
                         void main() {
                             if ( length( gl_PointCoord - vec2( 0.5, 0.5 ) ) > 0.475 ) discard;
                             gl_FragColor = vec4( color, 0.7 );
                         }`,
-                    transparent: true,
-                });
-                particles = new THREE.Points(geometry, material);
-                scene.add(particles);
-                renderer = new THREE.WebGLRenderer({
-                    antialias: true,
-                    alpha: true,
-                });
-                renderer.setSize(window.innerWidth, window.innerHeight);
-                renderer.setPixelRatio(window.devicePixelRatio);
-                renderer.setAnimationLoop(this.render);
-                this.$el.appendChild(renderer.domElement);
-            },
-            render: function() {
-                camera.position.x += (this.mouseX - camera.position.x) * .05;
-                camera.position.y += (-this.mouseY - camera.position.y) * .05;
-                camera.lookAt(scene.position);
-                const positions = particles.geometry.attributes.position.array;
-                const scales = particles.geometry.attributes.scale.array;
-                let i = 0,
-                    j = 0;
-                for (let ix = 0; ix < this.AMOUNTX; ix++) {
-                    for (let iy = 0; iy < this.AMOUNTY; iy++) {
-                        positions[i + 1] = (Math.sin((ix + this.count) * 0.3) * 50) +
-                            (Math.sin((iy + this.count) * 0.5) * 50);
-                        scales[j] = (Math.sin((ix + this.count) * 0.3) + 1) * 20 +
-                            (Math.sin((iy + this.count) * 0.5) + 1) * 20;
-                        i += 3;
-                        j++;
-                    }
-                }
-                particles.geometry.attributes.position.needsUpdate = true;
-                particles.geometry.attributes.scale.needsUpdate = true;
-                renderer.render(scene, camera);
-                this.count += 0.1;
-            }
-        },
-        // 生命周期钩子
-        beforeCreate() {
-            // 创建前
-        },
-        created() {
-            // 创建后
-        },
-        beforeMount() {
-            // 渲染前
-        },
-        mounted() {
-            // 渲染后
-            camera = null;
-            scene = null;
-            renderer = null;
-            this.init();
-        },
-        beforeUpdate() {
-            // 数据更新前
-        },
-        updated() {
-            // 数据更新后
-        },
-        beforeUnmount() {
-            // 销毁前
-            renderer.setAnimationLoop(null);
-            camera = null;
-            scene = null;
-            renderer = null;
-        },
-    }
+        transparent: true,
+      });
+      particles = new THREE.Points(geometry, material);
+      scene.add(particles);
+      renderer = new THREE.WebGLRenderer({
+        antialias: true,
+        alpha: true,
+      });
+      renderer.setSize(window.innerWidth, window.innerHeight);
+      renderer.setPixelRatio(window.devicePixelRatio);
+      renderer.setAnimationLoop(this.render);
+      this.$el.appendChild(renderer.domElement);
+    },
+    render() {
+      camera.position.x += (this.mouseX - camera.position.x) * 0.05;
+      camera.position.y += (-this.mouseY - camera.position.y) * 0.05;
+      camera.lookAt(scene.position);
+      const positions = particles.geometry.attributes.position.array;
+      const scales = particles.geometry.attributes.scale.array;
+      let i = 0,
+        j = 0;
+      for (let ix = 0; ix < this.AMOUNTX; ix++) {
+        for (let iy = 0; iy < this.AMOUNTY; iy++) {
+          positions[i + 1] =
+            Math.sin((ix + this.count) * 0.3) * 50 +
+            Math.sin((iy + this.count) * 0.5) * 50;
+          scales[j] =
+            (Math.sin((ix + this.count) * 0.3) + 1) * 20 +
+            (Math.sin((iy + this.count) * 0.5) + 1) * 20;
+          i += 3;
+          j++;
+        }
+      }
+      particles.geometry.attributes.position.needsUpdate = true;
+      particles.geometry.attributes.scale.needsUpdate = true;
+      renderer.render(scene, camera);
+      this.count += 0.1;
+    },
+  },
+  // 生命周期钩子
+  beforeCreate() {
+    // 创建前
+  },
+  created() {
+    // 创建后
+  },
+  beforeMount() {
+    // 渲染前
+  },
+  mounted() {
+    // 渲染后
+    camera = null;
+    scene = null;
+    renderer = null;
+    this.init();
+  },
+  beforeUpdate() {
+    // 数据更新前
+  },
+  updated() {
+    // 数据更新后
+  },
+  beforeUnmount() {
+    // 销毁前
+    renderer.setAnimationLoop(null);
+    camera = null;
+    scene = null;
+    renderer = null;
+  },
+
+  watch: {
+    "$store.state.themeName"() {
+      $(".wave").empty();
+      renderer.setAnimationLoop(null);
+      this.init();
+    },
+  },
+};
 </script>
 
 <style lang="less">
-    .wave {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 100%;
-        height: 60%;
-        z-index: -1;
-        overflow: hidden;
-    }
+.wave {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 60%;
+  z-index: -1;
+  overflow: hidden;
+}
 </style>

src/helper/partten.js

@@ -12,11 +12,11 @@ const color = [
 	{ key: "cyan", value: "#1cbbb4" },
 	{ key: "brown", value: "#a5673f" },
 	{ key: "mauve", value: "#9c26b0" },
+	{ key: "deepblue", value: "#36348e" },
 ];
 
 function getColor(key) {
-    if (!key)
-        key = "green"
+	if(!color.some(ele=>{ return ele.key === key })) key = "green";
     return color.find((t) => { return t.key == key }).value;
 }
 

src/main.js

@@ -11,8 +11,8 @@ import 'element-plus/dist/index.css';
 // import 'element-plus/lib/theme-chalk/index.css';
 import locale from 'element-plus/lib/locale/lang/zh-cn';
 
-// 引入环境配置
-import "@modeConfig/modeConfig.js";
+// // 引入环境配置
+// import "@modeConfig/modeConfig.js";
 
 import "@/lib/global-import.js";
 

src/router/index.js

@@ -839,6 +839,12 @@ const routes = [{
 	name: "analysis",
 	component: () => import("../views/sampleDatabase/analysis/index.vue")
 },
+//样本库功率曲线分析
+{
+	path: "/others/powerline/analysis",
+	name: "powerlineAnalysis",
+	component: () => import("../views/sampleDatabase/powerlineAnalysis/index.vue")
+},
 //知识库
 {
 	path: "/others/knowledgeBase",

src/store/index.js

@@ -8,8 +8,10 @@ const debug = process.env.NODE_ENV !== 'production';
 const state = {
   websocketTimeSec: 1000,
   loading: false, //全局 - 加载中....
-  themeName: localStorage.getItem("authToken") || "dark", // 主题
+  themeName: localStorage.getItem("themeName") || "dark", // 主题
+  menuData: [],
   windturbineMap: {},
+  moudleName: "",
 };
 
 //改变状态的方法
@@ -22,6 +24,12 @@ const mutations = {
   },
   update(state, newData) {
     state.windturbineMap = newData.data
+  },
+  changeMenuData(state, newData) {
+    state.menuData = newData;
+  },
+  changeModuleName(state, newData) {
+    state.moudleName = newData;
   }
 };
 
@@ -30,7 +38,13 @@ const actions = {
     context.commit("update", newData);
   },
   changeTheme(context, str) {
-    context.commit("changeTheme", str)
+    context.commit("changeTheme", str);
+  },
+  changeMenuData(context, str) {
+    context.commit("changeMenuData", str);
+  },
+  changeModuleName(context, str) {
+    context.commit("changeModuleName", str);
   }
 };
 
@@ -42,7 +56,8 @@ const getters = {
   themeName: state => state.themeName,
   asidez: state => state.z,
   mainy: state => state.y,
-  login: state => state.login
+  login: state => state.login,
+  menuData: state => state.menuData
 }
 
 export default createStore({

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

@@ -83,7 +83,7 @@
     <!-- <MultipleLineChart v-if="chartType === 'multiple'" height="13.889vh" :list="data.tb || chartData" :hoverType="'axis'"></MultipleLineChart> -->
   	<el-dialog v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="true">
-      <DoubleLineChart height="70vh" :list="data.tb || chartData" ></DoubleLineChart>
+      <DoubleLineChart height="70vh" :list="data.tb || chartData" myUnit='MW'></DoubleLineChart>
 		</el-dialog>
   </ComPanel>
 </template>

src/views/Decision/Decision1.vue

@@ -518,7 +518,6 @@ export default {
       //     sort: "",
       //   },
       //   success(res) {
-
       //     var name = [],
       //       data = [],
       //       llfdl = [],

src/views/Decision/Decision1Mx.vue

@@ -1,428 +1,519 @@
 <template>
-  <div class="decision-page-1">
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select
-              v-model="value1"
-              @change="ChangZhanChange(value1)"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in ChangZhan"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">项目：</div>
-          <div class="search-input">
-            <el-select
-              v-model="value2"
-              @change="XiangMuChange(value2)"
-              multiple
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in XiangMu"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">线路：</div>
-          <div class="search-input">
-            <el-select
-              v-model="value3"
-              @change="XianLuChange(value3)"
-              multiple
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in XianLu"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="value4"
-              @change="BeginChange(value4)"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="value5"
-              @change="EndChange(value5)"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
-            <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="''" />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions">
-        <button class="btn" @click="mxClick()">搜索</button>
-        <button class="btn green">明细信息</button>
-        <button class="btn" @click="exportExcel()">导出</button>
-      </div>
-    </div>
-    <div class="actions mg-b-8">
-      <button
-        class="btn"
-        :class="TypeClass == 1 ? 'green' : ''"
-        @click="TypeClick(1)"
-      >
-        风场
-      </button>
-      <button
-        class="btn"
-        :class="TypeClass == 2 ? 'green' : ''"
-        @click="TypeClick(2)"
-      >
-        项目
-      </button>
-      <button
-        class="btn"
-        :class="TypeClass == 3 ? 'green' : ''"
-        @click="TypeClick(3)"
-      >
-        集电线路
-      </button>
-    </div>
-    <div class="contentMx">
-      <div class="activeMx">
-        <el-row :type="'flex'" class="content">
-          <el-col :span="10" class="pd-r-8">
-            <toolbar-panel title="风机绩效榜明细" :showLine="false">
-              <bar-line-chart
-                :height="'calc(100vh - 250px)'"
-                :bardata="bardata"
-                :lineData="lineData"
-                :color="barColor"
-                lineName="理论发电量"
-              />
-            </toolbar-panel>
-          </el-col>
-          <el-col :span="14" class="pd-l-8">
-            <panel :title="'项目列表'" :showLine="false">
-              <div class="project-table">
-                <Table :data="tableData">
-                  <template v-slot:tr v-if="tableData.data.length > 0">
-                    <tr>
-                      <td>
-                        {{ tableDataEnd.index }}
-                      </td>
-                      <td style="width: 150px">
-                        {{ tableDataEnd.name }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.llfdl }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.sjfdl }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.speed }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.fjhjx1 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.fjhjx2 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.jhjx1 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.jhjx2 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.sl1 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.sl2 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.xd1 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.xd2 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.xn1 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.xn2 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.xn3 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.xn4 }}
-                      </td>
-                      <td>
-                        {{ tableDataEnd.fnlly }}
-                      </td>
-                    </tr>
-                  </template>
-                </Table>
-              </div>
-            </panel>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-  </div>
+	<div class="decision-page-1">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">场站：</div>
+					<div class="search-input">
+						<el-select v-model="value1" @change="ChangZhanChange(value1)" clearable placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">项目：</div>
+					<div class="search-input">
+						<el-select v-model="value2" @change="XiangMuChange(value2)" multiple placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in XiangMu" :key="item.id" :value="item.id" :label="item.name">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">线路：</div>
+					<div class="search-input">
+						<el-select v-model="value3" @change="XianLuChange(value3)" multiple placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in XianLu" :key="item.id" :label="item.name" :value="item.id">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">开始日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value4" @change="BeginChange(value4)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">结束日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value5" @change="EndChange(value5)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+						<div class="unit svg-icon svg-icon-gray">
+							<svg-icon :svgid="''" />
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="query-actions">
+				<button class="btn" @click="mxClick()">搜索</button>
+				<button class="btn green" >明细信息</button>
+				<button class="btn" @click="exportExcel()">导出</button>
+			</div>
+		</div>
+		<div class="actions mg-b-8">
+			<button class="btn" :class="TypeClass==1?'green':''" @click="TypeClick(1)">风场</button>
+			<button class="btn" :class="TypeClass==2?'green':''" @click="TypeClick(2)">项目</button>
+			<button class="btn" :class="TypeClass==3?'green':''" @click="TypeClick(3)">集电线路</button>
+		</div>
+		<div class="contentMx">
+			<div class="activeMx">
+				<el-row :type="'flex'" class="content">
+					<el-col :span="10" class="pd-r-8">
+						<toolbar-panel title="风机绩效榜明细" :showLine="false">
+							<bar-line-chart :height="'calc(100vh - 250px)'" :bardata="bardata" :lineData="lineData"
+								:color="barColor" lineName="理论发电量" />
+						</toolbar-panel>
+					</el-col>
+					<el-col :span="14" class="pd-l-8">
+						<panel :title="'项目列表'" :showLine="false">
+							<div class="project-table">
+								<Table :data="tableData">
+									<template v-slot:tr v-if="tableData.data.length > 0">
+										<tr>
+											<td>
+												{{tableDataEnd.index}}
+											</td>
+											<td style="width:150px">
+												{{tableDataEnd.name}}
+											</td>
+											<td>
+												{{tableDataEnd.llfdl}}
+											</td>
+											<td>
+												{{tableDataEnd.sjfdl}}
+											</td>
+											<td>
+												{{tableDataEnd.speed}}
+											</td>
+											<td>
+												{{tableDataEnd.fjhjx1}}
+											</td>
+											<td>
+												{{tableDataEnd.fjhjx2}}
+											</td>
+											<td>
+												{{tableDataEnd.jhjx1}}
+											</td>
+											<td>
+												{{tableDataEnd.jhjx2}}
+											</td>
+											<td>
+												{{tableDataEnd.sl1}}
+											</td>
+											<td>
+												{{tableDataEnd.sl2}}
+											</td>
+											<td>
+												{{tableDataEnd.xd1}}
+											</td>
+											<td>
+												{{tableDataEnd.xd2}}
+											</td>
+											<td>
+												{{tableDataEnd.xn1}}
+											</td>
+											<td>
+												{{tableDataEnd.xn2}}
+											</td>
+											<td>
+												{{tableDataEnd.xn3}}
+											</td>
+											<td>
+												{{tableDataEnd.xn4}}
+											</td>
+											<td>
+												{{tableDataEnd.fnlly}}
+											</td>
+										</tr>
+									</template>
+								</Table>
+							</div>
+						</panel>
+					</el-col>
+				</el-row>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import BarLineChart from "../../components/chart/combination/bar-line-chart.vue";
-import SvgIcon from "../../components/coms/icon/svg-icon.vue";
-import Panel from "../../components/coms/panel/panel.vue";
-import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
-import Table from "./table.vue";
-import partten from "@/helper/partten.js";
-import api from "@api/economic/index.js";
-export default {
-  components: {
-    ToolbarPanel,
-    BarLineChart,
-    Panel,
-    Table,
-    partten,
-    SvgIcon,
-  },
-  data() {
-    return {
-      tableData: {
-        column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "名称",
-            field: "name",
-            width: "150px",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "理论发电量",
-            field: "llfdl",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "SCADA发电量",
-            field: "sjfdl",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "风速",
-            field: "speed",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "故障损失",
-            field: "fjhjx1",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "故障受累",
-            field: "fjhjx2",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "检修损失",
-            field: "jhjx1",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "检修受累",
-            field: "jhjx2",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "电网受累",
-            field: "sl1",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "天气受累",
-            field: "sl2",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "限电降出",
-            field: "xd1",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "限电停机",
-            field: "xd2",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "待风损失",
-            field: "xn1",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "手动停机",
-            field: "xn2",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "正常发电",
-            field: "xn3",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "缺陷降出",
-            field: "xn4",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "风能利用率%",
-            field: "fnlly",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-        ],
-        data: [],
-      },
-      tableDataEnd: [], //合计
-      ChangZhan: [], //场站
-      XiangMu: [], //项目
-      XianLu: [], //线路
-      value1: [],
-      value2: [],
-      value3: [],
-      value4: "",
-      value5: "",
-      barColor: [
-        partten.getColor("purple"),
-        partten.getColor("green"),
-        partten.getColor("pink"),
-        partten.getColor("red"),
-        partten.getColor("orange"),
-        partten.getColor("grayl"),
-        partten.getColor("yellow"),
-        partten.getColor("gray"),
-        partten.getColor("blue"),
-        partten.getColor("cyan"),
-        partten.getColor("brown"),
-        partten.getColor("mauve"),
-      ],
-      TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
-      bardata: [],
-      lineData: [],
-    };
-  },
-  created() {
-    this.ChangZhanVal();
-    this.value4 = this.getTime(1);
-    this.value5 = this.getTime(2);
-    this.AjaxCommon();
-  },
-  methods: {
-    ChangZhanVal() {
-      api.benchmarkingWplist1({})
-        .then((res) => {
-          this.ChangZhan = res.data;
-        });
-		
-    //   var that = this;
-    //   that.API.requestData({
-    //     method: "GET",
-    //     baseURL: "http://10.83.66.220:8020/",
-    //     subUrl: "benchmarking/wplist",
-    //     success(res) {
-    //       that.ChangZhan = res.data;
-    //     },
-    //   });
-    },
-    ChangZhanChange(val) {
-      this.TypeClass = "";
-      this.value1 = val;
-      this.value2 = [];
-      this.value3 = [];
-      this.AjaxCommon();
-      this.XiangMuVal(val);
-    },
-    XiangMuVal(val) {
-		api.benchmarkingProjectList1({
-        wpids: val,
-      }).then((res) => {
-        this.XiangMu = res.data;
-      });
+	import BarLineChart from "../../components/chart/combination/bar-line-chart.vue";
+	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
+	import Panel from "../../components/coms/panel/panel.vue";
+	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
+	import Table from "./table.vue";
+	import partten from "@/helper/partten.js";
+	export default {
+		components: {
+			ToolbarPanel,
+			BarLineChart,
+			Panel,
+			Table,
+			partten,
+			SvgIcon
+		},
+		data() {
+			return {
+				tableData: {
+					column: [{
+							name: "",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "名称",
+							field: "name",
+							width: '150px',
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "理论发电量",
+							field: "llfdl",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "SCADA发电量",
+							field: "sjfdl",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "风速",
+							field: "speed",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "故障损失",
+							field: "fjhjx1",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "故障受累",
+							field: "fjhjx2",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "检修损失",
+							field: "jhjx1",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "检修受累",
+							field: "jhjx2",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "电网受累",
+							field: "sl1",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "天气受累",
+							field: "sl2",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "限电降出",
+							field: "xd1",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "限电停机",
+							field: "xd2",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "待风损失",
+							field: "xn1",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "手动停机",
+							field: "xn2",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "正常发电",
+							field: "xn3",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "缺陷降出",
+							field: "xn4",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						},
+						{
+							name: "风能利用率%",
+							field: "fnlly",
+							is_num: false,
+							is_light: false,
+							sortable: true
+						}
+					],
+					data: [],
+				},
+				tableDataEnd: [], //合计
+				ChangZhan: [], //场站
+				XiangMu: [], //项目
+				XianLu: [], //线路
+				value1: [],
+				value2: [],
+				value3: [],
+				value4: "",
+				value5: "",
+				barColor: [partten.getColor("purple"), partten.getColor("green"), partten.getColor("pink"), partten
+					.getColor("red"), partten.getColor("orange"), partten.getColor("grayl"), partten.getColor(
+						"yellow"), partten.getColor("gray"), partten.getColor("blue"), partten.getColor("cyan"),
+					partten
+					.getColor("brown"), partten.getColor("mauve")
+				],
+				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
+				bardata: [],
+				lineData: [],
+			};
+		},
+		created() {
+			this.ChangZhanVal();
+			this.value4 = this.getTime(1);
+			this.value5 = this.getTime(2);
+			this.AjaxCommon();
+		},
+		methods: {
+			ChangZhanVal() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.83.66.220:8020/",
+					subUrl: "benchmarking/wplist",
+					success(res) {
+						that.ChangZhan = res.data;
+					}
+				});
+			},
+			ChangZhanChange(val) {
+				this.TypeClass = "";
+				this.value1 = val;
+				this.value2 = [];
+				this.value3 = [];
+				this.AjaxCommon();
+				this.XiangMuVal(val);
+			},
+			XiangMuVal(val) {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.83.66.220:8020/",
+					subUrl: "benchmarking/projectList",
+					data: {
+						wpids: val
+					},
+					success(res) {
+						that.XiangMu = res.data;
+					}
+				});
+			},
+			XiangMuChange(val) {
+				this.TypeClass = "";
+				this.value2 = val;
+				this.value3 = [];
+				this.AjaxCommon();
+				this.XianLuVal(val);
+			},
+			XianLuVal(val) {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.83.66.220:8020/",
+					subUrl: "benchmarking/lineList",
+					data: {
+						projects: val
+					},
+					success(res) {
+						that.XianLu = res.data;
+					}
+				});
+			},
+			XianLuChange(val) {
+				this.TypeClass = "";
+				this.value3 = val;
+				this.AjaxCommon();
+			},
+			BeginChange(val) {
+				this.value4 = val;
+				this.AjaxCommon();
+			},
+			EndChange(val) {
+				this.value5 = val;
+				this.AjaxCommon();
+			},
+			TypeClick(val) {
+				this.TypeClass = val;
+				// 重置状态start
+				this.value1 = [];
+				this.value2 = [];
+				this.value3 = [];
+				this.value4 = this.getTime(1);
+				this.value5 = this.getTime(2);
+				this.AjaxCommon();
+				// 重置状态end
+			},
+			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+				var date = new Date();
+				var year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate();
+				month >= 1 && month <= 9 ? (month = '0' + month) : '';
+				day >= 0 && day <= 9 ? (day = '0' + day) : '';
+				var begin = year + '-' + month + '-01';
+				var end = year + '-' + month + '-' + day;
+				if (val == 1) {
+					return begin;
+				} else if (val == 2) {
+					return end;
+				}
+			},
+			AjaxCommon() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.83.66.220:8020/",
+					subUrl: "http://10.83.66.220:8020/mx",
+					data: {
+						wpids: that.value1,
+						projectids: that.value2,
+						lineids: that.value3,
+						beginDate: that.value4,
+						endDate: that.value5,
+						type: that.TypeClass,
+						target: '',
+						sort: ''
+					},
+					success(res) {
+						var name = [],
+							data = [],
+							llfdl = [],
+							legend = ["实际电量", "故障损失", "故障受累", "检修受累", "电网受累", "天气受累", "限电降出", "限电停机", "待风损失",
+								"手动停机", "正常发电", "缺陷降出"
+							],
+							data2 = []; //项目列表
+							
+							if(that.value1.length){
+								let arr = [];
+								let hj = res.data.pop();
+								res.data.forEach((ele,index)=>{
+									arr[ele.id.split('_')[1] - 1] = ele
+								})
+								arr.push(hj);
+								res.data = arr;
+							}
+							
+						res.data.forEach((item, index) => {
+							name.push(item.name);
+							llfdl.push(item.llfdl);
+							data.push([item.sjfdl, item.fjhjx1, item.fjhjx2, item.jhjx1, item.jhjx2, item
+								.sl1, item.sl2, item.xd1, item.xd2, item.xn1, item.xn2, item.xn3,
+								item.xn4
+							])
+							data2.push({
+								index: index + 1,
+								name: item.name,
+								llfdl: item.llfdl,
+								sjfdl: item.sjfdl,
+								speed: item.speed,
+								fjhjx1: item.fjhjx1,
+								fjhjx2: item.fjhjx2,
+								jhjx1: item.jhjx1,
+								jhjx2: item.jhjx2,
+								sl1: item.sl1,
+								sl2: item.sl2,
+								xd1: item.xd1,
+								xd2: item.xd2,
+								xn1: item.xn1,
+								xn2: item.xn2,
+								xn3: item.xn3,
+								xn4: item.xn4,
+								fnlly: item.fnlly,
+								is_light: false
+							})
+						})
+						name.pop();
+						data.pop();
+						llfdl.pop();
+						if (data.length > 0) {
+							let arr1 = [];
+							const length = data[0].length;
+							for (var i = 0; i < length; i++) {
+								let arr2 = [];
+								data.forEach(ele => {
+									arr2.push(ele[i])
+								});
+								arr1.push(arr2);
+							}
+							that.lineData = llfdl;
+							that.bardata = {
+								area: name,
+								legend: legend,
+								data: arr1
+							};
+						}
+						that.tableDataEnd = data2[data2.length - 1];
+						data2.pop();
+						that.tableData.data = data2;
+					}
+				});
+			},
+			mxClick() {
+				this.$router.push("/decision/decision1")
+			},
+			formatJson(filterVal, jsonData) {
+				return jsonData.map(v => filterVal.map(j => v[j]));
+			},
+			exportExcel() {
+				let that = this;
+				const {
+					export_json_to_excel
+				} = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
+				let tHeader = []; // 上面设置Excel的表格第一行的标题       
+				let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
 
     //   var that = this;
     //   that.API.requestData({

src/views/Decision/Decision2Xldb.vue

@@ -160,7 +160,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
-        :title="[windNum, windNum2]"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"

src/views/Decision/Decision2Xmdb.vue

@@ -140,7 +140,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
-        :title="[windNum, windNum2]"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"

src/views/Decision/Decision3Db.vue

@@ -500,7 +500,6 @@ export default {
         .then((res) => {
           console.log(res);
           var data = res.data;
-
           var arrName = [],
             arrKey = [],
             arrData = [],
@@ -628,10 +627,10 @@ export default {
     },
   },
   watch: {
-    value4() {
-      this.AjaxCommon();
-    },
-  },
+      value4(){
+          this.AjaxCommon();
+      }
+  }
 };
 </script>
 

src/views/Decision/dual-pie-chart.vue

@@ -99,8 +99,12 @@ export default {
         color: ["#1893ce", "#edbf00", "#039178", "#ae4802", "#ea8b00"],
         tooltip: {
           trigger: "item",
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: this.$store.state.themeName === "dark"
+              ? "rgba(0,0,0,0.4)"
+              : "rgba(255,255,255,0.5)",
+          borderColor: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
           textStyle: {
             color: "#fff",
             fontSize: util.vh(16),
@@ -128,15 +132,21 @@ export default {
           //icon: 'circle',
           itemGap: 12, //图例item间距
           textStyle: {
-            color: partten.getColor("gray"),
+            color: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
             fontSize: util.vh(14),
             rich: {
               name: {
-                color: partten.getColor("gray"),
+                color: this.$store.state.themeName === "dark"
+              ? partten.getColor("gray")
+              : "#000",
                 fontSize: 12,
               },
               value: {
-                color: partten.getColor("grayl"),
+                color: this.$store.state.themeName === "dark"
+                ? partten.getColor("grayl")
+                : "#000",
                 fontSize: 12,
               },
             },
@@ -175,14 +185,14 @@ export default {
                 // length: 40,
                 // length2: 120,
                 lineStyle: {
-                  color: "#fff",
+                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
                   fontSize: util.vh(14),
                 },
               },
             },
             itemStyle: {
               normal: {
-                borderWidth: util.vh(14),
+                borderWidth:util.vh(4),
                 borderColor: "#071812",
               },
             },
@@ -193,10 +203,10 @@ export default {
                 },
                 padding: [0, 0, 0, 0],
                 rich: {
-                  color: "#ffffff" + "cc",
+                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
                   percent: {
                     fontSize: util.vh(14),
-                    color: "#ffffff" + "cc",
+                    color: this.$store.state.themeName === "dark" ? "#FFFFFF" : "#000000" ,
                   },
                 },
               },
@@ -220,6 +230,11 @@ export default {
   updated() {
     this.initChart();
   },
+  watch: {
+    "$store.state.themeName"() {
+      this.initChart();
+    },
+  },
 };
 </script>
 

src/views/Demo.vue

@@ -69,7 +69,7 @@
     <h3>折线图：multi-arrow-line-chart</h3>
     <multi-arrow-line-chart :height="'200px'" />
 
-    <h3>折线图：multiple-line-chart</h3>
+    <h3>折线图：normal-line-chart</h3>
     <normal-line-chart />
 
     <h3>折线图：simple-line-chart</h3>
@@ -108,7 +108,7 @@
       <normal-radar-chart :height="'500px'" />
     </div>
 
-    <h3>饼图：normal-radar-chart</h3>
+    <h3>饼图：radar-chart</h3>
     <div style="height: 500px">
       <radar-chart :height="'500px'" />
     </div>

src/views/HealthControl/defect-elimination-tracking.vue

@@ -78,7 +78,7 @@ export default {
   data() {
     return {
       showMe: false,
-      header: require("@assets/logo.png"),
+      header: require("@assets/userhead.jpg"),
       infoss:'',    //msg
       infols:'',    //chart
     };

src/views/Home/Home.vue

@@ -104,7 +104,7 @@
               @click="
                 showDoneChart({
                   data: DayPower,
-                  dialogTitle: '日发电量',
+                  dialogTitle: planBtnName.indexOf('电站') !== -1 || planBtnName.indexOf('光电厂') !== -1 ? '日照强度' : '日发电量',
                   dialogType: 'doneLineChart',
                 })
               "
@@ -528,7 +528,8 @@
             <row align="middle">
               <div class="situation-item fengji">
                 <div class="icon fengji-icon svg-icon svg-icon-white">
-                  <svg-icon class="" svgid="svg-风机" />
+                  <svg-icon class="" :svgid="wpId === '-2' || wpId.indexOf('GDC') !== -1 ?  'svg-photovoltaic' : 'svg-风机'" />
+				  
                 </div>
                 <div class="info">
                   <div class="title green">接入设备</div>
@@ -741,7 +742,7 @@
     <el-dialog
       :title="dialogTitle"
       v-model="dialogShow"
-      width="70%"
+      width="80%"
       top="10vh"
       custom-class="modal"
       :close-on-click-modal="true"
@@ -977,9 +978,9 @@ export default {
         success(res) {
           that.powerData = [
             {
-              title: that.wpId === '-2' ? "日照强度" : "风速",
-              value: res.data.jczbmap.ssfs,
-              dialogTitle:  that.wpId === '-2' ? "日照强度详情" : "风速详情",
+              title: that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? "日照强度" : "风速",
+				
+              dialogTitle: that.wpId == 0 ? '详情' : that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? "日照强度详情" : "风速详情",
               subUrl: "genreset/findGLDetail",
               targetName: "ssfs",
               dialogType: "powerLineChart",
@@ -1083,8 +1084,20 @@ export default {
         },
         success(res) {
           let rdlKey = ["value1", "value2", "value3", "speed"];
+		  let dw = {
+			  units:"",
+			  title:""
+		  };
+		  that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? 
+		  dw={
+			  units:"(w/㎡)",
+			  title:"日照"
+		  } : dw={
+			  units:"(m/s)",
+			  title:"风速"
+		  };
           let DayPower = {
-            units: ["(万kWh)", "(m/s)"],
+            units: ["(万kWh)", dw.units],
             value: [
               {
                 title: "发电量",
@@ -1102,7 +1115,7 @@ export default {
                 value: [],
               },
               {
-                title: "风速",
+                title: dw.title,
                 yAxisIndex: 1,
                 value: [],
               },
@@ -1241,7 +1254,9 @@ export default {
       this.historyPlanBtnName = planBtnName;
       this.changeShowType(wpId, planBtnName);
     },
-    changeShowBackType() {
+    changeShowBackType(wpId, planBtnName) {
+		this.historyWpId = wpId;
+		this.historyPlanBtnName = planBtnName;
       this.changeShowType(this.historyWpId, this.historyPlanBtnName);
     },
     // 打开弹窗
@@ -1298,9 +1313,19 @@ export default {
       this.dialogTitle = res.dialogTitle;
       this.dialogType = res.dialogType;
 
-      // this.powerLineChartData = res.data;
+	  let hour = this.nowTime.split(":")[0];
+	  let minute = this.nowTime.split(":")[1] < 30 ? minute = 1 : minute = 2;
+	  let valueLength = (hour * 2) + 1 + minute;
+	  
+	  res.data.value.forEach((ele,index)=>{
+		  if(this.wpId === '0'){
+			  ele.title.indexOf('电场') !== -1 ? ele.title+='[风速]' : ele.title;
+			  ele.title.indexOf('电站') !== -1 ? ele.title+='[日照]' : ele.title;
+		  }
+		  ele.value.splice(valueLength,48)
+	  })
       this.powerLineChartData = res.data.value;
-      if (res.dialogTitle === "风速详情") {
+      if (res.dialogTitle === "详情") {
         this.powerLineChartYAxises = [
           {
             min: 0,
@@ -1315,7 +1340,25 @@ export default {
             unit: "(w/㎡)",
           },
         ];
-      } else {
+      }else if(res.dialogTitle === "风速详情") {
+        this.powerLineChartYAxises = [
+          {
+            min: 0,
+            name: "风速",
+            position: "left",
+            unit: "(m/s)",
+          },
+        ];
+      }else if(res.dialogTitle === "日照强度详情") {
+	    this.powerLineChartYAxises = [
+		  {
+		    min: 0,
+		    name: "日照",
+		    position: "right",
+		    unit: "(w/㎡)",
+		  },
+	    ];
+	  }else {
         this.powerLineChartYAxises = [
           {
             min: 0,

src/views/Home/components/map.vue

@@ -274,7 +274,7 @@ export default {
       this.currentMode = "NX";
       this.mapName = "nx";
       this.mapIndex = -1;
-      this.$emit("mapClickBack");
+      this.$emit("mapClickBack", wpId, planBtnName);
     },
     clickLabel(wpId, planBtnName) {
       this.mapName = wpId;
@@ -283,11 +283,9 @@ export default {
       this.$emit("mapClick", wpId, planBtnName);
     },
     clickFj(wpId, planBtnName,textType) {
-		console.log(textType)
       this.$emit("mapClick", wpId, planBtnName);
     },
     changePeriod: function (name, period,textType) {
-		console.log(textType)
 		if(textType){
 			this.textType = '期次'
 		}else{

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

@@ -184,7 +184,6 @@
 		},
 		watch: {
 			data(res) {
-				console.log(res)
 				this.sourceMap = res;
 			},
 		},

src/views/MalfunctionWarning/components/detectionRecord.vue

@@ -107,18 +107,20 @@ export default {
     this.getfaultLables();
   },
   methods: {
-      opened(){
-          this.getData();
-      },
+    opened() {
+      this.getData();
+    },
     getData() {
       let that = this;
       this.API.requestData({
         method: "GET",
         subUrl: "http://192.168.1.18:9002/case/fault/list",
         data: {
-        //   station: this.selectValue,
-        //   model: this.selectMoudle,
-          st: new Date(new Date().getTime()- 86400000).formatDate("yyyy-MM-dd hh:mm:ss") ,
+          //   station: this.selectValue,
+          //   model: this.selectMoudle,
+          st: new Date(new Date().getTime() - 86400000).formatDate(
+            "yyyy-MM-dd hh:mm:ss"
+          ),
           et: new Date().formatDate("yyyy-MM-dd hh:mm:ss"),
         },
         success(res) {
@@ -140,36 +142,37 @@ export default {
         },
       });
     },
+
     selectChange(data) {
-        let params = [];
-        data.faulttype = this.faultLists.filter(
-              (item) => item.faultcode === data.faultcode
-            )[0]?.faulttype,
-        params.push(data)
-        axios({
-          method: "post",
-          url: "http://192.168.10.19:9002/case/fault/insert",
-          data: params,
-          header: {
-            "Content-Type": "application/json",
-          },
-        }).then((res) => {
-          if (res.data.code !== 200) {
-            this.BASE.showMsg({
-              type: "error",
-              msg: "标签修改失败",
-            });
-          }
-        });
+      let params = [];
+      (data.faulttype = this.faultLists.filter(
+        (item) => item.faultcode === data.faultcode
+      )[0]?.faulttype),
+        params.push(data);
+      axios({
+        method: "post",
+        url: "http://192.168.10.19:9002/case/fault/insert",
+        data: params,
+        header: {
+          "Content-Type": "application/json",
+        },
+      }).then((res) => {
+        if (res.data.code !== 200) {
+          this.BASE.showMsg({
+            type: "error",
+            msg: "标签修改失败",
+          });
+        }
+      });
     },
-    getReports(){
-      this.reportDisplay = true
+    getReports() {
+      this.reportDisplay = true;
     },
   },
 };
 </script>
 <style lang="less" scoped>
-.btn{
+.btn {
   width: 106px !important;
 }
 </style>

src/views/MalfunctionWarning/components/superviseDataClassify.vue

@@ -361,7 +361,7 @@ export default {
       params.dataInfos = dataInfos
       axios({
         method: "post",
-        url: "http://192.168.10.18:8080/api/supervised/execute",
+        url: "http://10.155.32.14:9090/api/supervised/execute",
         data: params,
         header: {
           "Content-Type": "application/json",

src/views/MalfunctionWarning/supervised.vue

@@ -342,7 +342,7 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.18:8080/",
+        baseURL: "http://10.155.32.14:9090/",
         subUrl: "api/coordinate/algorithm",
         data: {
           type: 1,
@@ -432,7 +432,7 @@ export default {
       that.resultList = [];
       this.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.18:8080/",
+        baseURL: "http://10.155.32.14:9090/",
         subUrl: "api/supervised/",
         success(res) {
           if (res.value.length > 0) {
@@ -452,7 +452,7 @@ export default {
       });
       this.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.18:8080/",
+        baseURL: "http://10.155.32.14:9090/",
         subUrl: "api/supervised/progress",
         success(res) {
           that.showTraining = true;

src/views/NewPages/alarm-center-2.vue

@@ -30,7 +30,8 @@
         </div>
         <div class="query-actions">
           <button class="btn green" @click="searchData">搜索</button>
-          <button class="btn green">导出</button>
+          <!-- <button class="btn green">导出</button> -->
+		  <button class="btn green" @click="fx">分析</button>
         </div>
       </div>
     </div>
@@ -38,40 +39,32 @@
       <table-2 :data="tableData" :height="'88vh'">
         <template v-for="(item, i) in column" :key="i" #[item]="scope">
           <div class="bar">
-            <div class="bar-percent" :style="{
-                width:
-                  (scope.data.count &&
-                    scope.data.count / (scope.data.count + scope.data.time)) *
-                    100 +
-                  'px',
-              }"></div>
-            <span class="value">{{
-              scope.data.count && scope.data.count
-              }}</span>
+          	<div class="bar-percent" :style="{ width: scope?.data?.countStyle }"> </div>
+          	<span class="value">{{ scope?.data?.count }} 次数</span>
           </div>
           <div class="bar">
-            <div class="bar-percent" :style="{
-                width:
-                  (scope.data.count &&
-                    scope.data.time / (scope.data.count + scope.data.time)) *
-                    100 +
-                  'px',
-              }"></div>
-            <span class="value">{{ scope.data.count && scope.data.time }}</span>
+          	<div class="bar-percent" :style="{ width: scope?.data?.timeStyle}"></div>
+          	<span class="value">{{scope?.data?.time }} 分钟</span>
           </div>
         </template>
       </table-2>
     </panel-3>
+	<el-dialog :title="dialogTitleFX" v-model="dialogVisibleFX" width="70%" top="10vh" custom-class="modal" :close-on-click-modal="false" :destroy-on-close='true'>
+	  <FX :date='startdate' :wpid='wpvalue'/>
+	</el-dialog>
   </div>
 </template>
 
 <script>
 import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table2 from "../../components/coms/table/table2.vue";
+import FX from "./alarm-center-gzfx.vue";
 export default {
-  components: { Panel3, Table2 },
+  components: { Panel3, Table2,FX },
   data () {
     return {
+		dialogTitleFX: "",
+		dialogVisibleFX: false,
       wpvalue: "",
       wpoptions: "",
       options: [],
@@ -202,13 +195,15 @@ export default {
       this.columnObj = columnObj;
     },
     async searchData () {
+		let enddate = new Date(Date.parse(new Date(this.enddate)) + (24*3600*1000)).formatDate("yyyy-MM-dd");
       const { data } = await this.API.requestData({
+		  showLoading:true,
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "shutdown/list",
         data: {
           stId: this.wpvalue,
           endDate: new Date(this.startdate).formatDate("yyyy-MM-dd"),
-          startDate: new Date(this.enddate).formatDate("yyyy-MM-dd"),
+          startDate: enddate,
         },
       });
       ////////
@@ -226,7 +221,9 @@ export default {
             if (k.type == c.name) {
               let obj1 = {
                 count: k.count,
+                countStyle:((k.count / (k.count + k.time)) * 100) + 'px',
                 time: k.time,
+                timeStyle:((k.time / (k.count + k.time)) * 100) + 'px'
               };
               obj[k.type] = obj1;
             }
@@ -237,6 +234,11 @@ export default {
       this.tableData.column = column;
       this.tableData.data = dataAll;
     },
+	fx(){
+		this.startdate=new Date(this.startdate).formatDate("yyyy-MM-dd");
+		this.dialogTitleFX= "预警分析";
+		this.dialogVisibleFX= true;
+	}
   },
 };
 </script>

src/views/NewPages/multiple-y-line-chart-normal.vue

@@ -289,7 +289,7 @@ export default {
     return {
       id: "",
       chart: null,
-      color: ["#323E6F", "#1DA0D7", "#05BB4C", "#EDB32F", "#DB5520"],
+      color: ["#1DA0D7","#05BB4C","#323E6F", "#EDB32F", "#DB5520"],
     };
   },
   computed: {
@@ -336,7 +336,7 @@ export default {
           //分格线
           splitLine: {
             lineStyle: {
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : partten.getColor("black"),
               type: "dashed",
             },
           },
@@ -385,8 +385,9 @@ export default {
   methods: {
     resize() {},
     initChart() {
+		
       const chart = echarts.init(this.$el);
-
+	
       let option = this.option();
       chart.clear();
 
@@ -406,16 +407,18 @@ export default {
       window.addEventListener("resize", this.resize);
     },
     option: function () {
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
       return {
         color: this.color,
         tooltip: {
           trigger: "axis",
           triggerOn:this.default?"click":"mousemove",
           alwaysShowContent:true,
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: themeName ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: themeName ? partten.getColor("gray"): "#000",
           textStyle: {
-            color: "#fff",
+            color: themeName ? "#fff" : "#000",
             fontSize: 12,
           },
         },
@@ -425,9 +428,9 @@ export default {
           top: "top",
           icon: "circle",
           itemWidth: 6,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: themeName ? partten.getColor("gray"): "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: themeName ? partten.getColor("grayl"): "#000",
             fontSize: 12,
           },
         },
@@ -452,7 +455,7 @@ export default {
               formatter: "{value}",
               fontSize: 12,
               textStyle: {
-                color: partten.getColor("gray"),
+                color: themeName ? partten.getColor("gray"): "#000",
               },
             },
             data: this.xdata,

src/views/NewPages/znzhfx.vue

@@ -16,46 +16,34 @@
       </el-row>
       <div class="mg-b-16 anliz-des">
         <div>
-          本月{{ wtId }}号风机风机设备利用小时数{{
-            tableVal.byzb && tableVal.byzb.lyxs
-          }}小时、同比{{
-            tableVal.tpzb && tableVal.tpzb.lyxs
-          }}小时，设备可利用率{{
-            tableVal.byzb && tableVal.byzb.sbklyl
-          }}%、同比{{ tableVal.tpzb && tableVal.tpzb.sbklyl }}}%，
-          等效可用系数{{ tableVal.byzb && tableVal.byzb.dxklyxs }}%、同比{{
-            tableVal.tpzb && tableVal.tpzb.dxklyxs
-          }}}%，静风频率达到{{ tableVal.byzb && tableVal.byzb.jfpl }}%、同比{{
-            tableVal.tpzb && tableVal.tpzb.jfpl
-          }}}%， 机组功率特性一致性系数达到{{
-            tableVal.byzb && tableVal.byzb.glyzxxs
-          }}%、同比{{ tableVal.tpzb && tableVal.tpzb.glyzxxs }}}%。
-          <br />
-          {{ wtId }}风机{{ year }}年{{ month }}月平均风速{{
-            tableVal.byzb && tableVal.byzb.fs
-          }}m/s、同比{{ tableVal.tpzb && tableVal.tpzb.fs }}m/s，
-          小风平均切入风速{{ tableVal.byzb && tableVal.byzb.xfqr }}m/s、同比{{
-            tableVal.tpzb && tableVal.tpzb.xfqr
-          }}m/s， 有效风时数{{
-            tableVal.byzb && tableVal.byzb.yxfss
-          }}小时、同比{{ tableVal.tpzb && tableVal.tpzb.yxfss }}小时，
-          实际发电电量{{ tableVal.byzb && tableVal.byzb.fdl }}万kwh、同比{{
-            tableVal.tpzb && tableVal.tpzb.fdl
-          }}万kwh，同比增长率{{ tableVal.tbzb && tableVal.tbzb.fdl }}%，
-          各项损失电量累计{{
-            tableVal.byzb && tableVal.byzb.llfdl - tableVal.byzb.fdl
-          }}万kwh、同比{{
-            tableVal.tpzb && tableVal.tpzb.llfdl - tableVal.tpzb.fdl
-          }}万kwh，同比增长率{{
-            tableVal.tbzb && tableVal.byzb.llfdl - tableVal.tbzb.fdl
-          }}%， 理论发电量{{
-            tableVal.byzb && tableVal.byzb.llfdl
-          }}万kwh，实际发电量与理论发电量相差{{
-            tableVal.tbzb && tableVal.tbzb.llfdl
-          }}万kwh。
-          <br />
-          本月静风频率
-          %，月累计静风时长0.00小时，月累计待机小时116.44小时，待机占比48.51%。
+          本月{{ wtId }}号风机风机设备利用小时数{{ tableVal.byzb && tableVal.byzb.lyxs }}小时、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.lyxs }}小时，
+          		设备可利用率{{ tableVal.byzb && tableVal.byzb.sbklyl }}%、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.sbklyl }}%；
+          		等效可用系数{{ tableVal.byzb && tableVal.byzb.dxklyxs }}%、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.dxklyxs }}%；
+          		静风频率达到{{ tableVal.byzb && tableVal.byzb.jfpl }}%、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.jfpl }}%；
+          		机组功率特性一致性系数达到{{ tableVal.byzb && tableVal.byzb.glyzxxs }}%、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.glyzxxs }}%。 <br />
+            {{ wtId }}风机{{ year }}年{{ month }}
+          		月平均风速{{ tableVal.byzb && tableVal.byzb.fs }}m/s、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.fs }}m/s；
+            小风平均切入风速{{ tableVal.byzb && tableVal.byzb.xfqr }}m/s、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.xfqr }}m/s；
+          		有效风时数{{ tableVal.byzb && tableVal.byzb.yxfss }}小时、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.yxfss }}小时；
+          		实际发电电量{{ tableVal.byzb && tableVal.byzb.fdl }}万kwh、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.fdl }}万kwh，
+          		同比增长率{{ tableVal.tbzb && (tableVal.tbzb.fdl).toFixed(2) }}%；
+          		各项损失电量累计{{ tableVal.byzb && (tableVal.byzb.llfdl - tableVal.byzb.fdl).toFixed(2) }}万kwh、
+          		同比{{ tableVal.tqzb && tableVal.tqzb.llfdl - tableVal.tqzb.fdl }}万kwh，
+          		同比增长率{{ tableVal.tbzb && (tableVal.byzb.llfdl - tableVal.tbzb.fdl).toFixed(2) }}%；
+          		理论发电量{{ tableVal.byzb && tableVal.byzb.llfdl }}万kwh，
+          		实际发电量与理论发电量相差{{ tableVal.tbzb && tableVal.tbzb.llfdl }}万kwh。 <br />
+            本月静风频率{{ tableVal.byzb && tableVal.byzb.jfpl }}%，
+			<!-- 月累计静风时长0.00小时， -->
+			月累计待机小时{{ tableVal.byzb && tableVal.byzb.tjxs }}小时，待机占比{{ tableVal.byzb && tableVal.tqzb.tjxs }}%。
         </div>
       </div>
       <div class="mg-b-16">
@@ -381,7 +369,7 @@ export default {
           month: this.month,
         },
       });
-      console.warn(data.data);
+      console.log(data.data);
       const res = data.data;
       this.tableVal = data.data;
       console.warn(this.tableVal);

src/views/Others/gz.vue

@@ -1,341 +0,0 @@
-<template>
-	<el-scrollbar :height="height" v-if="gzCgd == 1">
-		<div class="query mg-b-8">
-			<div class="query-items">
-				<div class="query-item">
-					<div class="lable">部件：</div>
-					<div class="search-input">
-						<el-select v-model="value1" clearable placeholder="请选择" popper-class="select" multiple>
-							<el-option v-for="item in BuJian" :key="item.value" :value="item.value" :label="item.label">
-							</el-option>
-						</el-select>
-					</div>
-				</div>
-				<div class="query-item">
-					<div class="lable">停机类型：</div>
-					<div class="search-input">
-						<el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
-							<el-option v-for="item in TingJiLeiXing" :key="item.value" :value="item.value"
-								:label="item.label">
-							</el-option>
-						</el-select>
-					</div>
-				</div>
-				<div class="query-item">
-					<div class="lable">时间：</div>
-					<div class="search-input">
-						<el-date-picker v-model="value3" type="datetimerange" range-separator="至"
-							start-placeholder="开始日期" end-placeholder="结束日期">
-						</el-date-picker>
-					</div>
-				</div>
-				<div class="query-actions">
-					<button class="btn" @click="query()">查询</button>
-					<button class="btn" @click="addEdit()">新增</button>
-				</div>
-			</div>
-		</div>
-		<el-row :type="'flex'" class="content">
-			<el-col :span="24">
-				<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh" v-loading="tableLoading"
-					element-loading-text="拼命加载中" element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
-			</el-col>
-		</el-row>
-		<el-dialog :title="isvisiableType==1?'新增':'编辑'" v-model="isvisiable" width="45%" top="15vh" custom-class="modal"
-			:close-on-click-modal="false" :before-close="onClickDialogClose">
-			<!-- 这里是新增或编辑 -->
-			<el-row type="flex">
-				<el-col :span="12">
-					字段1：
-					<el-input placeholder="请选择日期" v-model="myInput1" :value="myInput1">
-					</el-input>
-				</el-col>
-				<el-col :span="12">
-					字段2：
-					<el-input placeholder="请选择日期" v-model="myInput2" :value="myInput2">
-					</el-input>
-				</el-col>
-			</el-row>
-			<el-row type="flex">
-				<el-col :span="12">
-					字段3：
-					<el-input placeholder="请选择日期" v-model="myInput3" :value="myInput3">
-					</el-input>
-				</el-col>
-				<el-col :span="12">
-					字段4：
-					<el-input placeholder="请选择日期" v-model="myInput4" :value="myInput4">
-					</el-input>
-				</el-col>
-			</el-row>
-			<el-row type="flex" justify="end">
-				<div class="query-actions" style="margin-top: 15px;">
-					<button class="btn" @click="onClickDialogClose">取消</button>
-					<button class="btn" @click="dialogSave()">保存</button>
-				</div>
-			</el-row>
-		</el-dialog>
-	</el-scrollbar>
-	<el-scrollbar :height="height" v-else>
-		<Cgd :data='gzCgdData' @gzCgdClick='gzCgdClick'/>
-	</el-scrollbar>
-</template>
-
-<script>
-	import ComTable from "@/components/coms/table/table.vue";
-	import Cgd from "./gzCgd.vue";
-	export default {
-		components: {
-			ComTable,
-			Cgd
-		},
-		data() {
-			const that = this;
-			return {
-				pageIndex: 1,
-				            pageSize: 20,
-				gzCgd:1,//传感点组件隐藏或显示
-				gzCgdData:'',//传感点参数
-				BuJian: [{
-					label: '部件1',
-					value: '1'
-				}, {
-					label: '部件2',
-					value: '2'
-				}],
-				TingJiLeiXing: [{
-					label: '类型1',
-					value: '1'
-				}, {
-					label: '类型2',
-					value: '2'
-				}],
-				value1: '',
-				value2: '',
-				value3: [],
-				myInput1: "",
-				myInput2: "",
-				myInput3: "",
-				myInput4: "",
-				isvisiable: false,
-				isvisiableType: 1, //新增为1，编辑为2
-				tableData: {
-					column: [{
-							name: "序号",
-							field: "index",
-							is_light: false,
-						},
-						{
-							name: "字段1",
-							field: "myInput1",
-							is_light: false,
-						},
-						{
-							name: "字段2",
-							field: "myInput2",
-							is_light: false,
-						},
-						{
-							name: "字段3",
-							field: "myInput3",
-							is_light: false,
-						},
-						{
-							name: "字段4",
-							field: "myInput4",
-							is_light: false,
-						},
-						{
-							name: "操作",
-							is_light: false,
-							width: 100,
-							template: () => {
-								return (
-									"<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
-									"<el-button type='text' style='cursor: pointer;' value='delete'>删除</el-button>&nbsp" +
-									"<el-button type='text' style='cursor: pointer;' value='config'>传感点</el-button>&nbsp"
-								);
-							},
-							click(e, row) {
-								that.onClickOption(e, row);
-							},
-						},
-					],
-					data: [{
-							index: 1,
-							myInput1: "MG01-01",
-							myInput2: "0.1000",
-							myInput3: "0.1000",
-							myInput4: "0.1000",
-							value: '这里放隐藏值1',
-							is_light: false,
-						},
-						{
-							index: 2,
-							myInput1: "MG01-02",
-							myInput2: "2",
-							myInput3: "23",
-							myInput4: "24",
-							value: '这里放隐藏值2',
-							is_light: false,
-						},
-					],
-				}
-			};
-		},
-		props: {
-			height: {
-				type: String
-			},
-		},
-		methods: {
-			getTable() {
-				let that = this;
-				this.tableLoading = true;
-				that.API.requestData({
-					method: "GET",
-					baseURL: "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/wplist",
-					data: {
-						wpId: that.stationId,
-						startTs: that.startDate,
-						endTs: that.endDate,
-						pageNum: that.pageIndex,
-						pageSize: that.pageSize,
-					},
-					success(res) {
-						var dataTab = [];
-						if (res.data) {
-							res.data.list.forEach(item => {
-								dataTab.push({ //表格
-									recodedata: that.formatTime(item.recodedata),
-									region: item.region,
-									weather: item.weather,
-									maximumtem: item.maximumtem,
-									minimumtem: item.minimumtem,
-									sunrise: item.sunrise,
-									sunset: item.sunset,
-									weather1: item.weather1,
-									weather2: item.weather2,
-									temperature1: item.temperature1,
-									temperature2: item.temperature2,
-									realfeel1: item.realfeel1,
-									realfeel2: item.realfeel2,
-									precipitation1: item.precipitation1,
-									precipitation2: item.precipitation2,
-									winddirection1: item.winddirection1,
-									winddirection2: item.winddirection2,
-									speed1: item.speed1,
-									speed2: item.speed2
-								})
-							})
-							that.tableData.data = dataTab;
-							that.tableData.total = res.data.total;
-						} else {
-							that.tableData.data = [];
-							that.tableData.total = 0;
-						}
-						that.tableLoading = false;
-					},
-				});
-			},
-			onChangePage(params) {
-				this.pageIndex = params.pageIndex;
-				this.pageSize = params.pageSize;
-				this.getTable();
-			},
-			startAjax() {
-				// BuJian
-				// TingJiLeiXing
-				var that = this;
-				that.API.requestData({
-					method: "GET",
-					baseURL: "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/wplist",
-					success(res) {
-						that.ChangZhan = res.data;
-					},
-				});
-			},
-			query() {
-				var that = this;
-				console.log(that.value1)
-				console.log(that.value2)
-				console.log(that.value3)
-				if(that.value3){
-					that.value3[0].valueOf()//开始时间
-					that.value3[1].valueOf()//结束时间
-				}
-				
-				// that.API.requestData({
-				// 	method: "GET",
-				// 	baseURL: "http://10.155.32.4:9001/",
-				// 	subUrl: "benchmarking/wplist",
-				// 	success(res) {
-				// 		that.ChangZhan = res.data;
-				// 	},
-				// });
-			},
-			addEdit() {
-				this.isvisiableType = 1;
-				this.myInput1 = '';
-				this.myInput2 = '';
-				this.myInput3 = '';
-				this.myInput4 = '';
-				this.isvisiable = true;
-			},
-			onClickOption(e, row) { // 操作按钮
-				let that = this;
-				console.log(row.value) //通过这个value去执行相关操作
-				if ("delete" == e.target.getAttribute("value")) {
-					that
-						.$confirm("确认删除此条样本数据？", "提示", {
-							confirmButtonText: "删除",
-							cancelButtonText: "取消"
-						})
-						.then((_) => {
-							console.log('ok')
-							// that.requestDelete(row);
-						})
-						.catch((_) => {});
-				}
-				if ("edit" == e.target.getAttribute("value")) {
-					that.isvisiableType = 2;
-					that.$nextTick(()=>{
-						that.myInput1 = row.myInput1;
-						that.myInput2 = row.myInput2;
-						that.myInput3 = row.myInput3;
-						that.myInput4 = row.myInput4;
-					});
-					that.isvisiable = true;
-				}
-				if ("config" == e.target.getAttribute("value")) {//传感点
-					that.gzCgdData = row.value;
-					that.gzCgd = 2;
-				}
-			},
-			onClickDialogClose() { // 弹窗右上角关闭按钮
-				this.isvisiable = false;
-				this.isvisiableType = 1;
-			},
-			dialogSave() {
-				console.log(this.myInput1)
-				// myInput1: "",
-				// myInput2: "",
-				// myInput3: "",
-				// myInput4: "",
-			},
-			gzCgdClick(data){
-				this.gzCgd = data;
-			}
-		},
-		created() {
-			// this.startAjax();
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-	
-</style>

src/views/Others/gzCgd.vue

@@ -1,255 +0,0 @@
-<template>
-	<div>
-		<el-row type="flex">
-			<div class="query-actions">
-				<button class="btn" @click="addEdit">新增</button>
-				<button class="btn" @click="back">返回</button>
-			</div>
-		</el-row>
-		<el-row :type="'flex'" class="content">
-			<el-col :span="24">
-				<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh"
-					v-loading="tableLoading" element-loading-text="拼命加载中"
-					element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
-			</el-col>
-		</el-row>
-		<el-dialog :title="isvisiableType==1?'新增':'编辑'" v-model="isvisiable" width="45%" top="15vh" custom-class="modal"
-			:close-on-click-modal="false" :before-close="onClickDialogClose">
-			<!-- 这里是新增或编辑 -->
-			<el-row type="flex">
-				<el-col :span="12">
-					字段1：
-					<el-input placeholder="请选择日期" v-model="myInput1" :value="myInput1"></el-input>
-				</el-col>
-				<el-col :span="12">
-					字段2：
-					<el-input placeholder="请选择日期" v-model="myInput2" :value="myInput2">
-					</el-input>
-				</el-col>
-			</el-row>
-			<el-row type="flex">
-				<el-col :span="12">
-					字段3：
-					<el-input placeholder="请选择日期" v-model="myInput3" :value="myInput3">
-					</el-input>
-				</el-col>
-				<el-col :span="12">
-					字段4：
-					<el-input placeholder="请选择日期" v-model="myInput4" :value="myInput4">
-					</el-input>
-				</el-col>
-			</el-row>
-			<el-row type="flex" justify="end">
-				<div class="query-actions" style="margin-top: 15px;">
-					<button class="btn" @click="onClickDialogClose">取消</button>
-					<button class="btn" @click="dialogSave()">保存</button>
-				</div>
-			</el-row>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-	import ComTable from "@/components/coms/table/table.vue";
-	export default {
-		components: {
-			ComTable
-		},
-		data() {
-			const that = this;
-			return {
-				pageIndex: 1,
-				pageSize: 20,
-				myInput1: "",
-				myInput2: "",
-				myInput3: "",
-				myInput4: "",
-				isvisiable: false,
-				isvisiableType: 1, //新增为1，编辑为2
-				tableData: {
-					column: [{
-							name: "序号",
-							field: "index",
-							is_light: false,
-						},
-						{
-							name: "字段1",
-							field: "myInput1",
-							is_light: false,
-						},
-						{
-							name: "字段2",
-							field: "myInput2",
-							is_light: false,
-						},
-						{
-							name: "字段3",
-							field: "myInput3",
-							is_light: false,
-						},
-						{
-							name: "字段4",
-							field: "myInput4",
-							is_light: false,
-						},
-						{
-							name: "操作",
-							is_light: false,
-							width: 100,
-							template: () => {
-								return (
-									"<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
-									"<el-button type='text' style='cursor: pointer;' value='delete'>删除</el-button>&nbsp" +
-									"<el-button type='text' style='cursor: pointer;' value='config'>原始数据</el-button>&nbsp"
-								);
-							},
-							click(e, row) {
-								that.onClickOption(e, row);
-							},
-						},
-					],
-					data: [{
-							index: 1,
-							myInput1: "MG01-01",
-							myInput2: "0.1000",
-							myInput3: "0.1000",
-							myInput4: "0.1000",
-							value: '这里放隐藏值1',
-							is_light: false,
-						},
-						{
-							index: 2,
-							myInput1: "MG01-02",
-							myInput2: "2",
-							myInput3: "23",
-							myInput4: "24",
-							value: '这里放隐藏值2',
-							is_light: false,
-						},
-					],
-				}
-			};
-		},
-		props: {
-			data: {
-				type: String
-			},
-		},
-		methods: {
-			getTable() {
-				let that = this;
-				this.tableLoading = true;
-				that.API.requestData({
-					method: "GET",
-					baseURL: "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/wplist",
-					data: {
-						wpId: that.stationId,
-						startTs: that.startDate,
-						endTs: that.endDate,
-						pageNum: that.pageIndex,
-						pageSize: that.pageSize,
-					},
-					success(res) {
-						var dataTab = [];
-						if (res.data) {
-							res.data.list.forEach(item => {
-								dataTab.push({ //表格
-									recodedata: that.formatTime(item.recodedata),
-									region: item.region,
-									weather: item.weather,
-									maximumtem: item.maximumtem,
-									minimumtem: item.minimumtem,
-									sunrise: item.sunrise,
-									sunset: item.sunset,
-									weather1: item.weather1,
-									weather2: item.weather2,
-									temperature1: item.temperature1,
-									temperature2: item.temperature2,
-									realfeel1: item.realfeel1,
-									realfeel2: item.realfeel2,
-									precipitation1: item.precipitation1,
-									precipitation2: item.precipitation2,
-									winddirection1: item.winddirection1,
-									winddirection2: item.winddirection2,
-									speed1: item.speed1,
-									speed2: item.speed2
-								})
-							})
-							that.tableData.data = dataTab;
-							that.tableData.total = res.data.total;
-						} else {
-							that.tableData.data = [];
-							that.tableData.total = 0;
-						}
-						that.tableLoading = false;
-					},
-				});
-			},
-			onChangePage(params) {
-				this.pageIndex = params.pageIndex;
-				this.pageSize = params.pageSize;
-				this.getTable();
-			},
-			addEdit() {
-				this.isvisiableType = 1;
-				this.myInput1 = '';
-				this.myInput2 = '';
-				this.myInput3 = '';
-				this.myInput4 = '';
-				this.isvisiable = true;
-			},
-			onClickOption(e, row) { // 操作按钮
-				let that = this;
-				console.log(row.value) //通过这个value去执行相关操作
-				if ("delete" == e.target.getAttribute("value")) {
-					that
-						.$confirm("确认删除此条样本数据？", "提示", {
-							confirmButtonText: "删除",
-							cancelButtonText: "取消"
-						})
-						.then((_) => {
-							console.log('ok')
-							// that.requestDelete(row);
-						})
-						.catch((_) => {});
-				}
-				if ("edit" == e.target.getAttribute("value")) {
-					that.isvisiableType = 2;
-					that.$nextTick(() => {
-						that.myInput1 = row.myInput1;
-						that.myInput2 = row.myInput2;
-						that.myInput3 = row.myInput3;
-						that.myInput4 = row.myInput4;
-					});
-					that.isvisiable = true;
-				}
-				if ("config" == e.target.getAttribute("value")) { //传感点
-					that.gzCgd = 2;
-				}
-			},
-			onClickDialogClose() { // 弹窗右上角关闭按钮
-				this.isvisiable = false;
-				this.isvisiableType = 1;
-			},
-			dialogSave() {
-				console.log(this.myInput1)
-				// myInput1: "",
-				// myInput2: "",
-				// myInput3: "",
-				// myInput4: "",
-			},
-			back() {
-				this.$emit('gzCgdClick', 1);
-			}
-		},
-		created() {
-			// console.log(this.data)//上个页面的参数
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/otherComponent.vue

@@ -1,109 +0,0 @@
-<template>
-	<el-row>
-		<el-col :span="3">
-			<el-tree :data="elTreeData.data" :props="elTreeData.defaultProps" @node-click="handleNodeClick" default-expand-all highlight-current :expand-on-click-node="false"></el-tree>
-		</el-col>
-		<el-col :span="21">
-			<Gz v-if="currTab == 'ybk1'" height="92vh" />
-			<Xn v-if="currTab == 'ybk2'" height="92vh" />
-			<Yj v-if="currTab == 'ybk3'" height="92vh" />
-			<Zn v-if="currTab == 'ybk4'" height="92vh" />
-		</el-col>
-	</el-row>
-</template>
-
-<script>
-	import $ from "jquery";
-	import Gz from "./gz.vue";
-	import Xn from "./xn.vue";
-	import Yj from "./yj.vue";
-	import Zn from "./zn.vue";
-	export default {
-		components: {
-			Gz,
-			Xn,
-			Yj,
-			Zn
-		},
-		data() {
-			return {
-				currTab: 'ybk1',
-				elTreeData: {
-					data: [{
-							label: "样本库",
-							children: [{
-								label: "故障样本库",
-								id: 'ybk1'
-							}, {
-								label: "性能下降样本库",
-								id: 'ybk2'
-							}, {
-								label: "预警分析样本库",
-								id: 'ybk3'
-							}, {
-								label: "智能营销样本库",
-								id: 'ybk4'
-							}],
-						},
-						{
-							label: "基础库",
-							children: [{
-								label: "风机",
-								id: 'jck1'
-							}, {
-								label: "升压站",
-								id: 'jck2'
-							}, {
-								label: "场站",
-								id: 'jck3'
-							}, {
-								label: "逆变器",
-								id: 'jck4'
-							}, {
-								label: "测点",
-								id: 'jck5'
-							}, {
-								label: "风机类型",
-								id: 'jck6'
-							}],
-						},
-						{
-							label: "知识库",
-						},
-					],
-					defaultProps: {
-						children: "children",
-						label: "label",
-					},
-				},
-			};
-		},
-		methods: {
-			handleNodeClick(a) {
-				if (a.id) {
-					this.currTab = a.id;
-				}
-			},
-		},
-		created() {
-
-		},
-		mounted() {
-			// jq实现的tree默认第一个节点选中
-			$('.el-tree .el-tree-node__children').eq(0).find('.el-tree-node').eq(0).addClass('is-current');
-			$('.el-tree .el-tree-node__children .el-tree-node').click(function(){
-				$(this).siblings().removeClass('is-current')
-			})
-		},
-	};
-</script>
-
-<style lang="less">
-	.el-tree{
-		.el-tree-node__children {
-			.el-tree-node__content{cursor: pointer;}
-			.el-tree-node.is-current{background-color: #0F3C25;}
-		}
-		.el-tree-node__content{cursor: auto;}
-	}
-</style>

src/views/Others/xn.vue

@@ -1,37 +0,0 @@
-<template>
-	<el-scrollbar :height="height">
-	 风机2
-	</el-scrollbar>
-</template>
-
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-		props:{
-			currTab:{
-			  type: Number
-			},
-			height: {
-			  type: String
-			},
-		},
-		methods:{
-			
-		},
-		created() {
-
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/yj.vue

@@ -1,37 +0,0 @@
-<template>
-	<el-scrollbar :height="height">
-	 风机3
-	</el-scrollbar>
-</template>
-
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-		props:{
-			currTab:{
-			  type: Number
-			},
-			height: {
-			  type: String
-			},
-		},
-		methods:{
-			
-		},
-		created() {
-
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/zn.vue

@@ -1,37 +0,0 @@
-<template>
-	<el-scrollbar :height="height">
-	 风机4
-	</el-scrollbar>
-</template>
-
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-		props:{
-			currTab:{
-			  type: Number
-			},
-			height: {
-			  type: String
-			},
-		},
-		methods:{
-			
-		},
-		created() {
-
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/WindSite/WindSite.vue

@@ -53,58 +53,72 @@ export default {
         {
           icon: "svg-s场站监视",
           path: "/monitor/windsite/home",
+          text: "场站监视",
         },
         {
           icon: "svg-s指标列表",
           path: "/monitor/windsite/draughtfanlist",
+          text: "指标列表",
         },
         // {
         //   icon: "svg-agc",
         //   path: "/monitor/windsite/matrix",
+        //   text: "指标列表",
         // },
         // {
         //   icon: "svg-agc",
         //   path: "/monitor/windsite/lightmatrix",
+        //   text: "指标列表",
         // },
         // {
         //   icon: "svg-intranet-involvement",
         //   path: "/monitor/windsite/box",
+        //   text: "指标列表",
         // },
         // {
         //   icon: "svg-matrix",
         //   path: "/monitor/windsite/info",
+        //   text: "指标列表",
         // },
         {
           icon: "svg-s测风塔",
           path: "/monitor/windsite/tower",
+          text: "测风塔",
         },
         // {
         //   icon: "svg-easy-compass",
         //   path: "/monitor/windsite/Inverter-Info",
+        //   text: "测风塔",
         // },
         // {
         //   icon: "svg-easy-compass",
         //   path: "/monitor/windsite/map",
+        //   text: "测风塔",
         // },
         // {
         //   icon: "svg-easy-compass",
         //   path: "/monitor/windsite/map1",
+        //   text: "测风塔",
         // },
         {
           icon: "svg-matrix",
           path: "/monitor/windsite/matrix",
+          text: "矩阵",
         },
         {
           icon: "svg-s总貌",
           path: "/monitor/windsite/generalappearance",
+          text: "总貌图",
         },
         {
           icon: "svg-s升压站",
           path: "/monitor/windsite/boosterstation",
+          text: "升压站",
         },
         {
           icon: "svg-s地图",
           path: "/monitor/windsite/map",
+          text: "地图",
         },
       ],
     };
@@ -113,6 +127,7 @@ export default {
   methods: {
     clickMenu: function (index) {
       this.activeIndex = index;
+      this.$store.dispatch("changeModuleName", this.menuDatas[index].text);
     },
   },
 

src/views/WindSite/components/boosterstation/mhs.vue

@@ -4610,7 +4610,7 @@
                   width="79.533"
                   height="23.402"
                 ></rect>
-                <g>
+                <g id="footer">
                   <g>
                     <text
                       transform="matrix(1 0 0 1 18.8752 1030.8413)"
@@ -9082,6 +9082,7 @@
 <script>
 import previewPicture from "../previewPicture.vue";
 import { BoosterStation } from "./BoosterStation";
+import $ from "jquery";
 export default {
   components: {
     previewPicture,
@@ -9096,10 +9097,24 @@ export default {
   },
   created() {
     this.boosterStation = new BoosterStation();
-
     this.refreshTPData();
     this.interval = setInterval(this.refreshTPData, 1000);
   },
+  mounted() {
+  	this.$nextTick(()=>{
+		if(this.$store.state.themeName === "light"){
+			for(let i=0;i<$('#other text').length;i++){
+				let that = $('#other text').eq(i);
+				let fill = that.attr('fill');
+				let txt = parseInt(that.text());
+				let zn = /.*[\u4e00-\u9fa5]+.*$/.test(that.text());//判断是否包含中文
+				if(fill === '#FFFFFF' && !isNaN(txt) && !zn){
+					that.attr('fill','#000');
+				}
+			}
+		}
+	})
+  },
   methods: {
     closed() {
       clearInterval(this.interval);

src/views/WindSite/components/boosterstation/sbq.vue

@@ -1312,16 +1312,14 @@
 								<rect x="389.108" y="450.067" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.486"/>
 								<rect x="389.108" y="470.563" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.489"/>
 								<g>
-									<text transform="matrix(1 0 0 1 391.9287 461.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
+									<text transform="matrix(1 0 0 1 407.9287 461.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> la(A): </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 392.9043 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
+									<text transform="matrix(1 0 0 1 392.9043 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> (MVar): </text>
 								</g>
 								<rect x="389.108" y="490.298" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.485"/>
 								<g>
-									<text transform="matrix(1 0 0 1 407.8306 504.248)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> la </text>
-									<text transform="matrix(1 0 0 1 417.1577 504.248)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (A) </text>
-									<text transform="matrix(1 0 0 1 430.3569 504.248)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 392.8306 504.248)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
 								</g>
 								<rect x="389.108" y="509.783" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.487"/>
 								<g>
@@ -3942,15 +3940,15 @@
 								<g>
 									<text transform="matrix(1 0 0 1 443.1121 461.8801)" fill="#217E3A"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
-										{{ ajaxData.sbqpkwmx1 }}
+										{{ ajaxData.sbqlaamx1 }}
 									</text>
 									<text transform="matrix(1 0 0 1 443.1121 482.5481)" fill="#217E3A"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
-										{{ ajaxData.sbqqkvarmx1 }}
+										{{ ajaxData.sbqpkwmx1 }}
 									</text>
 									<text transform="matrix(1 0 0 1 443.1145 503.9133)" fill="#217E3A"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
-										{{ ajaxData.sbqlaamx1 }}
+										{{ ajaxData.sbqqkvarmx1 }}
 									</text>
 									<text transform="matrix(1 0 0 1 443.1145 523.4016)" fill="#217E3A"
 										font-family="'MicrosoftYaHei'" font-size="9.463">

src/views/WindSite/components/generalappearance/pl2.vue

@@ -1881,6 +1881,7 @@
 		methods: {
 			// 渲染每个机箱的表格参数
 			renderData(data = {}) {
+				console.log(data)
 				// 取出开关的 DOM
 				const switchDom = $("#data").find("rect");
 				// 遍历数据，首先取出开关单独写逻辑渲染颜色，除了开关以外的就是每个机箱的数据

src/views/WindSite/pages/GeneralAppearance.vue

@@ -54,8 +54,8 @@
 			<XS class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'XS_FDC'" />
 			<XH class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'XH_GDC'" />
 			<DWK class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'DWK_GDC'" />
-			<PL1 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL01_GC'" />
-			<PL2 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL02_GC'" />
+			<PL1 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL_GDC'" />
+			<PL2 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL2_GDC'" />
 			<MCH class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'MCH_GDC'" />
 			<HZJ class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'HZJ_GDC'" />
 		</div>
@@ -154,13 +154,16 @@
 									code: ele.id,
 								});
 							} else {
-								if (ele.id == "PL_GDC") {
-									ele.id = 'PL01_GC';
-								}
 								btnGroup[1].btns.push({
 									text: ele.name,
 									code: ele.id,
 								});
+								// if(ele.id == 'PL_GDC'){
+								// 	btnGroup[1].btns.push({
+								// 	  text: '平罗二期光伏电站',
+								// 	  code: 'PL2_GDC',
+								// 	});
+								// }
 							}
 						});
 

src/views/WindSite/pages/Home/Station.vue

@@ -463,7 +463,9 @@ export default {
             height: 8,
             attrs: {
               body: {
-                fill: partten.getColor("green"),
+                fill:this.$store.state.themeName === "dark"
+                    ? partten.getColor("green")
+                    : partten.getColor("blue"),
                 stroke: "transparent",
                 class: "node-hover",
                 "data-item": encodeURIComponent(JSON.stringify(data)),
@@ -574,6 +576,9 @@ export default {
       });
       this.initStation();
     },
+	"$store.state.themeName"() {
+	  this.initStation();
+	},
   },
 };
 </script>

src/views/WindSite/pages/Home/wind-site-weather.vue

@@ -2,8 +2,12 @@
 <template>
   <div class="wind-site-weather">
     <!-- <div class="title">风场 {{ nowTime }} 实况</div> -->
-        <div class="title" v-if="paramsId.includes('FDC')">风场 {{ nowTime }} 实况</div>
-        <div class="title" v-else-if="paramsId.includes('GDC')">光电场 {{ nowTime }} 实况</div>
+    <div class="title" v-if="paramsId.includes('FDC')">
+      风场 {{ nowTime }} 实况
+    </div>
+    <div class="title" v-else-if="paramsId.includes('GDC')">
+      光电场 {{ nowTime }} 实况
+    </div>
     <div class="weather">
       <div class="weather-info">
         <span class="svg-icon">
@@ -62,20 +66,20 @@
 </template>
 
 <script>
-import Home from "./Home.vue"
+import Home from "./Home.vue";
 import Col from "@/components/coms/grid/col.vue";
 import Row from "@/components/coms/grid/row.vue";
 import SvgIcon from "@/components/coms/icon/svg-icon.vue";
 
 export default {
-  components: { Home,Row, Col, SvgIcon },
-  props:{
+  components: { Home, Row, Col, SvgIcon },
+  props: {
     time: String,
-    data:{
-      type:Object,
-      default:() => { }
+    data: {
+      type: Object,
+      default: () => {},
     },
-    paramsId:'',
+    paramsId: "",
   },
   data() {
     return {
@@ -93,25 +97,22 @@ export default {
       sunset: "18:50", // 日落
     };
   },
-  created(){
+  created() {
     // let that = this;
     // that.paramsId = that.$route.params.wpId
-    // console.log("paramsId:",that.$route.params.wpId)
   },
-  mounted(){
-    this.sourceMap=this.data;
-   
+  mounted() {
+    this.sourceMap = this.data;
   },
 
-  watch:{
-    data(res){
-      this.sourceMap=res;
-      //  console.log('map:',this.sourceMap)
+  watch: {
+    data(res) {
+      this.sourceMap = res;
     },
-    time(value){
-      this.nowTime = value
-    }
-  }
+    time(value) {
+      this.nowTime = value;
+    },
+  },
 };
 </script>
 

src/views/WindSite/pages/Info/Info.vue

@@ -20,7 +20,7 @@
           <!-- 使用 v-show 首次全部加载 之后隐藏 点击后显示 -->
           <base-info v-show="InfoBtns.activeIndex == 0" :data="sourceMap" />
           <!-- <base-info v-if="InfoBtns.activeIndex == 2" /> -->
-          <div style="text-align:center;">
+          <div :style="$store.state.themeName === 'dark' ? 'text-align:center;' : 'text-align:center;background:#fff;'">
             <StandAloneImg class="sai" v-show="InfoBtns.activeIndex != 0" :activeIndex="InfoBtns.activeIndex" @selectSvg="selectSvg"></StandAloneImg>
           </div>
           <generator class="saig" v-show="InfoBtns.activeIndex != 0" :index="InfoBtns.activeIndex" :data="sourceMap"></generator>
@@ -144,28 +144,38 @@ export default {
         },
         success(res) {
           let WindSites = [];
-
-          res.data.forEach((ele, index) => {
-            WindSites.push({
-              id: String(index),
-              text: ele.wpName,
-              children: [],
-            });
-          });
-
-          res.data.forEach((pEle, pIndex) => {
-            pEle.fjls[0].forEach((cEle) => {
-              WindSites[pIndex].children.push({
-                id: cEle.wtId,
-                wpId: cEle.wpId,
-                text: cEle.wtnum,
-                color: that.getColor(cEle.fjzt),
-              });
-            });
-          });
-
-          that.WindSites = WindSites;
-
+		if(that.WindSites.length){
+			res.data.forEach((pEle, pIndex) => {
+				that.WindSites[pIndex].children = [];
+			  pEle.fjls[0].forEach((cEle) => {
+			    that.WindSites[pIndex].children.push({
+			      id: cEle.wtId,
+			      wpId: cEle.wpId,
+			      text: cEle.wtnum,
+			      color: that.getColor(cEle.fjzt),
+			    });
+			  });
+			});
+		}else{
+			res.data.forEach((ele, index) => {
+			  WindSites.push({
+			    id: String(index),
+			    text: ele.wpName,
+			    children: [],
+			  });
+			});
+			res.data.forEach((pEle, pIndex) => {
+			  pEle.fjls[0].forEach((cEle) => {
+			    WindSites[pIndex].children.push({
+			      id: cEle.wtId,
+			      wpId: cEle.wpId,
+			      text: cEle.wtnum,
+			      color: that.getColor(cEle.fjzt),
+			    });
+			  });
+			});
+			that.WindSites = WindSites;
+		}
           if (res.data.length) {
             that.wtId = that.wtId || res.data[0].fjls[0][0].wtId;
             that.getWtInfo();

src/views/WindSite/pages/Info/StandAloneImg.vue

@@ -385,7 +385,7 @@
                 :class="{ 'stand-alone-text': text && hover == 3 }"
                 x="630"
                 y="30"
-                fill="#05BB4C"
+                fill="#36348e"
                 font-size="24"
             >
                 变桨
@@ -431,7 +431,7 @@
                 :class="{ 'stand-alone-text': text && hover == 6 }"
                 x="1060"
                 y="80"
-                fill="#05BB4C"
+                fill="#36348e"
                 font-size="24"
             >
                 机舱
@@ -478,7 +478,7 @@
                 :class="{ 'stand-alone-text': text && hover == 2 }"
                 x="1110"
                 y="250"
-                fill="#05BB4C"
+                fill="#36348e"
                 font-size="24"
             >
                 齿轮箱
@@ -525,7 +525,7 @@
                 :class="{ 'stand-alone-text': text && hover == 1 }"
                 x="1300"
                 y="920"
-                fill="#05BB4C"
+                fill="#36348e"
                 font-size="24"
             >
                 发电机
@@ -571,7 +571,7 @@
                 :class="{ 'stand-alone-text': text && hover == 4 }"
                 x="960"
                 y="1050"
-                fill="#05BB4C"
+                fill="#36348e"
                 font-size="24"
             >
                 偏航
@@ -618,7 +618,7 @@
                 :class="{ 'stand-alone-text': text && hover == 5 }"
                 x="1160"
                 y="1030"
-                fill="#05BB4C"
+                fill="#36348e"
                 font-size="24"
             >
                 液压

src/views/WindSite/pages/Map.vue

@@ -13,7 +13,14 @@
         <div class="sub-title-item">
           <img src="../../../assets/map/fan/black.png" />
           <span class="sub-title gray">接入台数</span>
-          <span class="sub-count font-num gray">{{ wpnumMap.djts + wpnumMap.yxts + wpnumMap.xdts +wpnumMap.gzts +wpnumMap.whts + wpnumMap.lxts}}</span>
+          <span class="sub-count font-num gray">{{
+            wpnumMap.djts +
+            wpnumMap.yxts +
+            wpnumMap.xdts +
+            wpnumMap.gzts +
+            wpnumMap.whts +
+            wpnumMap.lxts
+          }}</span>
         </div>
         <div class="sub-title-item">
           <img src="../../../assets/map/fan/green.png" />
@@ -49,13 +56,16 @@
     </div>
     <div class="panel-body">
       <MHSFDC wpId="MHS_FDC" v-if="wpId.indexOf('MHS_FDC') !== -1" />
-	  <NSSFDC wpId="NSS_FDC" v-if="wpId.indexOf('NSS_FDC') !== -1" />
-	  <QSFDC wpId="QS_FDC" v-if="wpId.indexOf('QS_FDC') !== -1" />
-	  <SBQFDC wpId="SBQ_FDC" v-if="wpId.indexOf('SBQ_FDC') !== -1" />
-	  <XSFDC wpId="XS_FDC" v-if="wpId.indexOf('XS_FDC') !== -1" />
-	  
-	  
-      <PLGDC wpId="PL_GDC" v-if="wpId.indexOf('GDC') !== -1" />
+      <NSSFDC wpId="NSS_FDC" v-if="wpId.indexOf('NSS_FDC') !== -1" />
+      <QSFDC wpId="QS_FDC" v-if="wpId.indexOf('QS_FDC') !== -1" />
+      <SBQFDC wpId="SBQ_FDC" v-if="wpId.indexOf('SBQ_FDC') !== -1" />
+      <XSFDC wpId="XS_FDC" v-if="wpId.indexOf('XS_FDC') !== -1" />
+
+      <PLGDC wpId="PL_GDC" v-if="wpId.indexOf('PL_GDC') !== -1" />
+      <DWKGDC wpId="DWK_GDC" v-if="wpId.indexOf('DWK_GDC') !== -1" />
+      <XHGDC wpId="XH_GDC" v-if="wpId.indexOf('XH_GDC') !== -1" />
+      <MCHGDC wpId="MCH_GDC" v-if="wpId.indexOf('MCH_GDC') !== -1" />
+      <HZJGDC wpId="HZJ_GDC" v-if="wpId.indexOf('HZJ_GDC') !== -1" />
       <div class="map-popup-panel" v-show="showPopup">
         <!-- <div class="map-popup-panel-header">
           <div class="map-popup-panel-title green">
@@ -171,6 +181,10 @@ import QSFDC from "@com/arcgis/QS_FDC.vue";
 import SBQFDC from "@com/arcgis/SBQ_FDC.vue";
 import XSFDC from "@com/arcgis/XS_FDC.vue";
 import PLGDC from "@com/arcgis/PL_GDC.vue";
+import DWKGDC from "@com/arcgis/DWK_GDC.vue";
+import XHGDC from "@com/arcgis/XH_GDC.vue";
+import MCHGDC from "@com/arcgis/MCH_GDC.vue";
+import HZJGDC from "@com/arcgis/HZJ_GDC.vue";
 import dataService from "@/helper/data.js";
 
 export default {
@@ -180,11 +194,15 @@ export default {
   components: {
     BtnGroup2,
     MHSFDC,
-	NSSFDC,
-	QSFDC,
-	SBQFDC,
-	XSFDC,
-    PLGDC
+    NSSFDC,
+    QSFDC,
+    SBQFDC,
+    XSFDC,
+    PLGDC,
+    DWKGDC,
+    XHGDC,
+    MCHGDC,
+    HZJGDC,
   },
   // 数据
   data() {
@@ -193,7 +211,7 @@ export default {
       wpId: undefined,
       wpnumMap: {}, //风机监视数量
       wpInfoMap: {}, //风机详情
-      fjmap: [],   // 风机名
+      fjmap: [], // 风机名
       selectIndex: 0,
       rowIndex: 0,
       btnGroups: [
@@ -221,13 +239,13 @@ export default {
       mapToolIndex: 0,
       fans: [],
       colors: {
-        "0": ["#05bb4c", "#4ad476", "#9fedb2"],
-        "1": ["#4b55ae", "#959dc7", "#d3d6e0"],
-        "2": ["#BA3237", "#d4807d", "#eddad8"],
-        "3": ["#606769", "#757575", "#AFAFAF"],
-        "4": ["#e17e23", "#fabf78", "#ffebcc"],
-        "5": ["#c531c7", "#e080dc", "#fadef7"],
-        "6": ["#c531c7", "#e080dc", "#fadef7"],
+        0: ["#05bb4c", "#4ad476", "#9fedb2"],
+        1: ["#4b55ae", "#959dc7", "#d3d6e0"],
+        2: ["#BA3237", "#d4807d", "#eddad8"],
+        3: ["#606769", "#757575", "#AFAFAF"],
+        4: ["#e17e23", "#fabf78", "#ffebcc"],
+        5: ["#c531c7", "#e080dc", "#fadef7"],
+        6: ["#c531c7", "#e080dc", "#fadef7"],
       },
       syzImg: require("@assets/png/booster-station.png"),
     };
@@ -311,73 +329,12 @@ export default {
         });
       });
     },
-    when: function () {
-		console.log(this.wpId.toLowerCase())
-      let jsonObj = dataService.get("arcgis-mhs");
-      this.fans = jsonObj;
-      jsonObj.forEach((item) => {
-        let obj = this.fjmap.find((t) => {
-          let wtid = t.wtId.replace("01_","");
-          if (wtid == item.attributes.code) return t
-        });
-        if (obj) {
-          item.attributes.state = String(obj.fjzt);
-        } else {
-          item.attributes.state = "4";
-        }
-        switch (item.attributes.state) {
-          case "0":  //待机
-            item.attributes.rotate = false; // 转
-            item.attributes.dur = 8; // 转一圈时间
-            break;
-          case "1":  //运行
-            item.attributes.rotate = true; // 转
-            item.attributes.dur = 2; // 转一圈时间
-            break;
-          case "2":  //故障
-            item.attributes.rotate = false; // 不转
-            item.attributes.dur = 8;
-            break;
-          case "3":  //中断
-            item.attributes.rotate = false; // 不转
-            item.attributes.dur = 8;
-            break;  
-          case "4":  //维护
-            item.attributes.rotate = false; // 不转
-            item.attributes.dur = 8;
-            break;  
-          case "5":  //限电
-            item.attributes.rotate = true; // 转
-            item.attributes.dur = 6;
-            break; 
-          case "6":  //停机
-            item.attributes.rotate = false; // 不转
-            item.attributes.dur = 8;
-            break;      
-          default:
-            item.attributes.rotate = false;
-            item.attributes.dur = 8;
-            break;
-        }
-        this.$refs.arcgis.addHtmlPoint(
-          [item.geometry.x, item.geometry.y],
-          item.attributes.code,
-          33,
-          50,
-          false
-        );
-      });
-      let lineJsonObj = dataService.get("arcgis-mhs-line");
-      this.$refs.arcgis.addFanByJson(jsonObj, lineJsonObj);
-    },
     clickMap: function (info) {
-      console.log(info);
       //   this.showPopup = true;
     },
     clickFan: function (code) {
       let wtId = code.replace("G", "G01_");
       this.$router.push(`/monitor/windsite/info/${this.wpId}/${wtId}`);
-      //   console.log(wtId);
       //   this.showPopup = true;
     },
     popupBack: function () {

src/views/WindSite/pages/Tower.vue

@@ -21,6 +21,7 @@
       :value="cftmap.KQMD || 0"
       height="9.722vh"
       width="9.722vh"
+      :style="$store.state.themeName === 'dark' ? '' : 'left:100px'"
     />
     <dash-pie-chart
       class="pie-right"
@@ -29,6 +30,7 @@
       height="9.722vh"
       width="9.722vh"
       max="500"
+      :style="$store.state.themeName === 'dark' ? '' : 'left:230px'"
     />
     <Panel class="panel-top" title="日资源玫瑰图" :bgBlur="true">
       <div class="direction-chart">
@@ -415,6 +417,7 @@ export default {
   .pie-right {
     position: fixed;
     top: 11vh;
+    transition: left 0.2s;
   }
 
   .pie-left {

src/views/WindSite/pages/Tower/WindTower.vue

@@ -1,5 +1,11 @@
 <template>
-  <svg class="wind-tower" version="1.1" viewBox="0 0 695 625" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <svg
+    class="wind-tower"
+    version="1.1"
+    viewBox="0 0 695 625"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+  >
     <defs>
       <g id="wind-tower">
         <!-- 塔横岗 -->
@@ -30,13 +36,41 @@
           y="0"
         />
         <!-- 边框左 -->
-        <rect fill="none" height="25" stroke="#05bb4caa" stroke-width="1" width="165" x="103" y="0" />
+        <rect
+          fill="none"
+          height="25"
+          :stroke="$store.state.themeName === 'dark' ? '#05bb4caa' : '#36348e'"
+          stroke-width="1"
+          width="165"
+          x="103"
+          y="0"
+        />
         <rect fill="#ffffff33" height="25" width="82.5" x="103" y="0" />
-        <rect fill="#05bb4c66" height="25" width="82.5" x="185.5" y="0" />
+        <rect
+          :fill="$store.state.themeName === 'dark' ? '#05bb4c66' : '#36348e'"
+          height="25"
+          width="82.5"
+          x="185.5"
+          y="0"
+        />
         <!-- 边框右 -->
-        <rect fill="none" height="25" stroke="#05bb4caa" stroke-width="1" width="165" x="427" y="0" />
+        <rect
+          fill="none"
+          height="25"
+          :stroke="$store.state.themeName === 'dark' ? '#05bb4caa' : '#36348e'"
+          stroke-width="1"
+          width="165"
+          x="427"
+          y="0"
+        />
         <rect fill="#ffffff33" height="25" width="82.5" x="509.5" y="0" />
-        <rect fill="#05bb4c66" height="25" width="82.5" x="427" y="0" />
+        <rect
+          :fill="$store.state.themeName === 'dark' ? '#05bb4c66' : '#36348e'"
+          height="25"
+          width="82.5"
+          x="427"
+          y="0"
+        />
       </g>
     </defs>
     <!-- 塔柱子 -->
@@ -57,52 +91,192 @@
     />
     <g>
       <use xlink:href="#wind-tower" y="30" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="47">{{ cftMap.FCCFTFS80 || 0 }}m/s</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="47">80米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="47">{{ cftMap.FCCFTFX80 || 0 }}度</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="47">80米风向</text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="123"
+        y="47"
+      >
+        {{ cftMap.FCCFTFS80 || 0 }}m/s
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="196" y="47">
+        80米风速
+      </text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="529"
+        y="47"
+      >
+        {{ cftMap.FCCFTFX80 || 0 }}度
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="438" y="47">
+        80米风向
+      </text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="110" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="127">{{ cftMap.FCCFTFS70 || 0 }}m/s</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="127">70米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="127">{{ cftMap.FCCFTFX70 || 0 }}度</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="127">70米风向</text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="123"
+        y="127"
+      >
+        {{ cftMap.FCCFTFS70 || 0 }}m/s
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="196" y="127">
+        70米风速
+      </text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="529"
+        y="127"
+      >
+        {{ cftMap.FCCFTFX70 || 0 }}度
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="438" y="127">
+        70米风向
+      </text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="190" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="207">{{ cftMap.FCCFTFS60 || 0 }}m/s</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="207">60米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="207">{{ cftMap.FCCFTFX60 || 0 }}度</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="207">60米向</text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="123"
+        y="207"
+      >
+        {{ cftMap.FCCFTFS60 || 0 }}m/s
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="196" y="207">
+        60米风速
+      </text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="529"
+        y="207"
+      >
+        {{ cftMap.FCCFTFX60 || 0 }}度
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="438" y="207">
+        60米向
+      </text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="270" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="287">{{ cftMap.FCCFTFS50 || 0 }}m/s</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="287">50米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="287">{{ cftMap.FCCFTFX50 || 0 }}度</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="287">50米风向</text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="123"
+        y="287"
+      >
+        {{ cftMap.FCCFTFS50 || 0 }}m/s
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="196" y="287">
+        50米风速
+      </text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="529"
+        y="287"
+      >
+        {{ cftMap.FCCFTFX50 || 0 }}度
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="438" y="287">
+        50米风向
+      </text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="350" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="367">{{ cftMap.FCCFTFS40 || 0 }}m/s</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="367">40米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="367">{{ cftMap.FCCFTFX40 || 0 }}度</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="367">40米风向</text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="123"
+        y="367"
+      >
+        {{ cftMap.FCCFTFS40 || 0 }}m/s
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="196" y="367">
+        40米风速
+      </text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="529"
+        y="367"
+      >
+        {{ cftMap.FCCFTFX40 || 0 }}度
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="438" y="367">
+        40米风向
+      </text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="430" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="447">{{ cftMap.FCCFTFS30 || 0 }}m/s</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="447">30米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="447">{{ cftMap.FCCFTFX30 || 0 }}度</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="447">30米风向</text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="123"
+        y="447"
+      >
+        {{ cftMap.FCCFTFS30 || 0 }}m/s
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="196" y="447">
+        30米风速
+      </text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="529"
+        y="447"
+      >
+        {{ cftMap.FCCFTFX30 || 0 }}度
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="438" y="447">
+        30米风向
+      </text>
     </g>
     <g>
       <use xlink:href="#wind-tower" y="510" />
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="123" y="527">{{ cftMap.FCCFTFS10 || 0 }}m/s</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="196" y="527">10米风速</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="529" y="527">{{ cftMap.FCCFTFX10 || 0 }}度</text>
-      <text fill="#ffffff" font-size="14" stroke-width="0" x="438" y="527">10米风向</text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="123"
+        y="527"
+      >
+        {{ cftMap.FCCFTFS10 || 0 }}m/s
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="196" y="527">
+        10米风速
+      </text>
+      <text
+        :fill="$store.state.themeName === 'dark' ? '#fff' : '#000'"
+        font-size="14"
+        stroke-width="0"
+        x="529"
+        y="527"
+      >
+        {{ cftMap.FCCFTFX10 || 0 }}度
+      </text>
+      <text fill="#fff" font-size="14" stroke-width="0" x="438" y="527">
+        10米风向
+      </text>
     </g>
   </svg>
 </template>

src/views/alarmCenter/scadaAlarm.vue

@@ -232,7 +232,7 @@ export default {
           },
           {
             name: "报警等级",
-            field: "messageType",
+            field: "rank",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -318,6 +318,10 @@ export default {
         },
         success(res) {
           if (res.data) {
+			  let rank = ['低','中低','中','中高','高'];
+			  res.data.records.forEach((ele,index) =>{
+				ele.rank = rank[parseInt(ele.rank) - 1]
+			  })
             that.tableData.data = res.data.records;
             that.tableData.total = res.data.total;
           } else {

src/views/layout/Header.vue

@@ -72,37 +72,37 @@ export default {
           path: "/decision/pb",
           isActive: false,
         },
-        {
-          id: "health",
-          text: "智慧检修",
-          // path: '/sandtable',
-          path: "/health/sandtable",
-          isActive: false,
-        },
+        // {
+        //   id: "health",
+        //   text: "智慧检修",
+        //   // path: '/sandtable',
+        //   path: "/health/sandtable",
+        //   isActive: false,
+        // },
         // {
         //   id: "decision",
         //   text: "决策支持",
         //   path: "/decision/decision1",
         //   isActive: false,
         // },
-        {
-          id: "save",
-          text: "安全管控",
-          path: "/save",
-          isActive: false,
-        },
+        // {
+        //   id: "save",
+        //   text: "安全管控",
+        //   path: "/save",
+        //   isActive: false,
+        // },
         // {
         //   id: "znbb",
         //   text: "智能报表",
         //   path: "/znbb/reportPandect",
         //   isActive: false,
         // },
-        {
-          id: "others",
-          text: "其他",
-          path: "/others",
-          isActive: false,
-        },
+        // {
+        //   id: "others",
+        //   text: "其他",
+        //   path: "/others",
+        //   isActive: false,
+        // },
       ],
       activeIndex: 0,
       // menusDropdown: [
@@ -126,7 +126,8 @@ export default {
   mounted() {
     let that = this;
     $(document).keydown((event) => {
-      if (event.keyCode == 67) { // c
+      if (event.keyCode == 67) {
+        // c
         let firstDate = new Date();
         if (that.firsttime == 0) {
           that.firsttime = firstDate.getTime();
@@ -145,9 +146,15 @@ export default {
     click(index, data) {
       this.activeIndex = index;
       this.$router.push(data.path);
+      const ActiveModule = this.menus.find((ele) => {
+        return ele.path === data.path;
+      });
+      if (ActiveModule) {
+        this.$store.dispatch("changeModuleName", ActiveModule.text);
+      }
     },
     clickSubMenu(index, code) {
-      console.log(index, code);
+      // console.log(index, code);
     },
     clickMenu() {
       this.dropdown = !this.dropdown;
@@ -155,12 +162,10 @@ export default {
     changeTheme() {
       $("#appBody").toggleClass("dark light");
       this.$store.dispatch("changeTheme", $("#appBody").attr("class"));
-      console.log(111111, $("#appBody").attr("class"));
-      console.log(222222, this.$store.state.themeName);
       this.$store.state.themeName === "dark"
         ? (this.themeName = false)
         : (this.themeName = true);
-      localStorage.setItem("authToken", this.$store.state.themeName);
+      localStorage.setItem("themeName", this.$store.state.themeName);
     },
   },
   computed: {
@@ -174,6 +179,12 @@ export default {
         this.menus.some((t, index) => {
           if (val.path.includes(t.id)) {
             this.activeIndex = index;
+            const ActiveModule = this.menus.find((ele) => {
+              return ele.path === val.path;
+            });
+            if (ActiveModule) {
+              this.$store.dispatch("changeModuleName", ActiveModule.text);
+            }
           }
         });
       },

src/views/layout/Menu.vue

@@ -1011,6 +1011,11 @@ export default {
                   icon: "svg-matrix",
                   path: "/others/analysis",
                 },
+                // {
+                //   text: "功率曲线综合分析",
+                //   icon: "svg-matrix",
+                //   path: "/others/powerline/analysis",
+                // },
                 {
                   text: "知识库",
                   icon: "svg-matrix",
@@ -1068,6 +1073,7 @@ export default {
       let data = this.menuData.filter((t) => {
         return t.id == this.currRoot;
       })[0].data;
+      this.$store.dispatch("changeMenuData", data);
       return data;
     },
   },

src/views/malfunctionDiagnose/index.vue

@@ -82,7 +82,7 @@
       </div>
       <div class="query-actions">
         <button class="btn green" @click="search()">查询</button>
-		<button class="btn green" @click="">导入</button>
+		<!-- <button class="btn green" @click="">导入</button> -->
 		<button class="btn green" @click="export">导出</button>
       </div>
     </div>

src/views/malfunctionRecall/components/fault-diagnosis.vue

@@ -114,156 +114,6 @@ export default {
                         ["2021/07/01 10:00:00", 69],
                         ["2021/07/01 15:00:00", 134],
                         ["2021/07/01 20:00:00", 262],
-                        ["2021/07/02 00:00:00", 181],
-                        ["2021/07/02 05:00:00", 72],
-                        ["2021/07/02 10:00:00", 221],
-                        ["2021/07/02 15:00:00", 184],
-                        ["2021/07/02 20:00:00", 319],
-                        ["2021/07/03 00:00:00", 283],
-                        ["2021/07/03 05:00:00", 156],
-                        ["2021/07/03 10:00:00", 308],
-                        ["2021/07/03 15:00:00", 153],
-                        ["2021/07/03 20:00:00", 67],
-                        ["2021/07/04 00:00:00", 289],
-                        ["2021/07/04 05:00:00", 194],
-                        ["2021/07/04 10:00:00", 358],
-                        ["2021/07/04 15:00:00", 325],
-                        ["2021/07/04 20:00:00", 345],
-                        ["2021/07/05 00:00:00", 242],
-                        ["2021/07/05 05:00:00", 100],
-                        ["2021/07/05 10:00:00", 225],
-                        ["2021/07/05 15:00:00", 230],
-                        ["2021/07/05 20:00:00", 162],
-                        ["2021/07/06 00:00:00", 235],
-                        ["2021/07/06 05:00:00", 237],
-                        ["2021/07/06 10:00:00", 248],
-                        ["2021/07/06 15:00:00", 350],
-                        ["2021/07/06 20:00:00", 298],
-                        ["2021/07/07 00:00:00", 295],
-                        ["2021/07/07 05:00:00", 192],
-                        ["2021/07/07 10:00:00", 54],
-                        ["2021/07/07 15:00:00", 321],
-                        ["2021/07/07 20:00:00", 104],
-                        ["2021/07/08 00:00:00", 163],
-                        ["2021/07/08 05:00:00", 177],
-                        ["2021/07/08 10:00:00", 185],
-                        ["2021/07/08 15:00:00", 120],
-                        ["2021/07/08 20:00:00", 61],
-                        ["2021/07/09 00:00:00", 104],
-                        ["2021/07/09 05:00:00", 178],
-                        ["2021/07/09 10:00:00", 90],
-                        ["2021/07/09 15:00:00", 331],
-                        ["2021/07/09 20:00:00", 217],
-                        ["2021/07/10 00:00:00", 338],
-                        ["2021/07/10 05:00:00", 155],
-                        ["2021/07/10 10:00:00", 99],
-                        ["2021/07/10 15:00:00", 109],
-                        ["2021/07/10 20:00:00", 221],
-                        ["2021/07/11 00:00:00", 281],
-                        ["2021/07/11 05:00:00", 306],
-                        ["2021/07/11 10:00:00", 246],
-                        ["2021/07/11 15:00:00", 176],
-                        ["2021/07/11 20:00:00", 348],
-                        ["2021/07/12 00:00:00", 94],
-                        ["2021/07/12 05:00:00", 100],
-                        ["2021/07/12 10:00:00", 53],
-                        ["2021/07/12 15:00:00", 269],
-                        ["2021/07/12 20:00:00", 93],
-                        ["2021/07/13 00:00:00", 178],
-                        ["2021/07/13 05:00:00", 100],
-                        ["2021/07/13 10:00:00", 53],
-                        ["2021/07/13 15:00:00", 260],
-                        ["2021/07/13 20:00:00", 114],
-                        ["2021/07/14 00:00:00", 251],
-                        ["2021/07/14 05:00:00", 250],
-                        ["2021/07/14 10:00:00", 97],
-                        ["2021/07/14 15:00:00", 283],
-                        ["2021/07/14 20:00:00", 231],
-                        ["2021/07/15 00:00:00", 359],
-                        ["2021/07/15 05:00:00", 105],
-                        ["2021/07/15 10:00:00", 229],
-                        ["2021/07/15 15:00:00", 81],
-                        ["2021/07/15 20:00:00", 353],
-                        ["2021/07/16 00:00:00", 244],
-                        ["2021/07/16 05:00:00", 231],
-                        ["2021/07/16 10:00:00", 275],
-                        ["2021/07/16 15:00:00", 273],
-                        ["2021/07/16 20:00:00", 199],
-                        ["2021/07/17 00:00:00", 124],
-                        ["2021/07/17 05:00:00", 176],
-                        ["2021/07/17 10:00:00", 149],
-                        ["2021/07/17 15:00:00", 77],
-                        ["2021/07/17 20:00:00", 168],
-                        ["2021/07/18 00:00:00", 256],
-                        ["2021/07/18 05:00:00", 138],
-                        ["2021/07/18 10:00:00", 95],
-                        ["2021/07/18 15:00:00", 313],
-                        ["2021/07/18 20:00:00", 244],
-                        ["2021/07/19 00:00:00", 169],
-                        ["2021/07/19 05:00:00", 199],
-                        ["2021/07/19 10:00:00", 91],
-                        ["2021/07/19 15:00:00", 241],
-                        ["2021/07/19 20:00:00", 344],
-                        ["2021/07/20 00:00:00", 85],
-                        ["2021/07/20 05:00:00", 332],
-                        ["2021/07/20 10:00:00", 189],
-                        ["2021/07/20 15:00:00", 81],
-                        ["2021/07/20 20:00:00", 290],
-                        ["2021/07/21 00:00:00", 214],
-                        ["2021/07/21 05:00:00", 61],
-                        ["2021/07/21 10:00:00", 339],
-                        ["2021/07/21 15:00:00", 286],
-                        ["2021/07/21 20:00:00", 89],
-                        ["2021/07/22 00:00:00", 279],
-                        ["2021/07/22 05:00:00", 229],
-                        ["2021/07/22 10:00:00", 238],
-                        ["2021/07/22 15:00:00", 86],
-                        ["2021/07/22 20:00:00", 163],
-                        ["2021/07/23 00:00:00", 140],
-                        ["2021/07/23 05:00:00", 312],
-                        ["2021/07/23 10:00:00", 134],
-                        ["2021/07/23 15:00:00", 53],
-                        ["2021/07/23 20:00:00", 235],
-                        ["2021/07/24 00:00:00", 97],
-                        ["2021/07/24 05:00:00", 309],
-                        ["2021/07/24 10:00:00", 147],
-                        ["2021/07/24 15:00:00", 258],
-                        ["2021/07/24 20:00:00", 192],
-                        ["2021/07/25 00:00:00", 305],
-                        ["2021/07/25 05:00:00", 282],
-                        ["2021/07/25 10:00:00", 72],
-                        ["2021/07/25 15:00:00", 258],
-                        ["2021/07/25 20:00:00", 312],
-                        ["2021/07/26 00:00:00", 259],
-                        ["2021/07/26 05:00:00", 146],
-                        ["2021/07/26 10:00:00", 93],
-                        ["2021/07/26 15:00:00", 158],
-                        ["2021/07/26 20:00:00", 156],
-                        ["2021/07/27 00:00:00", 362],
-                        ["2021/07/27 05:00:00", 193],
-                        ["2021/07/27 10:00:00", 177],
-                        ["2021/07/27 15:00:00", 313],
-                        ["2021/07/27 20:00:00", 60],
-                        ["2021/07/28 00:00:00", 119],
-                        ["2021/07/28 05:00:00", 142],
-                        ["2021/07/28 10:00:00", 283],
-                        ["2021/07/28 15:00:00", 105],
-                        ["2021/07/28 20:00:00", 121],
-                        ["2021/07/29 00:00:00", 304],
-                        ["2021/07/29 05:00:00", 82],
-                        ["2021/07/29 10:00:00", 326],
-                        ["2021/07/29 15:00:00", 216],
-                        ["2021/07/29 20:00:00", 223],
-                        ["2021/07/30 00:00:00", 218],
-                        ["2021/07/30 05:00:00", 313],
-                        ["2021/07/30 10:00:00", 339],
-                        ["2021/07/30 15:00:00", 125],
-                        ["2021/07/30 20:00:00", 244],
-                        ["2021/07/31 00:00:00", 179],
-                        ["2021/07/31 05:00:00", 360],
-                        ["2021/07/31 10:00:00", 267],
-                        ["2021/07/31 15:00:00", 85],
-                        ["2021/07/31 20:00:00", 309]
                     ],
                 },
                 {
@@ -275,156 +125,6 @@ export default {
                         ["2021/07/01 10:00:00", 290],
                         ["2021/07/01 15:00:00", 140],
                         ["2021/07/01 20:00:00", 203],
-                        ["2021/07/02 00:00:00", 280],
-                        ["2021/07/02 05:00:00", 283],
-                        ["2021/07/02 10:00:00", 252],
-                        ["2021/07/02 15:00:00", 155],
-                        ["2021/07/02 20:00:00", 133],
-                        ["2021/07/03 00:00:00", 94],
-                        ["2021/07/03 05:00:00", 191],
-                        ["2021/07/03 10:00:00", 193],
-                        ["2021/07/03 15:00:00", 205],
-                        ["2021/07/03 20:00:00", 301],
-                        ["2021/07/04 00:00:00", 101],
-                        ["2021/07/04 05:00:00", 257],
-                        ["2021/07/04 10:00:00", 82],
-                        ["2021/07/04 15:00:00", 75],
-                        ["2021/07/04 20:00:00", 254],
-                        ["2021/07/05 00:00:00", 184],
-                        ["2021/07/05 05:00:00", 146],
-                        ["2021/07/05 10:00:00", 272],
-                        ["2021/07/05 15:00:00", 100],
-                        ["2021/07/05 20:00:00", 118],
-                        ["2021/07/06 00:00:00", 125],
-                        ["2021/07/06 05:00:00", 80],
-                        ["2021/07/06 10:00:00", 144],
-                        ["2021/07/06 15:00:00", 100],
-                        ["2021/07/06 20:00:00", 232],
-                        ["2021/07/07 00:00:00", 139],
-                        ["2021/07/07 05:00:00", 311],
-                        ["2021/07/07 10:00:00", 152],
-                        ["2021/07/07 15:00:00", 182],
-                        ["2021/07/07 20:00:00", 162],
-                        ["2021/07/08 00:00:00", 175],
-                        ["2021/07/08 05:00:00", 95],
-                        ["2021/07/08 10:00:00", 300],
-                        ["2021/07/08 15:00:00", 290],
-                        ["2021/07/08 20:00:00", 218],
-                        ["2021/07/09 00:00:00", 106],
-                        ["2021/07/09 05:00:00", 301],
-                        ["2021/07/09 10:00:00", 221],
-                        ["2021/07/09 15:00:00", 126],
-                        ["2021/07/09 20:00:00", 149],
-                        ["2021/07/10 00:00:00", 308],
-                        ["2021/07/10 05:00:00", 187],
-                        ["2021/07/10 10:00:00", 164],
-                        ["2021/07/10 15:00:00", 139],
-                        ["2021/07/10 20:00:00", 199],
-                        ["2021/07/11 00:00:00", 71],
-                        ["2021/07/11 05:00:00", 198],
-                        ["2021/07/11 10:00:00", 121],
-                        ["2021/07/11 15:00:00", 242],
-                        ["2021/07/11 20:00:00", 286],
-                        ["2021/07/12 00:00:00", 198],
-                        ["2021/07/12 05:00:00", 275],
-                        ["2021/07/12 10:00:00", 63],
-                        ["2021/07/12 15:00:00", 229],
-                        ["2021/07/12 20:00:00", 272],
-                        ["2021/07/13 00:00:00", 266],
-                        ["2021/07/13 05:00:00", 305],
-                        ["2021/07/13 10:00:00", 218],
-                        ["2021/07/13 15:00:00", 273],
-                        ["2021/07/13 20:00:00", 112],
-                        ["2021/07/14 00:00:00", 243],
-                        ["2021/07/14 05:00:00", 105],
-                        ["2021/07/14 10:00:00", 147],
-                        ["2021/07/14 15:00:00", 301],
-                        ["2021/07/14 20:00:00", 145],
-                        ["2021/07/15 00:00:00", 136],
-                        ["2021/07/15 05:00:00", 153],
-                        ["2021/07/15 10:00:00", 251],
-                        ["2021/07/15 15:00:00", 76],
-                        ["2021/07/15 20:00:00", 296],
-                        ["2021/07/16 00:00:00", 128],
-                        ["2021/07/16 05:00:00", 94],
-                        ["2021/07/16 10:00:00", 236],
-                        ["2021/07/16 15:00:00", 202],
-                        ["2021/07/16 20:00:00", 94],
-                        ["2021/07/17 00:00:00", 169],
-                        ["2021/07/17 05:00:00", 93],
-                        ["2021/07/17 10:00:00", 297],
-                        ["2021/07/17 15:00:00", 110],
-                        ["2021/07/17 20:00:00", 271],
-                        ["2021/07/18 00:00:00", 98],
-                        ["2021/07/18 05:00:00", 169],
-                        ["2021/07/18 10:00:00", 114],
-                        ["2021/07/18 15:00:00", 190],
-                        ["2021/07/18 20:00:00", 62],
-                        ["2021/07/19 00:00:00", 151],
-                        ["2021/07/19 05:00:00", 239],
-                        ["2021/07/19 10:00:00", 135],
-                        ["2021/07/19 15:00:00", 281],
-                        ["2021/07/19 20:00:00", 190],
-                        ["2021/07/20 00:00:00", 65],
-                        ["2021/07/20 05:00:00", 207],
-                        ["2021/07/20 10:00:00", 140],
-                        ["2021/07/20 15:00:00", 272],
-                        ["2021/07/20 20:00:00", 195],
-                        ["2021/07/21 00:00:00", 66],
-                        ["2021/07/21 05:00:00", 163],
-                        ["2021/07/21 10:00:00", 306],
-                        ["2021/07/21 15:00:00", 213],
-                        ["2021/07/21 20:00:00", 154],
-                        ["2021/07/22 00:00:00", 305],
-                        ["2021/07/22 05:00:00", 223],
-                        ["2021/07/22 10:00:00", 201],
-                        ["2021/07/22 15:00:00", 224],
-                        ["2021/07/22 20:00:00", 63],
-                        ["2021/07/23 00:00:00", 226],
-                        ["2021/07/23 05:00:00", 75],
-                        ["2021/07/23 10:00:00", 309],
-                        ["2021/07/23 15:00:00", 191],
-                        ["2021/07/23 20:00:00", 219],
-                        ["2021/07/24 00:00:00", 142],
-                        ["2021/07/24 05:00:00", 162],
-                        ["2021/07/24 10:00:00", 260],
-                        ["2021/07/24 15:00:00", 260],
-                        ["2021/07/24 20:00:00", 249],
-                        ["2021/07/25 00:00:00", 278],
-                        ["2021/07/25 05:00:00", 187],
-                        ["2021/07/25 10:00:00", 101],
-                        ["2021/07/25 15:00:00", 200],
-                        ["2021/07/25 20:00:00", 261],
-                        ["2021/07/26 00:00:00", 161],
-                        ["2021/07/26 05:00:00", 227],
-                        ["2021/07/26 10:00:00", 289],
-                        ["2021/07/26 15:00:00", 85],
-                        ["2021/07/26 20:00:00", 88],
-                        ["2021/07/27 00:00:00", 237],
-                        ["2021/07/27 05:00:00", 198],
-                        ["2021/07/27 10:00:00", 260],
-                        ["2021/07/27 15:00:00", 146],
-                        ["2021/07/27 20:00:00", 288],
-                        ["2021/07/28 00:00:00", 213],
-                        ["2021/07/28 05:00:00", 250],
-                        ["2021/07/28 10:00:00", 77],
-                        ["2021/07/28 15:00:00", 75],
-                        ["2021/07/28 20:00:00", 153],
-                        ["2021/07/29 00:00:00", 263],
-                        ["2021/07/29 05:00:00", 173],
-                        ["2021/07/29 10:00:00", 105],
-                        ["2021/07/29 15:00:00", 239],
-                        ["2021/07/29 20:00:00", 69],
-                        ["2021/07/30 00:00:00", 126],
-                        ["2021/07/30 05:00:00", 238],
-                        ["2021/07/30 10:00:00", 62],
-                        ["2021/07/30 15:00:00", 277],
-                        ["2021/07/30 20:00:00", 61],
-                        ["2021/07/31 00:00:00", 91],
-                        ["2021/07/31 05:00:00", 201],
-                        ["2021/07/31 10:00:00", 238],
-                        ["2021/07/31 15:00:00", 307],
-                        ["2021/07/31 20:00:00", 86]
                     ],
                 },
                 {
@@ -436,156 +136,6 @@ export default {
                         ["2021/07/01 10:00:00", 231],
                         ["2021/07/01 15:00:00", 305],
                         ["2021/07/01 20:00:00", 230],
-                        ["2021/07/02 00:00:00", 248],
-                        ["2021/07/02 05:00:00", 295],
-                        ["2021/07/02 10:00:00", 147],
-                        ["2021/07/02 15:00:00", 242],
-                        ["2021/07/02 20:00:00", 317],
-                        ["2021/07/03 00:00:00", 218],
-                        ["2021/07/03 05:00:00", 217],
-                        ["2021/07/03 10:00:00", 274],
-                        ["2021/07/03 15:00:00", 329],
-                        ["2021/07/03 20:00:00", 148],
-                        ["2021/07/04 00:00:00", 316],
-                        ["2021/07/04 05:00:00", 270],
-                        ["2021/07/04 10:00:00", 173],
-                        ["2021/07/04 15:00:00", 318],
-                        ["2021/07/04 20:00:00", 297],
-                        ["2021/07/05 00:00:00", 322],
-                        ["2021/07/05 05:00:00", 182],
-                        ["2021/07/05 10:00:00", 170],
-                        ["2021/07/05 15:00:00", 199],
-                        ["2021/07/05 20:00:00", 258],
-                        ["2021/07/06 00:00:00", 128],
-                        ["2021/07/06 05:00:00", 323],
-                        ["2021/07/06 10:00:00", 142],
-                        ["2021/07/06 15:00:00", 312],
-                        ["2021/07/06 20:00:00", 174],
-                        ["2021/07/07 00:00:00", 158],
-                        ["2021/07/07 05:00:00", 317],
-                        ["2021/07/07 10:00:00", 154],
-                        ["2021/07/07 15:00:00", 262],
-                        ["2021/07/07 20:00:00", 180],
-                        ["2021/07/08 00:00:00", 204],
-                        ["2021/07/08 05:00:00", 307],
-                        ["2021/07/08 10:00:00", 232],
-                        ["2021/07/08 15:00:00", 124],
-                        ["2021/07/08 20:00:00", 126],
-                        ["2021/07/09 00:00:00", 300],
-                        ["2021/07/09 05:00:00", 289],
-                        ["2021/07/09 10:00:00", 278],
-                        ["2021/07/09 15:00:00", 211],
-                        ["2021/07/09 20:00:00", 116],
-                        ["2021/07/10 00:00:00", 271],
-                        ["2021/07/10 05:00:00", 197],
-                        ["2021/07/10 10:00:00", 296],
-                        ["2021/07/10 15:00:00", 107],
-                        ["2021/07/10 20:00:00", 153],
-                        ["2021/07/11 00:00:00", 221],
-                        ["2021/07/11 05:00:00", 196],
-                        ["2021/07/11 10:00:00", 108],
-                        ["2021/07/11 15:00:00", 190],
-                        ["2021/07/11 20:00:00", 141],
-                        ["2021/07/12 00:00:00", 98],
-                        ["2021/07/12 05:00:00", 192],
-                        ["2021/07/12 10:00:00", 190],
-                        ["2021/07/12 15:00:00", 327],
-                        ["2021/07/12 20:00:00", 260],
-                        ["2021/07/13 00:00:00", 221],
-                        ["2021/07/13 05:00:00", 240],
-                        ["2021/07/13 10:00:00", 280],
-                        ["2021/07/13 15:00:00", 234],
-                        ["2021/07/13 20:00:00", 326],
-                        ["2021/07/14 00:00:00", 143],
-                        ["2021/07/14 05:00:00", 329],
-                        ["2021/07/14 10:00:00", 156],
-                        ["2021/07/14 15:00:00", 152],
-                        ["2021/07/14 20:00:00", 316],
-                        ["2021/07/15 00:00:00", 125],
-                        ["2021/07/15 05:00:00", 322],
-                        ["2021/07/15 10:00:00", 174],
-                        ["2021/07/15 15:00:00", 286],
-                        ["2021/07/15 20:00:00", 122],
-                        ["2021/07/16 00:00:00", 145],
-                        ["2021/07/16 05:00:00", 122],
-                        ["2021/07/16 10:00:00", 313],
-                        ["2021/07/16 15:00:00", 144],
-                        ["2021/07/16 20:00:00", 150],
-                        ["2021/07/17 00:00:00", 322],
-                        ["2021/07/17 05:00:00", 130],
-                        ["2021/07/17 10:00:00", 189],
-                        ["2021/07/17 15:00:00", 99],
-                        ["2021/07/17 20:00:00", 165],
-                        ["2021/07/18 00:00:00", 235],
-                        ["2021/07/18 05:00:00", 127],
-                        ["2021/07/18 10:00:00", 104],
-                        ["2021/07/18 15:00:00", 233],
-                        ["2021/07/18 20:00:00", 178],
-                        ["2021/07/19 00:00:00", 171],
-                        ["2021/07/19 05:00:00", 123],
-                        ["2021/07/19 10:00:00", 305],
-                        ["2021/07/19 15:00:00", 113],
-                        ["2021/07/19 20:00:00", 299],
-                        ["2021/07/20 00:00:00", 157],
-                        ["2021/07/20 05:00:00", 165],
-                        ["2021/07/20 10:00:00", 147],
-                        ["2021/07/20 15:00:00", 181],
-                        ["2021/07/20 20:00:00", 261],
-                        ["2021/07/21 00:00:00", 123],
-                        ["2021/07/21 05:00:00", 317],
-                        ["2021/07/21 10:00:00", 203],
-                        ["2021/07/21 15:00:00", 284],
-                        ["2021/07/21 20:00:00", 232],
-                        ["2021/07/22 00:00:00", 124],
-                        ["2021/07/22 05:00:00", 106],
-                        ["2021/07/22 10:00:00", 233],
-                        ["2021/07/22 15:00:00", 169],
-                        ["2021/07/22 20:00:00", 214],
-                        ["2021/07/23 00:00:00", 122],
-                        ["2021/07/23 05:00:00", 145],
-                        ["2021/07/23 10:00:00", 160],
-                        ["2021/07/23 15:00:00", 260],
-                        ["2021/07/23 20:00:00", 310],
-                        ["2021/07/24 00:00:00", 234],
-                        ["2021/07/24 05:00:00", 130],
-                        ["2021/07/24 10:00:00", 248],
-                        ["2021/07/24 15:00:00", 257],
-                        ["2021/07/24 20:00:00", 178],
-                        ["2021/07/25 00:00:00", 239],
-                        ["2021/07/25 05:00:00", 111],
-                        ["2021/07/25 10:00:00", 159],
-                        ["2021/07/25 15:00:00", 101],
-                        ["2021/07/25 20:00:00", 237],
-                        ["2021/07/26 00:00:00", 299],
-                        ["2021/07/26 05:00:00", 319],
-                        ["2021/07/26 10:00:00", 135],
-                        ["2021/07/26 15:00:00", 250],
-                        ["2021/07/26 20:00:00", 308],
-                        ["2021/07/27 00:00:00", 208],
-                        ["2021/07/27 05:00:00", 208],
-                        ["2021/07/27 10:00:00", 324],
-                        ["2021/07/27 15:00:00", 122],
-                        ["2021/07/27 20:00:00", 117],
-                        ["2021/07/28 00:00:00", 129],
-                        ["2021/07/28 05:00:00", 121],
-                        ["2021/07/28 10:00:00", 166],
-                        ["2021/07/28 15:00:00", 303],
-                        ["2021/07/28 20:00:00", 262],
-                        ["2021/07/29 00:00:00", 200],
-                        ["2021/07/29 05:00:00", 229],
-                        ["2021/07/29 10:00:00", 122],
-                        ["2021/07/29 15:00:00", 122],
-                        ["2021/07/29 20:00:00", 225],
-                        ["2021/07/30 00:00:00", 227],
-                        ["2021/07/30 05:00:00", 247],
-                        ["2021/07/30 10:00:00", 102],
-                        ["2021/07/30 15:00:00", 285],
-                        ["2021/07/30 20:00:00", 167],
-                        ["2021/07/31 00:00:00", 119],
-                        ["2021/07/31 05:00:00", 212],
-                        ["2021/07/31 10:00:00", 277],
-                        ["2021/07/31 15:00:00", 159],
-                        ["2021/07/31 20:00:00", 179]
                     ],
                 },
                 {

src/views/report/ExportExcel.vue

@@ -4,7 +4,7 @@
       style="
         margin-bottom: 15px;
         padding-bottom: 15px;
-        border-bottom: 2px solid #eee8d5;
+        border-bottom: 2px solid #ffffff;
       "
     >
       <el-col :span="12">

src/views/sampleDatabase/performance/performanceEcharts.vue

@@ -76,7 +76,7 @@ export default {
           itemHeight: 8,
           textStyle: {
             fontSize: "14px",
-            color: "#fff",
+            color: "#000"
           },
         },
         dataset: [

src/views/sampleDatabase/warning/index.vue

@@ -488,7 +488,7 @@ export default {
     getWp() {
       let that = this;
       that.API.requestData({
-        baseURL: process.env.VUE_APP_API,
+        baseURL: "http://10.155.32.4:8082/",
         subUrl: "powercompare/windfarmAjax",
         success(res) {
           that.wpArray = res.data;

src/views/singleAnalysis/index.vue

@@ -43,7 +43,7 @@
       <ComTable height="78vh" :data="tableData">
         <template v-slot:tr v-if="tableData.data.length > 0">
           <tr>
-            <td v-for="(item, index) in tableData.column" key="index">
+            <td v-for="(item, index) in tableData.column" :key="index">
               {{ tableDataEnd[item.field] }}
             </td>
           </tr>
@@ -51,23 +51,13 @@
       </ComTable>
     </div>
     <el-dialog
-      title="切入切出风速整合历史"
-      v-model="dialogShow"
-      width="85%"
-      top="10vh"
-      custom-class="modal"
-      :close-on-click-modal="true"
-      @closed="dialogType = ''"
-    >
-      test
-    </el-dialog>
-    <el-dialog
       :title="wtId + '号风机' + year + '年' + month + '月运行指标性能分析'"
       v-model="dialogVisible"
       width="70%"
       top="10vh"
       custom-class="modal"
       :close-on-click-modal="false"
+	  :destroy-on-close='true'
     >
       <ZnzhFx :wtId="wtId" :year="year" :month="month" />
     </el-dialog>
@@ -101,7 +91,6 @@ export default {
       recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
         "yyyy-MM-dd"
       ),
-      dialogShow: false,
       tableDataEnd: [], //合计
       tableData: {
         column: [
@@ -228,18 +217,6 @@ export default {
             is_light: false,
             sortable: true,
           },
-          // {
-          //   name: "操作",
-          //   field: "",
-          //   is_num: false,
-          //   is_light: false,
-          //   template() {
-          // 			return "<el-button type='text' style='cursor: pointer;'>详情</el-button>";
-          // 	},
-          //   click(e, row){
-          //     that.getOutputspeedHistoryList(row)
-          //   }
-          // }
         ],
         data: [],
       },
@@ -300,28 +277,6 @@ export default {
         });
       }
     },
-
-    getOutputspeedHistoryList(item) {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "outputspeed/outputspeedhistorylist",
-        data: {
-          wpId: item.windpowerstationid,
-          wtId: item.windturbineid,
-          beginDate: new Date().formatDate("yyyy-MM") + "-01",
-          endDate: new Date().formatDate("yyyy-MM-dd"),
-        },
-        success(res) {
-          res.data.forEach((ele) => {
-            ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
-          });
-          that.tableHistoryData.data = res.data;
-          that.dialogShow = true;
-        },
-      });
-    },
-
     search() {
       this.getOutputSpeedList(this.wpId);
     },

src/views/singleAnalysis/znzhfx.vue

@@ -28,45 +28,33 @@
     </el-row>
     <div class="mg-b-16 anliz-des">
       <div>
-        本月{{ wtId }}号风机风机设备利用小时数{{
-          tableVal.byzb && tableVal.byzb.lyxs
-        }}小时、同比{{
-          tableVal.tpzb && tableVal.tpzb.lyxs
-        }}小时，设备可利用率{{ tableVal.byzb && tableVal.byzb.sbklyl }}%、同比{{
-          tableVal.tpzb && tableVal.tpzb.sbklyl
-        }}%， 等效可用系数{{ tableVal.byzb && tableVal.byzb.dxklyxs }}%、同比{{
-          tableVal.tpzb && tableVal.tpzb.dxklyxs
-        }}%，静风频率达到{{ tableVal.byzb && tableVal.byzb.jfpl }}%、同比{{
-          tableVal.tpzb && tableVal.tpzb.jfpl
-        }}%， 机组功率特性一致性系数达到{{
-          tableVal.byzb && tableVal.byzb.glyzxxs
-        }}%、同比{{ tableVal.tpzb && tableVal.tpzb.glyzxxs }}%。
-        <br />
-        {{ wtId }}风机{{ year }}年{{ month }}月平均风速{{
-          tableVal.byzb && tableVal.byzb.fs
-        }}m/s、同比{{ tableVal.tpzb && tableVal.tpzb.fs }}m/s，
-        小风平均切入风速{{ tableVal.byzb && tableVal.byzb.xfqr }}m/s、同比{{
-          tableVal.tpzb && tableVal.tpzb.xfqr
-        }}m/s， 有效风时数{{ tableVal.byzb && tableVal.byzb.yxfss }}小时、同比{{
-          tableVal.tpzb && tableVal.tpzb.yxfss
-        }}小时， 实际发电电量{{
-          tableVal.byzb && tableVal.byzb.fdl
-        }}万kwh、同比{{ tableVal.tpzb && tableVal.tpzb.fdl }}万kwh，同比增长率{{
-          tableVal.tbzb && tableVal.tbzb.fdl
-        }}%， 各项损失电量累计{{
-          tableVal.byzb && tableVal.byzb.llfdl - tableVal.byzb.fdl
-        }}万kwh、同比{{
-          tableVal.tpzb && tableVal.tpzb.llfdl - tableVal.tpzb.fdl
-        }}万kwh，同比增长率{{
-          tableVal.tbzb && tableVal.byzb.llfdl - tableVal.tbzb.fdl
-        }}%， 理论发电量{{
-          tableVal.byzb && tableVal.byzb.llfdl
-        }}万kwh，实际发电量与理论发电量相差{{
-          tableVal.tbzb && tableVal.tbzb.llfdl
-        }}万kwh。
-        <br />
-        本月静风频率
-        %，月累计静风时长0.00小时，月累计待机小时116.44小时，待机占比48.51%。
+        本月{{ wtId }}号风机风机设备利用小时数{{ tableVal.byzb && tableVal.byzb.lyxs }}小时、
+		同比{{ tableVal.tqzb && tableVal.tqzb.lyxs }}小时，
+		设备可利用率{{ tableVal.byzb && tableVal.byzb.sbklyl }}%、
+		同比{{ tableVal.tqzb && tableVal.tqzb.sbklyl }}%；
+		等效可用系数{{ tableVal.byzb && tableVal.byzb.dxklyxs }}%、
+		同比{{ tableVal.tqzb && tableVal.tqzb.dxklyxs }}%；
+		静风频率达到{{ tableVal.byzb && tableVal.byzb.jfpl }}%、
+		同比{{ tableVal.tqzb && tableVal.tqzb.jfpl }}%；
+		机组功率特性一致性系数达到{{ tableVal.byzb && tableVal.byzb.glyzxxs }}%、
+		同比{{ tableVal.tqzb && tableVal.tqzb.glyzxxs }}%。 <br />
+        {{ wtId }}风机{{ year }}年{{ month }}
+		月平均风速{{ tableVal.byzb && tableVal.byzb.fs }}m/s、
+		同比{{ tableVal.tqzb && tableVal.tqzb.fs }}m/s；
+        小风平均切入风速{{ tableVal.byzb && tableVal.byzb.xfqr }}m/s、
+		同比{{ tableVal.tqzb && tableVal.tqzb.xfqr }}m/s；
+		有效风时数{{ tableVal.byzb && tableVal.byzb.yxfss }}小时、
+		同比{{ tableVal.tqzb && tableVal.tqzb.yxfss }}小时；
+		实际发电电量{{ tableVal.byzb && tableVal.byzb.fdl }}万kwh、
+		同比{{ tableVal.tqzb && tableVal.tqzb.fdl }}万kwh，
+		同比增长率{{ tableVal.tbzb && (tableVal.tbzb.fdl).toFixed(2) }}%；
+		各项损失电量累计{{ tableVal.byzb && (tableVal.byzb.llfdl - tableVal.byzb.fdl).toFixed(2) }}万kwh、
+		同比{{ tableVal.tqzb && tableVal.tqzb.llfdl - tableVal.tqzb.fdl }}万kwh，
+		同比增长率{{ tableVal.tbzb && (tableVal.byzb.llfdl - tableVal.tbzb.fdl).toFixed(2) }}%；
+		理论发电量{{ tableVal.byzb && tableVal.byzb.llfdl }}万kwh，
+		实际发电量与理论发电量相差{{ tableVal.tbzb && tableVal.tbzb.llfdl }}万kwh。 <br />
+        <!-- 月累计静风时长0.00小时， -->
+        月累计待机小时{{ tableVal.byzb && tableVal.byzb.tjxs }}小时，待机占比{{ tableVal.byzb && tableVal.tqzb.tjxs }}%。
       </div>
     </div>
     <div class="mg-b-16">
@@ -381,6 +369,9 @@ export default {
     // this.month = this.$route.params.month;
     this.search();
     this.searchChart();
+	while(true){
+		console.log()
+	}
   },
   filters: {
     tabrowfil(val) {
@@ -418,6 +409,7 @@ export default {
       console.warn(data.data);
       const res = data.data;
       this.tableVal = data.data;
+	  console.log(data.data)
       console.warn(this.tableVal);
       let arr = [];
       let keyarr = Object.keys(res.byzb);

src/views/warn/gfgj.vue

@@ -33,6 +33,7 @@
 				<div class="query-actions">
 					<button class="btn green" @click="getTable()">查询</button>
 					<button class="btn green" @click="exportExcel()">导出</button>
+					<button class="btn green" @click="fx">分析</button>
 				</div>
 			</div>
 		</div>
@@ -42,18 +43,40 @@
 				@pageClick="pageClick" height="68vh" v-loading="tableLoading" element-loading-text="拼命加载中.."
 				element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
 		</div>
+		<el-dialog title="报警等级占比图" v-model="dialogVisible" width="750px" top="10vh" custom-class="modal" :close-on-click-modal="false" :destroy-on-close='true'>
+			<el-row type="flex" justify="end">
+				<div class="query">
+					<div class="query-items">
+						<div class="query-actions">
+							<button class="btn green" @click="exportPDF">导出为PDF</button>
+						</div>
+					</div>
+				</div>
+			</el-row>
+			<el-row>
+				<div class="pdfDom">
+					<dual-pie-chart height="40vh" width='700px' :innerData="innerAnalyis" :outerData="outerAnalyis" />
+				</div>
+			</el-row>
+		</el-dialog>
 	</div>
 </template>
 <script>
 	import ComTable from "@/components/coms/table/table.vue";
-
+	import DualPieChart from "@/components/chart/pie/dual-pie-chart.vue";
+	import Get_PDF from "@tools/htmlToPdf";
 	export default {
 		components: {
-			ComTable
+			ComTable,
+			DualPieChart,
+			Get_PDF
 		},
 		data() {
 			let that = this;
 			return {
+				innerAnalyis: [],
+				outerAnalyis: [],
+				dialogVisible: false,
 				waitAjax:true,//等待执行完了再加载table
 				ChangZhan: [],
 				wpId: "",
@@ -90,7 +113,7 @@
 						},
 						{
 							name: "报警等级",
-							field: "messageType",
+							field: "rank",
 							is_num: false,
 							is_light: false,
 							sortable: true,
@@ -144,10 +167,10 @@
 					},
 					success(res) {
 						if (res.data) {
-							let messageType = ['低','中低','中','中高','高'];
+							let rank = ['低','中低','中','中高','高'];
 							let data = res.data.records;
 							data.forEach(ele=>{
-								ele.messageType = messageType[parseInt(ele.messageType) - 1];
+								ele.rank = rank[parseInt(ele.rank) - 1];
 								ele.category1 == 'GF' ? ele.category1 = '光伏': ele.category1 = '升压站';
 							})
 							that.tableData.data = data;
@@ -169,6 +192,50 @@
 				let excelData = this.BASE.deepCopy(this.tableData);
 				this.BASE.exportExcel(excelData, "光伏告警");
 			},
+			fx(){
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					timeout: 30000,
+					showLoading:true,
+					subUrl: "photovoltaic/query",
+					data: {
+						category1: "GF",
+						stationid: this.wpId,
+						starttime: this.startDate,
+						endtime: this.endDate,
+						keyword: this.alarmDesc,
+						pagenum: this.pageIndex,
+						pagesize: this.pageSize,
+					},
+					success(res) {
+						var analyis = [];
+						let data = res.data[1],
+							rank = ['低','中低','中','中高','高'],
+							val = Object.values(data);
+						val.pop();
+						val.forEach((ele,index) =>{
+							analyis.push({
+							  name: rank[index],
+							  value: ele
+							})
+						})
+						that.innerAnalyis = analyis;
+						that.outerAnalyis = analyis;
+						that.dialogVisible= true;
+					},
+				});
+			},
+			exportPDF(name) {
+			  this.BASE.showMsg({
+			    type: "success",
+			    msg: "正在导出...请稍后...",
+			  });
+			  Get_PDF.downloadPDF(
+			    document.querySelector(".pdfDom"),
+			    "报警等级占比图"
+			  );
+			},
 		},
 	};
 </script>
@@ -178,4 +245,9 @@
 		margin-bottom: 8px;
 		padding: 1vh;
 	}
+	.pdfDom{
+		padding-top: 5vh;
+		background-color: #111C1B;
+		height: 50vh;
+	}
 </style>