Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

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

@@ -1,6 +1,6 @@
 <template>
   <div v-if="!showSisView && isLogined" class="main">
-    <div class="header-body">
+    <div class="header-body" v-if="hideHeard === '0'">
       <div class="header-title">
         <svg
           version="1.1"
@@ -242,6 +242,7 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
       @mouseenter="showMenu"
       @mouseleave="hideMenu"
       v-show="$store.state.themeName === 'dark'"
+      v-if="hideMenus === '0'"
     >
       <Menu :root="root" />
     </div>
@@ -253,24 +254,37 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
         text-color="#ffffff"
         active-text-color="#6262a2"
         background-color="#36348e"
+        @select="selectMenu"
+        v-if="hideMenus === '0'"
       >
-        <el-sub-menu :index="index" :title="item.text" v-for="(item , index) in menuData">
+        <el-sub-menu
+          :index="index"
+          :title="item.text"
+          v-for="(item, index) in menuData"
+          :key="index"
+        >
           <template #title>
-			  <router-link :to="item.path">
-				<el-icon>
-				  <SvgIcon :svgid="item.icon" />
-				</el-icon>
-			</router-link>
+            <router-link :to="item.path">
+              <el-icon>
+                <SvgIcon :svgid="item.icon" />
+              </el-icon>
+            </router-link>
           </template>
-          <el-menu-item-group v-for="(menu , idx) in item.children" :index="idx">
-			  <router-link :to="menu.path">
-				<el-menu-item :index="index+'-'+idx">{{menu.text}}</el-menu-item>
-			</router-link>
+          <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-sub-menu>
       </el-menu>
     </div>
-    <div class="main-body">
+    <div class="main-body" :style="($store.state.themeName === 'light' && hideMenus === '0') ? 'margin-left: 66px; max-width  : calc(100vw - 54px - 12px);' : ''">
       <router-view />
     </div>
   </div>
@@ -314,7 +328,9 @@ export default {
       isLogined: true,
       showSisView: false,
       memuCloseTimeout: null,
-	  menuData:[]
+      menuData: [],
+      hideMenus: "0",
+      hideHeard: "0",
     };
   },
 
@@ -373,15 +389,50 @@ export default {
     login(params) {
       if (params.username && params.password) this.isLogined = true;
     },
+    selectMenu(menuIndex) {
+      this.menuIndex = menuIndex;
+    },
   },
 
   watch: {
     $route(res) {
+      console.log(res);
       this.showSisView = res.fullPath === "/sisView";
+      this.hideHeard = res.query.hideheard || "0";
+      this.hideMenus = res.query.hidemenus || "0";
+      if (res.query.theme) {
+        const theme = res.query.theme === "dark" ? "dark" : "light";
+        this.$store.dispatch("changeTheme", theme);
+        $("#appBody").attr("class", theme);
+      }
+
+      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;
-	},
+      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,
+        });
+      }
+    },
   },
 };
 </script>

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

@@ -23,5 +23,4 @@
 @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/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/aqgk.less

@@ -59,6 +59,17 @@
         background: @deepblue;
         border-color: @deepblue;
     }
+    .date-select.el-picker__popper.el-popper[role="tooltip"] .el-picker-panel .el-date-picker__editor-wrap 
+    .el-time-panel .el-time-panel__footer{
+        background: @deepblue;
+    }
+    .el-picker-panel .el-time-panel__btn.cancel{
+        color: @white;
+    }
+    .el-time-panel__btn.confirm{
+        color: @black;
+    }
+
     .el-picker-panel .el-picker-panel__footer .el-button--text{
         color: @white;
     }

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

@@ -18,7 +18,7 @@
 	.btn.green,.btn:hover{
 		color: @deepblue;
 		border-color: @deepblue;
-		background: rgba(54, 52, 142, 0.2);
+		background: rgba(@deepblueBg, 0.2);
 	}
 	
 	.el-select__popper.select,.el-picker__popper{

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

@@ -1,43 +1,53 @@
 @import "./setting.less";
 
 #appBody.light {
-	// 基础矩阵白色主题样式
-    .panel-body{
-        background:@white;
+
+    // 基础矩阵白色主题样式
+    .panel-body {
+        background: @white;
         transition: @transition;
     }
-    .card-panel .card-left .tag{
+
+    .card-panel .card-left .tag {
         color: @black;
     }
-    .light-matrix .panel{
+
+    .light-matrix .panel {
         background-color: gainsboro;
     }
-    .green[data-v-065abbc5]{
+
+    .green[data-v-065abbc5] {
         color: @green;
     }
-    .green[data-v-6a0a9536]{
+
+    .green[data-v-6a0a9536] {
         color: @green;
     }
-    .light-matrix .panel-box .panel-title .panel-title-name[data-v-065abbc5]{
+
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-065abbc5] {
         font-size: 1.296vh;
         color: @deepblue;
         font-weight: bold;
     }
-    .svg-icon.svg-icon-green svg use{
+
+    .svg-icon.svg-icon-green svg use {
         fill: @deepblue;
     }
+
     //明细矩阵
-    .light-matrix .panel-box .panel-title .panel-title-name[data-v-e0caa1f6]{
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-e0caa1f6] {
         color: @deepblue;
         font-weight: bold;
     }
+
     //欠发矩阵
-    .light-matrix .panel-box .panel-title .panel-title-name[data-v-6a0a9536]{
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-6a0a9536] {
         color: @deepblue;
         font-weight: bold;
     }
+
     //光伏矩阵
-    .light-matrix .panel-box .panel-title .panel-title-name[data-v-55c30df5]{
+    .light-matrix .panel-box .panel-title .panel-title-name[data-v-55c30df5] {
         color: @deepblue;
         font-weight: bold;
     }
@@ -47,127 +57,184 @@
     .wind-site-base-info .generation {
         background: @white;
     }
+
     //基本信息-日发电量2
     .el-col-10 {
         background: @white;
     }
+
     //基本信息-日发电量右侧
-    .wind-site-warning[data-v-40a70b04]{
+    .wind-site-warning[data-v-40a70b04] {
         background: @white;
         transition: @transition;
     }
+
     //右侧导航栏第一个-天气
-    .wind-site-weather[data-v-ccb406f8]{
+    .wind-site-weather[data-v-ccb406f8] {
         background: @white;
         transition: @transition;
     }
+
+    .wind-site-base-info .wind-site-name {
+        border: 1px solid @deepblue;
+    }
+
+    .title[data-v-2c3073c8] {
+        font-weight: bold;
+    }
+
     //右侧导航栏第一个-最右侧
-    .light-matrix-small{
+    .light-matrix-small {
         background: @white;
         transition: @transition;
     }
+
     //最右侧导航
-    .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box[data-v-3b6e4be5]{
+    .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box[data-v-3b6e4be5] {
         background-color: @white;
         transition: @transition;
     }
+
     .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box .page-common-body-menu-item[data-v-3b6e4be5] {
         border: 0.093vh solid @deepblue;
     }
-  
+
     //右侧导航栏第二个底色
-     .df-table .custom-table.el-table{
+    .df-table .custom-table.el-table {
         background: @white;
         transition: @transition;
     }
-    .general-appearance-body{
+
+    .general-appearance-body {
         background: @white;
         transition: @transition;
     }
-    .booster-station-body{
+
+    .booster-station-body {
         background: @white;
         transition: @transition;
     }
-    .Inverter-Info .box-main .Inverter-Info-body .Inverter-Info-title{
+
+    .Inverter-Info .box-main .Inverter-Info-body .Inverter-Info-title {
         position: relative;
         background: @white;
         transition: @transition;
     }
-    .Inverter-Info .box-main .Inverter-Info-body .Inverter-Info-title .title-tools-left{
+
+    //场站监视
+    .Inverter-Info .box-main .Inverter-Info-body .Inverter-Info-title .title {
+        color: @deepblue;
+        font-weight: bold;
+    }
+
+    .Inverter-Info .box-main .Inverter-Info-body .Inverter-Info-title .title-tools-left {
         color: @black;
     }
-    table.table-form.mg-b-8{
+
+    table.table-form.mg-b-8 {
         background: @white;
         transition: @transition;
     }
-    .Inverter-Info .box-main .Inverter-Info-body .inverter-datas .inverter-item .inverter-item-info .states{
+
+    .Inverter-Info .box-main .Inverter-Info-body .inverter-datas .inverter-item .inverter-item-info .states {
         background: @white;
         transition: @transition;
     }
-    .com-collapse .collapse-box .collapse-items .item.active{
+
+    .com-collapse .collapse-box .collapse-items .item.active {
         color: @deepblue;
         cursor: pointer;
         font-weight: bold;
     }
-    .matrix .panel-title .panel-title-name[data-v-2e858362]{
+
+    .matrix .panel-title .panel-title-name[data-v-2e858362] {
         color: @deepblue;
     }
-    .com-panel.line{
+
+    .com-panel.line {
         margin-left: 1px;
         z-index: 1;
     }
-    .wave{
+
+    .wave {
         z-index: 1;
-        // background: @white;
-        // transition: @transition;
     }
-    .svg-icon.svg-icon-write svg use{
+
+    .svg-icon.svg-icon-write svg use {
         fill: @black;
     }
-    .svg-icon.svg-icon-gray-l svg use{
+
+    .svg-icon.svg-icon-gray-l svg use {
         fill: @black;
     }
-	
-	// 状态监视白色主题样式
-	.status-panel .status-com-panel .p-body .category-box[data-v-74094c42]{
-		width: 100%;
-		background-color: @white;
-		transition : @transition;
-		display: flex;
-		margin-bottom: 0.37vh;
-	}
-	.el-scrollbar__wrap{
-		background: @white;
-		transition : @transition;
-	}
-	.map-1 .btn-group-tabs[data-v-0ec6dd0b]{
-		display: flex;
-		flex-direction: row;
-		background: @white;
-		height: 50px;
-	}
-	.status-panel .status-com-panel .p-body .item-box .data-item.light[data-v-74094c42]{
-		background-color: @deepblue;
-		position: relative;
-	}
-	.status-panel .status-com-panel .p-body .category-box .score span[data-v-74094c42]{
-		color: @deepblue;
-	}
-//驾驶舱模块-Agc白色主题样式
-	.com-panel2 .panel-header2 .panel-tools2{
-		color: @black;
-		opacity: 0.3;
-	}
-	.panel-table .data-item .data-item-count{
-		color: @deepblue;
-	}
-    .com-panel2 .panel-header2 .panel-title2{
+
+    // 状态监视白色主题样式
+    .status-panel .status-com-panel .p-body .category-box[data-v-74094c42] {
+        width: 100%;
+        background-color: @white;
+        transition: @transition;
+        display: flex;
+        margin-bottom: 0.37vh;
+    }
+
+    .el-scrollbar__wrap {
+        background: @white;
+        transition: @transition;
+    }
+
+    .map-1 .btn-group-tabs[data-v-0ec6dd0b] {
+        display: flex;
+        flex-direction: row;
+        background: @white;
+        height: 50px;
+    }
+
+    .status-panel .status-com-panel .p-body .item-box .data-item.light[data-v-74094c42] {
+        background-color: @deepblue;
+        position: relative;
+    }
+
+    .status-panel .status-com-panel .p-body .category-box .score span[data-v-74094c42] {
         color: @deepblue;
     }
-        
-	// 风场
-	.station-tip{
-		  background-color: @gray-l;
-		  color: @black;
-	}
+
+    //驾驶舱模块-Agc白色主题样式
+    .com-panel2 .panel-header2 .panel-tools2 {
+        color: @black;
+        opacity: 0.3;
+    }
+
+    .panel-table .data-item .data-item-count {
+        color: @deepblue;
+    }
+
+    .com-panel2 .panel-header2 .panel-title2 {
+        color: @deepblue;
+    }
+
+    .com-panel2.green .panel-header2 .panel-title2 .panel-icon2 {
+        color: @black;
+    }
+
+    .com-panel2.green .panel-header2::after {
+        background-image: linear-gradient(to right, @white, rgba(5, 187, 76, 0));
+    }
+
+    // 风场
+    .station-tip {
+        background-color: @gray-l;
+        color: @black;
+    }
+
+    .el-table td.light,
+    .df-table .el-table td.light,
+    .main-body .custom-table.el-table td.light,
+    .df-table .custom-table.el-table td.light,
+    .main-body .el-table td.always-light,
+    .df-table .el-table td.always-light,
+    .main-body .custom-table.el-table td.always-light,
+    .df-table .custom-table.el-table td.always-light {
+        color: @deepblue  !important;
+        font-weight: bold;
+    }
 }

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

@@ -319,8 +319,6 @@
     }
 
     .main-body {
-        margin-left: 66px;
-        max-width  : calc(100vw - 54px - 12px);
         transition : @transition;
     }
 

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

@@ -5,65 +5,267 @@
 #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-picker-panel .el-picker-panel__footer .el-button.is-plain{
+
+
+    //原始数据查询-测点历史数据查询
+    .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{
+
+    .el-date-editor.el-date-editor--datetimerange .el-range-input {
         color: @black;
     }
-    .el-date-editor.el-date-editor--datetimerange .el-range-separator{
+
+    .el-date-editor.el-date-editor--datetimerange .el-range-separator {
         color: @black;
     }
-    .main-body .el-card .el-card__header{
+
+    .main-body .el-card .el-card__header {
         color: @black;
         background: @white;
     }
-    .el-radio.is-bordered.el-radio--small .el-radio__label{
+
+    .el-radio.is-bordered.el-radio--small .el-radio__label {
         color: @black;
     }
-    .el-radio.is-bordered.is-checked{
+
+    .el-radio.is-bordered.is-checked {
         border-color: @deepblue;
     }
-    .el-radio.is-checked .el-radio__inner{
+
+    .el-radio.is-checked .el-radio__inner {
         background: @deepblue;
         border-color: @deepblue;
     }
-    .el-radio.is-checked .el-radio__label{
+
+    .el-radio.is-checked .el-radio__label {
         color: @deepblue;
     }
-    .el-tree{
+
+    .el-tree {
         color: @black;
         background: @white;
     }
-    .el-tree-node__expand-icon{
+
+    .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 td {
+        color: @black  !important;
+    }
+
+    .el-input__prefix {
+        color: @black;
+    }
+
+    .el-input__suffix {
         color: @black;
     }
-    .el-tree.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
+
+    .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-tree .el-tree-node__content:hover, body .el-tree .el-upload-list__item:hover{
+
+    .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-picker-panel.el-date-picker td.current .cell{
+        background-color: rgba(@deepblueBg, 0.2);
+        color: @deepblue;
+    }   
+
+    //设备管理
+    .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;
+    }
+    .el-time-panel__footer{
+        background: @deepblue;
+    }
+
+    .swiperBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover,
+    .itemBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover {
+        border: 3px solid @deepblue;
+    }
+
+    .el-picker-panel.el-date-range-picker .el-date-range-picker__time-header 
+    .el-date-range-picker__time-picker-wrap 
+    .el-time-panel .el-time-spinner__item:hover:not(.disabled):not(.active){
         color: @deepblue;
         font-weight: bold;
     }

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

@@ -9,3 +9,5 @@
 @gray-l     : #B3BDC0;
 @darkgray-1 : #7b7d7e;
 @green      : #05bb4c;
+@deepblueBg : 54, 52, 142;
+@gray-2:#dcdddf;

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

@@ -399,7 +399,47 @@
 				}
 		  }
 	  }
-	   
+  }
+  .el-time-panel__btn.confirm {
+    color: @deepblue;
+  }
+  
+  // .el-time-panel__btn.cancel {
+  //   color: @gray;
+  // }
+  .health-6 .header-info .selections .item:hover i svg use, .health-6 .header-info .selections .item.active i svg use {
+      fill: @deepblue;
+  }
+  .health-matrix{
+	  .green{
+		  color:@green;
+	  }
+	  .health-matrix-panel {
+		  .header{
+			  .svg-icon svg use{
+				  fill:@black;
+			  }
+			  .tools .tool-block .legend-value{
+			  		color: @black;
+			  }
+		  } 
+	  }
   }
   
+  .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box {
+	  .page-common-body-menu-item{
+	  	  border: 0.093vh solid rgba(@deepblue, 0.4);
+		  &.active{
+			  background:transparent;
+			  border: 0.093vh solid #edbf03;
+			  &::after{
+				border: 0.093vh solid #edbf03;
+			  }
+		  }
+	  }
+  }
+  .main-body input{
+	  color:@black;
+	  background:@white;
+  }
 }

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/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,
           },
         },
@@ -787,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/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/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

@@ -94,7 +94,13 @@ export default {
       return result;
     },
     initChart() {
-		let themeName = this.$store.state.themeName.split(' ')[1];
+		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;
 		

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/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

@@ -575,6 +575,11 @@ const routes = [{
 	name: "Supervised",
 	component: () => import("../views/MalfunctionWarning/supervised.vue")
 },
+{
+	path: "/health/MalfunctionWarning/diagnose", //齿轮箱故障诊断
+	name: "Supervised",
+	component: () => import("../views/MalfunctionWarning/diagnose.vue")
+},
 /***********************************************************智慧检修************************************************************* */
 /***********************************************************安全管控************************************************************* */
 {

src/store/index.js

@@ -11,6 +11,7 @@ const state = {
   themeName: localStorage.getItem("themeName") || "dark", // 主题
   menuData: [],
   windturbineMap: {},
+  moudleName: "",
 };
 
 //改变状态的方法
@@ -26,6 +27,9 @@ const mutations = {
   },
   changeMenuData(state, newData) {
     state.menuData = newData;
+  },
+  changeModuleName(state, newData) {
+    state.moudleName = newData;
   }
 };
 
@@ -38,6 +42,9 @@ const actions = {
   },
   changeMenuData(context, str) {
     context.commit("changeMenuData", str);
+  },
+  changeModuleName(context, str) {
+    context.commit("changeModuleName", str);
   }
 };
 

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

@@ -427,6 +427,7 @@ export default {
           sort: "",
         },
         success(res) {
+			console.log(JSON.stringify(res))
           var name = [],
             data = [],
             llfdl = [],
@@ -439,6 +440,16 @@ export default {
               "性能损失",
             ],
             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);
             data.push([

src/views/Decision/Decision1Mx.vue

@@ -428,7 +428,6 @@
 						sort: ''
 					},
 					success(res) {
-						console.log(res)
 						var name = [],
 							data = [],
 							llfdl = [],
@@ -436,6 +435,17 @@
 								"手动停机", "正常发电", "缺陷降出"
 							],
 							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);

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/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

@@ -271,10 +271,11 @@ export default {
       this.$emit("mapClicks", wpId, this.tabs[index].text);
     },
     backMap(wpId, planBtnName) {
+		this.activeTab = 0;
       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 +284,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/diagnose.vue

@@ -0,0 +1,211 @@
+<template>
+	<div>
+		<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="station" placeholder="请选择" popper-class="select" @change="stationChange">
+							<el-option v-for="item in stations" :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="model" multiple collapse-tags clearable placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in fjxh" :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="fj" collapse-tags placeholder="请选择" popper-class="select">
+							<el-option v-for="item in fjArr" :key="item.id" :value="item.id" :label="item.name">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-actions">
+					<button class="btn" @click="query">查询</button>
+				</div>
+			</div>
+		</div>
+		<el-row type="flex">
+			<el-col :span="12">
+				<el-row type="flex">
+					<el-col :span="12">
+						<div style="height: 60vh; overflow-y: auto; margin-top: 30px">
+						    <div class="body" v-for="(item, index) in ccS" :key="index" @click="chooses(index)" >
+						      <div class="left">
+						        <div :class="index === current ? 'round_on' : 'round'"></div>
+						        <div class="line"></div>
+						      </div>
+						      <div class="right">
+						        <div>{{ item.showTime }}</div>
+						        <div class="content">
+						          <div class="names">
+						            {{ item.showName || item.ducumentName }}
+						          </div>
+						          <button class="btn" @click="deleteDate(item.name)">
+						            删除
+						          </button>
+						        </div>
+						      </div>
+						    </div>
+						</div>
+					</el-col>
+					<el-col :span="12">
+						
+					</el-col>
+				</el-row>
+				
+				
+			</el-col>
+		</el-row>
+	</div>
+</template>
+<script>
+	export default {
+		components: {
+
+		},
+		created() {
+			this.startAjax();
+		},
+		data() {
+			return {
+				stations: [],
+				station: '',
+				model: [],
+				fjxh: [],
+				fjxhArr: [],
+				fjArr: [], //风机
+				fj: ''
+			};
+		},
+		methods: {
+			stationChange() {
+				let fjxh = [];
+				this.fjxhArr.forEach(ele => {
+					if (ele.id == this.station) {
+						ele.value.forEach(ele2 => {
+							fjxh.push({
+								label: ele2,
+								value: ele2
+							})
+						})
+						this.model = ele.value;
+					}
+				})
+				this.fjxh = fjxh;
+			},
+			async startAjax() {
+				var that = this;
+				await that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "basic/station/all",
+					success(res) {
+						that.stations = res.data;
+						that.station = res.data[1].id;
+						let fjxhArr = [];
+						let model = [],
+							fjxh = [];
+						res.data.forEach(ele => {
+							fjxhArr.push({
+								id: ele.id,
+								value: ele.model.split("/")
+							})
+							if (ele.id == "NSS_FDC") {
+								model = ["UP82"];
+								fjxh.push({
+									label: "UP82",
+									value: "UP82"
+								})
+							}
+						})
+						that.fjxhArr = fjxhArr;
+						that.model = model;
+						that.fjxh = fjxh;
+					},
+				});
+				// that.list()
+			},
+		},
+		watch: {
+			station(e) {
+				let that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wtList",
+					data: {
+						wpid: e,
+					},
+					success(res) {
+						that.fjArr = res.data;
+						that.fj = res.data[0].id;
+					},
+				});
+			}
+		}
+	};
+</script>
+<style lang="less" scoped>
+.body {
+  display: flex;
+  flex-direction: row;
+  height: 75px;
+  width: 100%;
+
+  .left {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 30px;
+    margin-left: 30px;
+
+    .round_on {
+      width: 20px;
+      height: 27px;
+      border-radius: 50%;
+      background-color: rgb(30, 209, 45);
+    }
+    .round {
+      width: 20px;
+      height: 27px;
+      border-radius: 50%;
+      background-color: crimson;
+    }
+
+    .line {
+      width: 2px;
+      height: 100%;
+      background-color: #ffffff;
+    }
+  }
+
+  .right {
+    width: 100%;
+    margin-left: 20px;
+
+    .content {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 10px;
+
+      .btn {
+        margin-right: 20px;
+      }
+    }
+  }
+}
+</style>

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-1.vue

@@ -15,7 +15,7 @@
 					<div class="query-item">
 						<div class="lable">开始日期：</div>
 						<div class="search-input">
-							<el-date-picker v-model="startdate" type="datetime" placeholder="选择日期"
+							<el-date-picker v-model="startdate" type="date" placeholder="选择日期"
 								popper-class="date-select">
 							</el-date-picker>
 						</div>
@@ -23,7 +23,7 @@
 					<div class="query-item">
 						<div class="lable">结束日期：</div>
 						<div class="search-input">
-							<el-date-picker v-model="enddate" type="datetime" placeholder="选择日期" popper-class="date-select">
+							<el-date-picker v-model="enddate" type="date" placeholder="选择日期" popper-class="date-select">
 							</el-date-picker>
 						</div>
 					</div>
@@ -518,6 +518,7 @@
 			},
 
 			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({
@@ -527,7 +528,7 @@
 					data: {
 						stationid: this.wpvalue,
 						startdate: new Date(this.startdate).formatDate("yyyy-MM-dd"),
-						enddate: new Date(this.enddate).formatDate("yyyy-MM-dd"),
+						enddate: enddate,
 					},
 				});
 				////////

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

@@ -195,6 +195,7 @@ 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/",
@@ -202,7 +203,7 @@ export default {
         data: {
           stId: this.wpvalue,
           endDate: new Date(this.startdate).formatDate("yyyy-MM-dd"),
-          startDate: new Date(this.enddate).formatDate("yyyy-MM-dd"),
+          startDate: enddate,
         },
       });
       ////////

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/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/mch.vue

@@ -1752,51 +1752,19 @@
 								</text>
 								<text transform="matrix(1 0 0 1 220.0471 776.1514)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									输入电压(
-								</text>
-								<text transform="matrix(1 0 0 1 285.0559 776.5879)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									V
-								</text>
-								<text transform="matrix(1 0 0 1 293.1721 776.5879)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									输入电压(V):
 								</text>
 								<text transform="matrix(1 0 0 1 209.4182 812.1738)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									输出功率(
-								</text>
-								<text transform="matrix(1 0 0 1 274.427 812.6104)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									kW
-								</text>
-								<text transform="matrix(1 0 0 1 293.1721 812.6104)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									输出功率(kW):
 								</text>
 								<text transform="matrix(1 0 0 1 202.0281 848.1982)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									日发电量(
-								</text>
-								<text transform="matrix(1 0 0 1 267.0393 848.6348)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									kWh
-								</text>
-								<text transform="matrix(1 0 0 1 293.1721 848.6348)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									日发电量(kWh):
 								</text>
 								<text transform="matrix(1 0 0 1 196.8381 884.2197)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									总发电量(
-								</text>
-								<text transform="matrix(1 0 0 1 261.8479 884.6563)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									MWh
-								</text>
-								<text transform="matrix(1 0 0 1 293.1721 884.6563)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									总发电量(MWh):
 								</text>
 							</g>
 							<g id="block">
@@ -2076,249 +2044,249 @@
 							</g>
 							<g id="data">
 								<g>
-									<text transform="matrix(1 0 0 1 66.5408 137.6816)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 66.5408 137.6816)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchuakvz }}
 									</text>
-									<text transform="matrix(1 0 0 1 66.5393 155.377)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 66.5393 155.377)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchubkvz }}
 									</text>
-									<text transform="matrix(1 0 0 1 66.5393 176.043)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 66.5393 176.043)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchuckvz }}
 									</text>
-									<text transform="matrix(1 0 0 1 66.5393 196.5479)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 66.5393 196.5479)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchuabkvz }}
 									</text>
-									<text transform="matrix(1 0 0 1 66.5393 217.0479)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 66.5393 217.0479)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchubckvz }}
 									</text>
-									<text transform="matrix(1 0 0 1 66.5393 237.5479)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 66.5393 237.5479)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchucakvz }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 698.8943 76.8887)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 698.8943 76.8887)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchlaas }}
 									</text>
-									<text transform="matrix(1 0 0 1 698.8933 96.584)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 698.8933 96.584)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchpmws }}
 									</text>
-									<text transform="matrix(1 0 0 1 698.8933 117.251)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 698.8933 117.251)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchqkvars }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 698.8943 222.0996)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 698.8943 222.0996)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchlaax }}
 									</text>
-									<text transform="matrix(1 0 0 1 698.8933 241.7939)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 698.8933 241.7939)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchpmwx }}
 									</text>
-									<text transform="matrix(1 0 0 1 698.8933 262.4619)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 698.8933 262.4619)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchqkvarx }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1693.9841 137.6816)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1693.9841 137.6816)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchuakvy }}
 									</text>
-									<text transform="matrix(1 0 0 1 1693.9841 155.377)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1693.9841 155.377)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchubkvy }}
 									</text>
-									<text transform="matrix(1 0 0 1 1693.9841 176.043)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1693.9841 176.043)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchuckvy }}
 									</text>
-									<text transform="matrix(1 0 0 1 1693.9841 196.5479)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1693.9841 196.5479)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchuabkvy }}
 									</text>
-									<text transform="matrix(1 0 0 1 1693.9841 217.0479)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1693.9841 217.0479)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchubckvy }}
 									</text>
-									<text transform="matrix(1 0 0 1 1693.9841 237.5479)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1693.9841 237.5479)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchucakvy }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 188.946 425.3447)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 188.946 425.3447)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla515 }}
 									</text>
-									<text transform="matrix(1 0 0 1 188.946 443.0391)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 188.946 443.0391)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp515 }}
 									</text>
-									<text transform="matrix(1 0 0 1 188.946 463.7061)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 188.946 463.7061)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq515 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 331.1042 425.3447)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 331.1042 425.3447)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla514 }}
 									</text>
-									<text transform="matrix(1 0 0 1 331.1042 443.0391)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 331.1042 443.0391)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp514 }}
 									</text>
-									<text transform="matrix(1 0 0 1 331.1042 463.7061)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 331.1042 463.7061)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq514 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 484.4583 536.2705)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 484.4583 536.2705)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla513 }}
 									</text>
-									<text transform="matrix(1 0 0 1 484.4568 553.9658)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 484.4568 553.9658)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp513 }}
 									</text>
-									<text transform="matrix(1 0 0 1 484.4568 574.6318)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 484.4568 574.6318)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq513 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 611.0935 427.9131)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 611.0935 427.9131)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla512 }}
 									</text>
-									<text transform="matrix(1 0 0 1 611.0935 445.6084)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 611.0935 445.6084)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp512 }}
 									</text>
-									<text transform="matrix(1 0 0 1 611.0935 466.2744)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 611.0935 466.2744)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq512 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 738.4377 499.6943)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 738.4377 499.6943)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla511 }}
 									</text>
-									<text transform="matrix(1 0 0 1 738.4377 517.3887)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 738.4377 517.3887)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp511 }}
 									</text>
-									<text transform="matrix(1 0 0 1 738.4377 538.0557)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 738.4377 538.0557)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq511 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 843.4377 434.0557)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 843.4377 434.0557)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla521 }}
 									</text>
-									<text transform="matrix(1 0 0 1 843.4377 451.751)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 843.4377 451.751)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp521 }}
 									</text>
-									<text transform="matrix(1 0 0 1 843.4377 472.418)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 843.4377 472.418)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq521 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 981.4373 434.0557)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 981.4373 434.0557)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla522 }}
 									</text>
-									<text transform="matrix(1 0 0 1 981.4373 451.751)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 981.4373 451.751)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp522 }}
 									</text>
-									<text transform="matrix(1 0 0 1 981.4373 472.418)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 981.4373 472.418)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq522 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1122.4373 434.0557)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1122.4373 434.0557)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla523 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1122.4373 451.751)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1122.4373 451.751)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp523 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1122.4373 472.418)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1122.4373 472.418)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq523 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1264.2478 427.9131)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1264.2478 427.9131)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla524 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1264.2478 445.6084)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1264.2478 445.6084)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp524 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1264.2478 466.2744)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1264.2478 466.2744)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq524 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1404.4998 498.5186)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1404.4998 498.5186)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mch1hla525 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1404.4998 516.2139)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1404.4998 516.2139)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mch1hp525 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1404.4998 536.8809)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1404.4998 536.8809)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mch1hq525 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1538.9998 433.6875)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1538.9998 433.6875)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla526 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1538.9998 451.3818)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1538.9998 451.3818)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp526 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1538.9998 472.0498)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1538.9998 472.0498)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq526 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1689.2361 436.624)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1689.2361 436.624)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchla527 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1689.2361 454.3184)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1689.2361 454.3184)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchp527 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1689.2361 474.9854)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1689.2361 474.9854)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.mchq527 }}
 									</text>
@@ -2786,6 +2754,7 @@
 <script>
 	import previewPicture from "../previewPicture.vue";
 	import { BoosterStation } from "./BoosterStation";
+	import $ from "jquery";
 	export default {
 		components: {
 			previewPicture
@@ -2800,10 +2769,38 @@
 		},
 		created() {
 			this.boosterStation = new BoosterStation();
-
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		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 bracket = that.text().indexOf('(');//判断是否包含(
+						let zn = /.*[\u4e00-\u9fa5]+.*$/.test(that.text()); //判断是否包含中文
+						let num = /[0-9]+.?[0-9]/g.test(that.text())
+						if (fill === '#FFFFFF' && !isNaN(txt) && !zn) {
+							that.attr('fill', '#000');
+						}
+						else if(fill === '#FFFFFF' && bracket != -1){
+							that.attr('fill', '#000');
+						}
+					}
+					for (let i = 0; i < $('#data text').length; i++) {
+						let that = $('#data text').eq(i);
+						let fill = that.attr('fill');
+						if (fill === '#3B8646') {
+							that.attr('fill', '#FFFFFF');
+						}else{
+							that.attr('fill', '#000');
+						}
+					}
+				}
+			})
+		},
 		methods: {
 			closed() {
 				clearInterval(this.interval);
@@ -2841,4 +2838,13 @@
 		width: 90%;
 		height: 90%;
 	}
+	.light #other line[stroke="#FFFFFF"]{
+		stroke:#000000;
+	}
+	.light #other rect[stroke="#F7F9F9"]{
+		stroke:#000000;
+	}
+	.light #other text[fill="#FFFFFF"][font-size="11.6452"]{
+		fill:#000000;
+	}
 </style>

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

@@ -2839,15 +2839,7 @@
 									<g>
 										<text transform="matrix(1 0 0 1 -15.5959 841.4775)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
-											la(
-										</text>
-										<text transform="matrix(1 0 0 1 -3.1858 841.4775)" fill="#FFFFFF"
-											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											A
-										</text>
-										<text transform="matrix(1 0 0 1 2.8728 841.4775)" fill="#FFFFFF"
-											font-family="'MicrosoftYaHei'" font-size="10.7648">
-											):
+											la(A):
 										</text>
 										<text transform="matrix(1 0 0 1 -28.76 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2855,15 +2847,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 -28.0549 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
-											Q(
-										</text>
-										<text transform="matrix(1 0 0 1 -15.6868 893.1807)" fill="#FFFFFF"
-											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											kVar
-										</text>
-										<text transform="matrix(1 0 0 1 2.8728 893.1807)" fill="#FFFFFF"
-											font-family="'MicrosoftYaHei'" font-size="10.7648">
-											):
+											Q(kVar):
 										</text>
 									</g>
 								</g>
@@ -4904,255 +4888,255 @@
 								</g>
 							</g>
 							<g id="data">
-								<text transform="matrix(1 0 0 1 71.3208 86.3582)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 71.3208 86.3582)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuakv2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 71.3203 106.0535)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 71.3203 106.0535)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuabkv2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 71.3203 126.7195)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 71.3203 126.7195)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nss3uov2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 71.3203 148.2234)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 71.3203 148.2234)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssfhz2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 487.9116 73.7937)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 487.9116 73.7937)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsslaa2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 487.9111 92.489)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 487.9111 92.489)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspmw2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 487.9111 113.157)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 487.9111 113.157)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 487.9111 133.4753)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 487.9111 133.4753)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuxkv2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 487.9111 154.1511)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 487.9111 154.1511)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsscos2j }}
 								</text>
-								<text transform="matrix(1 0 0 1 1060.2461 73.7937)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1060.2461 73.7937)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsslaa2jy }}
 								</text>
-								<text transform="matrix(1 0 0 1 1060.2441 92.489)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1060.2441 92.489)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspmw2jy }}
 								</text>
-								<text transform="matrix(1 0 0 1 1060.2441 113.157)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1060.2441 113.157)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar2jy }}
 								</text>
-								<text transform="matrix(1 0 0 1 1060.2441 133.4753)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1060.2441 133.4753)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar2jy }}
 								</text>
-								<text transform="matrix(1 0 0 1 1060.2441 154.1511)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1060.2441 154.1511)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuxkv2jy }}
 								</text>
-								<text transform="matrix(1 0 0 1 1640.2461 95.1296)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1640.2461 95.1296)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsslaa2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 1640.2441 113.825)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1640.2441 113.825)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspkw2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 1640.2441 134.4929)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1640.2441 134.4929)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqkvar2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 1640.2441 154.1511)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1640.2441 154.1511)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsscos2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 1779.5313 96.1335)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1779.5313 96.1335)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuakv2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 1779.5313 115.8289)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1779.5313 115.8289)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuabkv2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 1779.5313 136.4949)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1779.5313 136.4949)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nss3uov2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 1779.5313 157.9988)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1779.5313 157.9988)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssfhz2y }}
 								</text>
-								<text transform="matrix(1 0 0 1 69.9092 412.405)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 69.9092 412.405)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuakv1zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 69.9087 431.1003)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 69.9087 431.1003)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuabkv1zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 69.9087 451.7683)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 69.9087 451.7683)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									-.--
 								</text>
-								<text transform="matrix(1 0 0 1 69.9087 472.0867)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 69.9087 472.0867)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									-.--
 								</text>
-								<text transform="matrix(1 0 0 1 552.8096 281.4167)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8096 281.4167)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsslaa1zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 300.1121)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 300.1121)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspmw1zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 320.78)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 320.78)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar1zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 341.741)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 341.741)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsscos1zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8096 362.2957)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8096 362.2957)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssdw1zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 381.991)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 381.991)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssymwd1zb1 }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 402.657)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 402.657)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssymwd1zb2 }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8096 422.4285)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8096 422.4285)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsslaa1zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 441.1238)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 441.1238)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspmw1zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 461.7917)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 461.7917)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar1zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 552.8091 482.7527)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 552.8091 482.7527)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsscos1zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 711.8936 412.405)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 711.8936 412.405)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuakv2zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 711.8931 431.1003)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 711.8931 431.1003)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuabkv2zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 711.8931 451.7683)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 711.8931 451.7683)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nss3uo2zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 711.8931 472.0867)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 711.8931 472.0867)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssfhz2zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2656 281.4167)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2656 281.4167)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsslaa2zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 300.1121)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 300.1121)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspmw2zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 320.78)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 320.78)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar2zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 341.741)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 341.741)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsscos2zbs }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2656 362.2957)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2656 362.2957)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssdw2zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 381.991)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 381.991)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssymwd2zb1 }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 402.657)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 402.657)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssymwd2zb2 }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2656 422.4285)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2656 422.4285)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nss2laa2zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 441.1238)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 441.1238)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspmw2zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 461.7917)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 461.7917)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar2zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 1106.2637 482.7527)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1106.2637 482.7527)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsscos2zbx }}
 								</text>
-								<text transform="matrix(1 0 0 1 1352.8184 412.405)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1352.8184 412.405)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuakv3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1352.8184 431.1003)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1352.8184 431.1003)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssuabkv3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1352.8184 451.7683)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1352.8184 451.7683)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nss3uov3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1352.8184 472.0867)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1352.8184 472.0867)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssfhz3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1649.1641 362.2957)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1649.1641 362.2957)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssdw3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1649.1621 381.991)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1649.1621 381.991)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssymwd3zb1 }}
 								</text>
-								<text transform="matrix(1 0 0 1 1649.1621 402.657)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1649.1621 402.657)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssymwd3zb2 }}
 								</text>
-								<text transform="matrix(1 0 0 1 1649.1641 422.4285)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1649.1641 422.4285)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsslaa3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1649.1621 441.1238)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1649.1621 441.1238)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsspmw3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1649.1621 461.7917)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1649.1621 461.7917)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nssqmvar3zb }}
 								</text>
-								<text transform="matrix(1 0 0 1 1649.1621 482.7527)" fill="#1A823B"
+								<text transform="matrix(1 0 0 1 1649.1621 482.7527)" fill="#3B8646"
 									font-family="'MicrosoftYaHei'" font-size="9.463">
 									{{ ajaxData.nsscos3zb }}
 								</text>
@@ -5419,9 +5403,8 @@
 </template>
 <script>
 	import previewPicture from "../previewPicture.vue";
-	import {
-		BoosterStation
-	} from "./BoosterStation";
+	import {BoosterStation} from "./BoosterStation";
+	import $ from "jquery";
 	export default {
 		components: {
 			previewPicture
@@ -5439,6 +5422,35 @@
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		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 bracket = that.text().indexOf('(');//判断是否包含(
+						let zn = /.*[\u4e00-\u9fa5]+.*$/.test(that.text()); //判断是否包含中文
+						let num = /[0-9]+.?[0-9]/g.test(that.text())
+						if (fill === '#FFFFFF' && !isNaN(txt) && !zn) {
+							that.attr('fill', '#000');
+						}
+						else if(fill === '#FFFFFF' && bracket != -1){
+							that.attr('fill', '#000');
+						}
+					}
+					for (let i = 0; i < $('#data text').length; i++) {
+						let that = $('#data text').eq(i);
+						let fill = that.attr('fill');
+						if (fill === '#3B8646') {
+							that.attr('fill', '#FFFFFF');
+						}else{
+							that.attr('fill', '#000');
+						}
+					}
+				}
+			})
+		},
 		methods: {
 			closed() {
 				clearInterval(this.interval);

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

@@ -1518,163 +1518,163 @@
 							</g>
 							<g id="data">
 								<g>
-									<text transform="matrix(1 0 0 1 150.9871 155.4553)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 150.9871 155.4553)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
-									<text transform="matrix(1 0 0 1 150.9875 114.092)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 150.9875 114.092)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
-									<text transform="matrix(1 0 0 1 150.9871 134.7874)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 150.9871 134.7874)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
-									<text transform="matrix(1 0 0 1 150.9871 175.9592)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 150.9871 175.9592)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 752.262 119.8499)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 752.262 119.8499)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1laayt }}
 									</text>
-									<text transform="matrix(1 0 0 1 752.2615 139.5452)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 752.2615 139.5452)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1pkwyt }}
 									</text>
-									<text transform="matrix(1 0 0 1 752.2615 160.2112)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 752.2615 160.2112)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1qkvaryt }}
 									</text>
-									<text transform="matrix(1 0 0 1 752.2615 180.7151)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 752.2615 180.7151)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1cosyt }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1368.6311 109.6018)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1368.6311 109.6018)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1laawg }}
 									</text>
-									<text transform="matrix(1 0 0 1 1368.6311 129.2971)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1368.6311 129.2971)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1pkwwg }}
 									</text>
-									<text transform="matrix(1 0 0 1 1368.6311 149.9651)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1368.6311 149.9651)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1qkvarwg }}
 									</text>
-									<text transform="matrix(1 0 0 1 1368.6311 170.469)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1368.6311 170.469)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1coswg }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 251.8352 278.092)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 251.8352 278.092)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1blaacy }}
 									</text>
-									<text transform="matrix(1 0 0 1 251.8347 296.7874)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 251.8347 296.7874)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1bpcy }}
 									</text>
-									<text transform="matrix(1 0 0 1 251.8347 317.4553)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 251.8347 317.4553)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1bqcy }}
 									</text>
-									<text transform="matrix(1 0 0 1 251.8347 337.9592)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 251.8347 337.9592)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1bcoscy }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 519.3879 278.8108)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 519.3879 278.8108)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1laagf1 }}
 									</text>
-									<text transform="matrix(1 0 0 1 519.3875 297.5061)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 519.3875 297.5061)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1pkwgf1 }}
 									</text>
-									<text transform="matrix(1 0 0 1 519.3875 318.1741)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 519.3875 318.1741)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1qkvargf1 }}
 									</text>
-									<text transform="matrix(1 0 0 1 519.3875 338.678)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 519.3875 338.678)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1cosgf1 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 778.0662 278.8108)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 778.0662 278.8108)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1laagf2 }}
 									</text>
-									<text transform="matrix(1 0 0 1 778.0657 297.5061)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 778.0657 297.5061)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1pkwgf2 }}
 									</text>
-									<text transform="matrix(1 0 0 1 778.0657 318.1741)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 778.0657 318.1741)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1qkvargf2 }}
 									</text>
-									<text transform="matrix(1 0 0 1 778.0657 338.678)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 778.0657 338.678)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1cosgf2 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1053.7756 279.8147)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1053.7756 279.8147)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1laagf3 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1053.7756 298.51)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1053.7756 298.51)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1pkwgf3 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1053.7756 319.176)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1053.7756 319.176)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1qkvargf3 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1053.7756 339.6799)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1053.7756 339.6799)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1cosgf3 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1360.9846 279.8147)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1360.9846 279.8147)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1laagf4 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1360.9846 298.51)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1360.9846 298.51)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1pkwgf4 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1360.9846 319.176)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1360.9846 319.176)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1qkvargf4 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1360.9846 339.6799)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1360.9846 339.6799)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1cosgf4 }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1700.4709 277.8147)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1700.4709 277.8147)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1laagf5 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1700.4709 298.51)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1700.4709 298.51)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1pkwgf5 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1700.4709 319.176)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1700.4709 319.176)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1qkvargf5 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1700.4709 339.6799)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1700.4709 339.6799)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl1cosgf5 }}
 									</text>
@@ -1845,9 +1845,8 @@
 </template>
 <script>
 	import previewPicture from "../previewPicture.vue";
-	import {
-		BoosterStation
-	} from "./BoosterStation";
+	import {BoosterStation} from "./BoosterStation";
+	import $ from "jquery";
 	export default {
 		components: {
 			previewPicture,
@@ -1862,10 +1861,37 @@
 		},
 		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 bracket = that.text().indexOf('(');//判断是否包含(
+						let zn = /.*[\u4e00-\u9fa5]+.*$/.test(that.text()); //判断是否包含中文
+						if (fill === '#FFFFFF' && !isNaN(txt) && !zn) {
+							that.attr('fill', '#000');
+						}
+						else if(fill === '#FFFFFF' && bracket != -1){
+							that.attr('fill', '#000');
+						}
+					}
+					for (let i = 0; i < $('#data text').length; i++) {
+						let that = $('#data text').eq(i);
+						let fill = that.attr('fill');
+						if (fill === '#3B8646') {
+							that.attr('fill', '#FFFFFF');
+						}else{
+							that.attr('fill', '#000');
+						}
+					}
+				}
+			})
+		},
 		methods: {
 			closed() {
 				clearInterval(this.interval);
@@ -1903,4 +1929,13 @@
 		width: 90%;
 		height: 90%;
 	}
+	.light #other line[stroke="#FFFFFF"]{
+		stroke:#000000;
+	}
+	.light #other rect[stroke="#F7F8F8"]{
+		stroke:#000000;
+	}
+	.light #other text[fill="#FFFFFF"][font-size="11.6452"]{
+		fill:#000000;
+	}
 </style>

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

@@ -4,11 +4,11 @@
 			<el-col :span="24">
 				<previewPicture>
 					<template v-slot:svg>
-<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 							version="1.1" id="图层_1" x="0px" y="0px" width="1853.732px" height="885.063px"
 							viewBox="0 0 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
 							xml:space="preserve">
-							<g id="other_1_">
+							<g id="other">
 								<path fill="none" stroke="#42B0A8" stroke-width="2.5" stroke-miterlimit="10"
 									d="M236.472,205.068"></path>
 								<path fill="none" stroke="#42B0A8" stroke-width="2.5" stroke-miterlimit="10"
@@ -54,51 +54,19 @@
 								<rect x="1441.419" y="666.985" fill="#CAA51A" width="190.634" height="2.25"></rect>
 								<text transform="matrix(1 0 0 1 88.1892 770.7983)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									输入电压(
-								</text>
-								<text transform="matrix(1 0 0 1 153.2004 771.2349)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									V
-								</text>
-								<text transform="matrix(1 0 0 1 161.3142 771.2349)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									输入电压(V):
 								</text>
 								<text transform="matrix(1 0 0 1 77.5603 804.8208)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									输出功率(
-								</text>
-								<text transform="matrix(1 0 0 1 142.571 805.2573)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									kW
-								</text>
-								<text transform="matrix(1 0 0 1 161.3142 805.2573)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									输出功率(kW):
 								</text>
 								<text transform="matrix(1 0 0 1 70.1711 838.8452)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									日发电量(
-								</text>
-								<text transform="matrix(1 0 0 1 135.1814 839.2817)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									kWh
-								</text>
-								<text transform="matrix(1 0 0 1 161.3142 839.2817)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									日发电量(kWh):
 								</text>
 								<text transform="matrix(1 0 0 1 64.9802 872.8667)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									总发电量(
-								</text>
-								<text transform="matrix(1 0 0 1 129.9919 873.3032)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									MWh
-								</text>
-								<text transform="matrix(1 0 0 1 161.3142 873.3032)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									总发电量(MWh):
 								</text>
 								<rect x="4.795" y="23.851" fill="#CAA51A" width="1848.938" height="2.25" />
 								<text transform="matrix(1 0 0 1 2.7859 16.979)" fill="#D0D0D0"
@@ -2138,51 +2106,19 @@
 									font-family="'MicrosoftYaHei'" font-size="13.5" letter-spacing="19"></text>
 								<text transform="matrix(1 0 0 1 88.7712 396.1313)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									输入电压(
-								</text>
-								<text transform="matrix(1 0 0 1 153.7795 396.5679)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									V
-								</text>
-								<text transform="matrix(1 0 0 1 161.8962 396.5679)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									输入电压(V):
 								</text>
 								<text transform="matrix(1 0 0 1 78.1418 430.1538)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									输出功率(
-								</text>
-								<text transform="matrix(1 0 0 1 143.1506 430.5903)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									kW
-								</text>
-								<text transform="matrix(1 0 0 1 161.8962 430.5903)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									输出功率(kW):
 								</text>
 								<text transform="matrix(1 0 0 1 70.7517 464.1782)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									日发电量(
-								</text>
-								<text transform="matrix(1 0 0 1 135.7629 464.6147)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									kWh
-								</text>
-								<text transform="matrix(1 0 0 1 161.8962 464.6147)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									日发电量(kWh):
 								</text>
 								<text transform="matrix(1 0 0 1 65.5623 498.1997)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="15">
-									总发电量(
-								</text>
-								<text transform="matrix(1 0 0 1 130.571 498.6362)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="12">
-									MWh
-								</text>
-								<text transform="matrix(1 0 0 1 161.8962 498.6362)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="15">
-									):
+									总发电量(MWh):
 								</text>
 							</g>
 							<g id="kg">
@@ -2722,67 +2658,67 @@
 							</g>
 							<g id="data">
 								<g>
-									<text transform="matrix(1 0 0 1 201.0178 63.3677)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 201.0178 63.3677)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
-									<text transform="matrix(1 0 0 1 201.0173 82.063)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 201.0173 82.063)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 961.53 68.7778)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 961.53 68.7778)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2laagf6 }}
 									</text>
-									<text transform="matrix(1 0 0 1 961.53 86.4722)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 961.53 86.4722)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2pkwgf6 }}
 									</text>
-									<text transform="matrix(1 0 0 1 961.53 106.9009)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 961.53 106.9009)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1629.5847 56.9653)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1629.5847 56.9653)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2laawg2 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1629.5828 74.6606)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1629.5828 74.6606)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2pkwwg2 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1629.5828 95.0884)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1629.5828 95.0884)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2qkvar }}
 									</text>
-									<text transform="matrix(1 0 0 1 1629.5828 115.1001)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1629.5828 115.1001)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2cos }}
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1543.8347 176.269)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1543.8347 176.269)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2laagf7 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1543.8328 193.9634)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1543.8328 193.9634)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2pkwgf7 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1543.8328 214.3921)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1543.8328 214.3921)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										-.--
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1756.3894 173.397)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1756.3894 173.397)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2laa326 }}
 									</text>
-									<text transform="matrix(1 0 0 1 1756.3894 191.0923)" fill="#1A823B"
+									<text transform="matrix(1 0 0 1 1756.3894 191.0923)" fill="#3B8646"
 										font-family="'MicrosoftYaHei'" font-size="9.463">
 										{{ ajaxData.pl2pkw326 }}
 									</text>
@@ -3558,7 +3494,8 @@
 </template>
 <script>
 	import previewPicture from "../previewPicture.vue";
-	import { BoosterStation } from "./BoosterStation";
+	import {BoosterStation} from "./BoosterStation";
+	import $ from "jquery";
 	export default {
 		components: {
 			previewPicture
@@ -3573,19 +3510,47 @@
 		},
 		created() {
 			this.boosterStation = new BoosterStation();
-	
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		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 bracket = that.text().indexOf('(');//判断是否包含(
+						let zn = /.*[\u4e00-\u9fa5]+.*$/.test(that.text()); //判断是否包含中文
+						let num = /[0-9]+.?[0-9]/g.test(that.text())
+						if (fill === '#FFFFFF' && !isNaN(txt) && !zn) {
+							that.attr('fill', '#000');
+						}
+						else if(fill === '#FFFFFF' && bracket != -1){
+							that.attr('fill', '#000');
+						}
+					}
+					for (let i = 0; i < $('#data text').length; i++) {
+						let that = $('#data text').eq(i);
+						let fill = that.attr('fill');
+						if (fill === '#3B8646') {
+							that.attr('fill', '#FFFFFF');
+						}else{
+							that.attr('fill', '#000');
+						}
+					}
+				}
+			})
+		},
 		methods: {
 			closed() {
 				clearInterval(this.interval);
 			},
 			refreshTPData() {
-				this.boosterStation.getDatas("PL2_GDC",this.bindValue);
+				this.boosterStation.getDatas("PL2_GDC", this.bindValue);
 			},
-			bindValue(msg){
-				this.ajaxData=msg;
+			bindValue(msg) {
+				this.ajaxData = msg;
 			},
 		}
 	};
@@ -3610,8 +3575,18 @@
 	}
 
 	.svg {
-		margin-left:5%;
+		margin-left: 5%;
 		width: 90%;
 		height: 90%;
 	}
+	
+	.light #other line[stroke="#FFFFFF"]{
+		stroke:#000000;
+	}
+	.light #other rect[stroke="#F7F9F9"]{
+		stroke:#000000;
+	}
+	.light #other text[fill="#FFFFFF"][font-size="11.6452"]{
+		fill:#000000;
+	}
 </style>

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

@@ -65,7 +65,7 @@
 									<rect x="619.117" y="1.012" opacity="0.7" fill="#600D29" enable-background="new    "
 										width="75.166" height="20.817"></rect>
 									<text transform="matrix(1 0 0 1 637.8503 15.2034)" fill="#FFFFFF"
-										font-family="'MicrosoftYaHei'" font-size="12.5667">简特线</text>
+										font-family="'MicrosoftYaHei'" font-size="12.566">简特线</text>
 								</g>
 								<g>
 									<rect x="529.783" y="145.009" fill="none" stroke="#545281" stroke-miterlimit="10"
@@ -73,7 +73,7 @@
 									<rect x="529.783" y="145.009" opacity="0.7" fill="#2F3068"
 										enable-background="new    " width="52.5" height="20.818"></rect>
 									<text transform="matrix(1 0 0 1 535.7732 159.2014)" fill="#FFFFFF"
-										font-family="'MicrosoftYaHei'" font-size="12.5667">#1进线</text>
+										font-family="'MicrosoftYaHei'" font-size="12.566">#1进线</text>
 								</g>
 								<g>
 									<text transform="matrix(1 0 0 1 670.8552 83.5012)" fill="#FFFFFF"
@@ -89,7 +89,7 @@
 									<rect x="718.783" y="145.009" opacity="0.7" fill="#2F3068"
 										enable-background="new    " width="52.5" height="20.818"></rect>
 									<text transform="matrix(1 0 0 1 724.7732 159.2014)" fill="#FFFFFF"
-										font-family="'MicrosoftYaHei'" font-size="12.5667">#2进线</text>
+										font-family="'MicrosoftYaHei'" font-size="12.566">#2进线</text>
 								</g>
 								<rect x="407.235" y="266.346" opacity="0.9" fill="#1B2522" enable-background="new    "
 									width="80.861" height="12.989"></rect>
@@ -1772,4 +1772,13 @@
 		width: 90%;
 		height: 90%;
 	}
+	.light #other text[font-size="12.5667"],
+	.light #other text[font-size="11.6359"],
+	.light #other text[font-size="13.9275"]{
+		fill:#000000;
+	}
+	.light #data text{
+		fill:#FFFFFF;
+	}
+	
 </style>

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

@@ -5,16 +5,16 @@
 				<previewPicture v-if="datas">
 					<template v-slot:svg>
 						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1111.711px" height="550.14px" viewBox="0 0 1111.711 550.14" enable-background="new 0 0 1111.711 550.14" xml:space="preserve">
-						<g>
+						<g id="other">
 							<g>
 								<polygon fill="#B21F63" points="1003.109,29.538 1009.84,4.413 1016.568,29.538   "/>
 								<rect x="1008.969" y="29.538" fill="#B21F63" width="1.537" height="50.888"/>
 								<rect x="500.114" y="80.427" fill="#B21F63" width="595.531" height="1.537"/>
-								<text transform="matrix(1 0 0 1 1032.9893 52.8999)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.0484">105</text>
+								<text transform="matrix(1 0 0 1 1032.9893 52.8999)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.048">105</text>
 							</g>
 							<g>
 								<rect x="71.679" y="130.277" fill="#B6065C" width="862.731" height="1.537"/>
-								<text transform="matrix(1 0 0 1 455.7104 111.1514)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.0484"> 361 </text>
+								<text transform="matrix(1 0 0 1 455.7104 111.1514)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.048"> 361 </text>
 								<g>
 									<rect x="527.506" y="97.923" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="58.69" height="23.273"/>
 									<rect x="527.506" y="97.923" opacity="0.7" fill="#212967" enable-background="new    " width="58.69" height="23.273"/>
@@ -1965,7 +1965,7 @@
 							</g>
 							<g>
 								<rect x="71.365" y="364.197" fill="#B6065C" width="862.732" height="1.537"/>
-								<text transform="matrix(1 0 0 1 455.3984 345.0713)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.0484"> 362 </text>
+								<text transform="matrix(1 0 0 1 455.3984 345.0713)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.048"> 362 </text>
 								<g>
 									<rect x="527.194" y="331.843" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="58.69" height="23.273"/>
 									<rect x="527.194" y="331.843" opacity="0.7" fill="#212967" enable-background="new    " width="58.69" height="23.273"/>
@@ -5250,4 +5250,11 @@
 		width: 90%;
 		height: 90%;
 	}
+	.light #other text[font-size="14.048"],
+	.light #other text[font-size="3.4688"]{
+		fill:#000000;
+	}
+	.light #alldata text{
+		fill:#FFFFFF;
+	}
 </style>

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

@@ -24,25 +24,25 @@
 								<g>
 									<rect x="729.21" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="729.21" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 735.199 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#2进线</text>
+									<text transform="matrix(1 0 0 1 735.199 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#2进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 338.3215 105.7727)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">512</text>
 								<g>
 									<rect x="333.543" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="333.543" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 339.5325 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#1进线</text>
+									<text transform="matrix(1 0 0 1 339.5325 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#1进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 870.8694 105.7727)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">526</text>
 								<g>
 									<rect x="870.867" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="870.867" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 876.8577 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#3进线</text>
+									<text transform="matrix(1 0 0 1 876.8577 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#3进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 1354.3889 105.7727)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">527</text>
 								<g>
 									<rect x="1354.389" y="112.439" fill="none" stroke="#545281" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 									<rect x="1354.389" y="112.439" opacity="0.7" fill="#2F3068" enable-background="new    " width="52.5" height="20.818"></rect>
-									<text transform="matrix(1 0 0 1 1360.3772 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#4进线</text>
+									<text transform="matrix(1 0 0 1 1360.3772 126.6311)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#4进线</text>
 								</g>
 								<text transform="matrix(1 0 0 1 190.8508 420.1721)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="13.9276">#3</text>
 								
@@ -1573,4 +1573,11 @@
 		width: 90%;
 		height: 90%;
 	}
+	.light #other text[font-size="12.5667"],
+	.light #other text[font-size="13.9276"]{
+		fill:#000000;
+	}
+	.light #data text{
+		fill:#FFFFFF;
+	}
 </style>

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

@@ -5,7 +5,7 @@
         <previewPicture v-if="datas">
           <template v-slot:svg>
            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1410.332px" height="526.828px" viewBox="0 70 1410.332 526.828" enable-background="new 0 0 1395.332 526.828" xml:space="preserve">
-           <g id="s_x5F_fan">
+           <g id="fan">
            	<g>
            		<g>
            			<path fill="#E1E1E0" d="M1328.938,21.843l-0.862,18c0,0,0.688,0.271,1.29,0.271c0.624,0.002,1.346-0.263,1.346-0.263     l-0.715-18.006L1328.938,21.843L1328.938,21.843z"></path>
@@ -1561,10 +1561,10 @@
            </g>
            <g id="wtnum">
            	<text transform="matrix(1 0 0 1 850.0452 517.7383)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[25].wtnum}}</text>
-           	<text transform="matrix(1 0 0 1 32.9036 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[0].wtnum}}</text>
-           	<text transform="matrix(1 0 0 1 78.9104 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[1].wtnum}}</text>
-           	<text transform="matrix(1 0 0 1 132.3723 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[2].wtnum}}</text>
-           	<text transform="matrix(1 0 0 1 178.3792 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[3].wtnum}}</text>
+           	<text transform="matrix(1 0 0 1 28.9036 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[0].wtnum}}</text>
+           	<text transform="matrix(1 0 0 1 74.9104 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[1].wtnum}}</text>
+           	<text transform="matrix(1 0 0 1 128.3723 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[2].wtnum}}</text>
+           	<text transform="matrix(1 0 0 1 174.3792 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[3].wtnum}}</text>
            	<text transform="matrix(1 0 0 1 229.5286 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[4].wtnum}}</text>
            	<text transform="matrix(1 0 0 1 275.5354 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[5].wtnum}}</text>
            	<text transform="matrix(1 0 0 1 383.0999 402.7031)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[7].wtnum}}</text>
@@ -1727,4 +1727,10 @@ export default {
   width: 90%;
   height: 90%;
 }
+
+.light #other text[font-size="17.3469"],
+.light #other text[font-size="16.5927"],
+.light #other text[font-size="10.7967"]{
+	fill:#000000;
+}
 </style>

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

@@ -3752,4 +3752,9 @@ export default {
   width: 90%;
   height: 90%;
 }
+.light #other text[font-size="17.3469"],
+.light #other text[font-size="16.5927"],
+.light #other text[font-size="12.3679"]{
+	fill:#000000;
+}
 </style>

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

@@ -28,32 +28,32 @@
 							<g>
 								<rect x="710.621" fill="none" stroke="#BE2852" stroke-miterlimit="10" width="75.166" height="20.818"></rect>
 								<rect x="710.621" opacity="0.7" fill="#680325" width="75.166" height="20.818"></rect>
-								<text transform="matrix(1 0 0 1 729.353 14.1914)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">因特线</text>
+								<text transform="matrix(1 0 0 1 729.353 14.1914)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">因特线</text>
 							</g>
 							<g>
 								<rect x="444.811" y="166.997" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 								<rect x="444.811" y="166.997" opacity="0.7" fill="#212967" width="52.5" height="20.818"></rect>
-								<text transform="matrix(1 0 0 1 450.7998 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#1进线</text>
+								<text transform="matrix(1 0 0 1 450.7998 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#1进线</text>
 							</g>
 							<g>
 								<rect x="554.811" y="166.997" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 								<rect x="554.811" y="166.997" opacity="0.7" fill="#212967" width="52.5" height="20.818"></rect>
-								<text transform="matrix(1 0 0 1 560.7998 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#2进线</text>
+								<text transform="matrix(1 0 0 1 560.7998 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#2进线</text>
 							</g>
 							<g>
 								<rect x="666.811" y="166.997" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 								<rect x="666.811" y="166.997" opacity="0.7" fill="#212967" width="52.5" height="20.818"></rect>
-								<text transform="matrix(1 0 0 1 672.7998 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#3进线</text>
+								<text transform="matrix(1 0 0 1 672.7998 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#3进线</text>
 							</g>
 							<g>
 								<rect x="783.811" y="166.997" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 								<rect x="783.811" y="166.997" opacity="0.7" fill="#212967" width="52.5" height="20.818"></rect>
-								<text transform="matrix(1 0 0 1 789.8008 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#4进线</text>
+								<text transform="matrix(1 0 0 1 789.8008 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#4进线</text>
 							</g>
 							<g>
 								<rect x="893.811" y="166.997" fill="none" stroke="#4F4B7F" stroke-miterlimit="10" width="52.5" height="20.818"></rect>
 								<rect x="893.811" y="166.997" opacity="0.7" fill="#212967" width="52.5" height="20.818"></rect>
-								<text transform="matrix(1 0 0 1 899.8008 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.5667">#5进线</text>
+								<text transform="matrix(1 0 0 1 899.8008 181.189)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="12.566">#5进线</text>
 							</g>
 							<text transform="matrix(1 0 0 1 171.71 280.6255)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.9672">#3</text>
 							
@@ -798,7 +798,7 @@
 								<text transform="matrix(1 0 0 1 693.772 403.0767)"><tspan x="0" y="0" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="7.5491">kw</tspan><tspan x="0" y="14.848" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="7.5491">kwh</tspan><tspan x="0" y="29.695" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="7.5491">mwh</tspan></text>
 							</g>
 						</g>
-						<g id="data">
+						<g id="arrow">
 							<rect x="742.516" y="55.864" fill="#E60612" width="11.375" height="22.875"></rect>
 							<rect x="516.239" y="129.576" fill="#E60612" width="13.817" height="27.979"></rect>
 							<rect x="631.573" y="129.576" fill="#E60612" width="13.817" height="27.979"></rect>
@@ -806,7 +806,7 @@
 							<rect x="855.164" y="129.576" fill="#E60612" width="13.816" height="27.979"></rect>
 							<rect x="968.627" y="129.576" fill="#E60612" width="13.816" height="27.979"></rect>
 						</g>
-						<g id="arrow">
+						<g id="data">
 							<g id="_x23_1">
 								<g>
 									<text transform="matrix(1 0 0 1 62.7603 305.3823)" fill="#1A823B" font-family="'MicrosoftYaHei'" font-size="7.1437">0</text>
@@ -1160,4 +1160,12 @@
 		width: 90%;
 		height: 90%;
 	}
+	.light #other text[font-size="12.5667"],
+	.light #other text[font-size="14.9672"],
+	.light #other text[font-size="12.5045"]{
+		fill:#000000;
+	}
+	.light #data text{
+		fill:#FFFFFF;
+	}
 </style>

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

@@ -1971,4 +1971,12 @@
 		width: 90%;
 		height: 90%;
 	}
+	.light #other text[font-size="12.5667"],
+	.light #other text[font-size="14.9672"],
+	.light #other text[font-size="12.5045"]{
+		fill:#000000;
+	}
+	.light #data text{
+		fill:#FFFFFF;
+	}
 </style>

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

@@ -5,7 +5,6 @@
         <previewPicture v-if="datas">
           <template v-slot:svg>
             <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" id="图层_1" x="0px" y="0px" width="1830px" height="804px" viewBox="0 50 1830 804" enable-background="new 0 0 1830 804" xml:space="preserve">
-				<g xmlns="http://www.w3.org/2000/svg">
 					<g id="s_x5F_fan">
 						<g>
 							<g>
@@ -165,6 +164,7 @@
 							</g>
 						</g>
 					</g>
+            <g id="other">
 					<text transform="matrix(1 0 0 1 1536.8975 35.3689)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.6314">运</text>
 					<text transform="matrix(1 0 0 1 1536.8975 50.5266)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.6314">行</text>
 					<text transform="matrix(1 0 0 1 1588.4746 35.3689)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.6314">待</text>
@@ -177,8 +177,6 @@
 					<text transform="matrix(1 0 0 1 1750.082 50.5266)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.6314">电</text>
 					<text transform="matrix(1 0 0 1 1802.7109 35.3689)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.6314">中</text>
 					<text transform="matrix(1 0 0 1 1802.7109 50.5266)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.6314">断</text>
-				</g>
-            <g id="other">
             	<text transform="matrix(1 0 0 1 610.9976 249.981)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14">35KV Ⅱ母线</text>
             	<text transform="matrix(1 0 0 1 944.9141 249.981)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14">35KV Ⅱ母线</text>
             	<text transform="matrix(1 0 0 1 686.1826 53.3823)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14">110KV 母线</text>
@@ -717,14 +715,14 @@
             	<polygon fill="#DFAE5B" points="949.049,127.577 969.497,122.762 960.136,141.57  "/>
             </g>
 			<g id="wtnum">
-				<text transform="matrix(1 0 0 1 34.6865 279.2363)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[0].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 35.6108 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[1].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 102.1655 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[2].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 175.8716 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[3].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 233.8633 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[4].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 299.2939 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[5].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 430.29 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[7].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 497.4434 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[8].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 30.6865 279.2363)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[0].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 31.6108 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[1].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 98.1655 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[2].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 171.8716 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[3].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 229.8633 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[4].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 295.2939 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[5].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 426.29 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[7].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 493.4434 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[8].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 561.4565 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[9].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 627.7656 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[10].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 368.2104 403.3618)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[6].wtnum}}</text>
@@ -3506,4 +3504,9 @@ export default {
   width: 90%;
   height: 90%;
 }
+.light #other text[font-size="14"],
+.light #other text[font-size="16.5927"],
+.light #other text[font-size="12.6314"]{
+	fill:#000000;
+}
 </style>

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

@@ -784,13 +784,13 @@
 				<text transform="matrix(1 0 0 1 1270.0862 376.5137)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[80].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 1700.2542 376.8105)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[89].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 1748.0862 376.8105)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[90].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 16.0662 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[0].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 62.073 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[1].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 110.5349 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[2].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 156.5417 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[3].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 12.0662 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[0].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 58.073 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[1].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 106.5349 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[2].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 152.5417 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[3].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 196.6912 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[4].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 242.698 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[5].wtnum}}</text>
-				<text transform="matrix(1 0 0 1 346.2625 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[7].wtnum}}</text>
+				<text transform="matrix(1 0 0 1 342.2625 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[7].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 392.2693 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[8].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 438.4177 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[9].wtnum}}</text>
 				<text transform="matrix(1 0 0 1 491.4792 127.0254)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="17.3469">{{datas[10].wtnum}}</text>
@@ -4444,4 +4444,9 @@ export default {
   width: 90%;
   height: 90%;
 }
+.light #other text[font-size="17.3469"],
+.light #other text[font-size="16.5927"],
+.light #other text[font-size="10.7967"]{
+	fill:#000000;
+}
 </style>

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

@@ -32,7 +32,7 @@
 									<rect x="1004.688" y="87.653" opacity="0.7" fill="#212967" width="52.5"
 										height="20.818" />
 									<text transform="matrix(1 0 0 1 1010.6763 101.8457)" fill="#FFFFFF"
-										font-family="'MicrosoftYaHei'" font-size="12.5667">
+										font-family="'MicrosoftYaHei'" font-size="12.566">
 										#1进线
 									</text>
 								</g>
@@ -6029,7 +6029,7 @@ gg==" transform="matrix(0.24 0 0 0.24 1029.5508 430.3193)"></image>
 									<rect x="357.188" y="87.653" opacity="0.7" fill="#212967" width="52.5"
 										height="20.818" />
 									<text transform="matrix(1 0 0 1 363.1763 101.8457)" fill="#FFFFFF"
-										font-family="'MicrosoftYaHei'" font-size="12.5667">
+										font-family="'MicrosoftYaHei'" font-size="12.566">
 										#2进线
 									</text>
 								</g>
@@ -14166,12 +14166,12 @@ YII=" transform="matrix(0.24 0 0 0.24 1183.2881 191.6758)"></image>
 									</text>
 								</g>
 							</g>
-							<g id="data">
+							<g id="arrow">
 								<rect x="1314.85" y="31.309" fill="#E50612" width="15.15" height="27.441" />
 								<rect x="976.197" y="79.779" :fill="green" width="15.15" height="27.441" />
 								<rect x="328.141" y="79.779" fill="#E50612" width="15.15" height="27.441" />
 							</g>
-							<g id="arrow">
+							<g id="data">
 								<g id="_x23_3">
 									<g>
 										<text transform="matrix(1 0 0 1 166.8882 421.5078)" fill="#1B813B"
@@ -15140,8 +15140,6 @@ YII=" transform="matrix(0.24 0 0 0.24 1183.2881 191.6758)"></image>
 						return 0;
 				}
 			},
-
-
 			// 根据机箱状态返回颜色，后续如果需要区分颜色可以在这里新增逻辑返回对应的颜色值
 			getColor() {
 				return "#fff";
@@ -15185,4 +15183,12 @@ YII=" transform="matrix(0.24 0 0 0.24 1183.2881 191.6758)"></image>
 		width: 90%;
 		height: 90%;
 	}
+
+	.light #other text[font-size="12.5667"],
+	.light #other text[font-size="13.9276"]{
+		fill:#000000;
+	}
+	.light #data text{
+		fill:#FFFFFF;
+	}
 </style>

src/views/WindSite/pages/GeneralAppearance.vue

@@ -38,13 +38,13 @@
 				<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.lxts }}</span>
+					<span class="sub-count font-num gray">{{ wpnumMap.lxts }} {{wpId}}</span>
 				</div>
 			</div>
-			<div class="query-actions btnR" v-if="wpId == 'PL01_GC' || wpId == 'PL02_GC'">
-				<button class="btn" :class="wpId == 'PL01_GC'?'green':''" @click="pl('PL01_GC')">平罗一期</button>
-				<button class="btn" :class="wpId == 'PL02_GC'?'green':''" @click="pl('PL02_GC')">平罗二期</button>
-			</div>
+			<!-- <div class="query-actions btnR" v-if="wpId == 'PL_GDC' || wpId == 'PL2_GDC'">
+				<button class="btn" :class="wpId == 'PL_GDC'?'green':''" @click="pl('PL_GDC')">平罗一期</button>
+				<button class="btn" :class="wpId == 'PL2_GDC'?'green':''" @click="pl('PL2_GDC')">平罗二期</button>
+			</div> -->
 		</div>
 		<div>
 			<MHS class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'MHS_FDC'" />
@@ -184,6 +184,7 @@
 						if (res.code == 200) {
 							that.wpnumMap = res.data.fczbmap.jczbmap;
 							that.fjmap = res.data.fjmap[0];
+							console.log(that.fjmap)
 							that.zmmap = res.data.zmmap;
 						}
 					},

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/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,16 +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" />
-	  
+      <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" />
+      <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">
@@ -187,15 +194,15 @@ export default {
   components: {
     BtnGroup2,
     MHSFDC,
-	NSSFDC,
-	QSFDC,
-	SBQFDC,
-	XSFDC,
+    NSSFDC,
+    QSFDC,
+    SBQFDC,
+    XSFDC,
     PLGDC,
-	DWKGDC,
-	XHGDC,
-	MCHGDC,
-	HZJGDC
+    DWKGDC,
+    XHGDC,
+    MCHGDC,
+    HZJGDC,
   },
   // 数据
   data() {
@@ -204,7 +211,7 @@ export default {
       wpId: undefined,
       wpnumMap: {}, //风机监视数量
       wpInfoMap: {}, //风机详情
-      fjmap: [],   // 风机名
+      fjmap: [], // 风机名
       selectIndex: 0,
       rowIndex: 0,
       btnGroups: [
@@ -232,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"),
     };
@@ -305,7 +312,6 @@ export default {
         },
         success(res) {
           if (res.code == 200) {
-			  console.log(res)
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
@@ -323,15 +329,13 @@ export default {
         });
       });
     },
-    
+
     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

@@ -146,6 +146,12 @@ 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);
@@ -173,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

@@ -565,6 +565,11 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/MalfunctionWarning/Supervised",
                 },
+				{
+				  text: "齿轮箱故障诊断",
+				  icon: "svg-wind-site",
+				  path: "/health/MalfunctionWarning/diagnose",
+				},
               ],
             },
           ],

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: [