冲突处理

src/assets/dataService/arcgis-sbq.json

@@ -1489,8 +1489,8 @@
 		"spatialReference": {
 			"wkid": 4326
 		},
-		"x": 106.4636833,
-		"y": 37.69213333
+		"x": 106.5286833,
+		"y": 37.62013333
 	},
 	"symbol": null,
 	"attributes": {
@@ -1504,7 +1504,7 @@
 		"spatialReference": {
 			"wkid": 4326
 		},
-		"x": 106.3533167,
+		"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/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,197 @@
     .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{
-        fill: @black;
-    }
-    .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{
-        color: @deepblue;
+
+        .svg-icon.svg-icon-write svg use {
+            fill: @black;
+        }
+
+        .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 {
+            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;
+        }
+
+        // 升压站，总貌图svg
+        .svg {
+            #footer text {
+                fill: @black;
+            }
+
+            #data {
+                text {
+                    fill: @white;
+                }
+            }
+        }
     }
-        
-	// 风场
-	.station-tip{
-		  background-color: @gray-l;
-		  color: @black;
-	}
 }

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

@@ -5,113 +5,257 @@
 #appBody.light {
 
     .sjcx-item {
-        color     : @black;
+        color: @black;
         transition: @transition;
     }
 
     .sjcx-item:hover {
-        color     : @deepblue;
+        color: @deepblue;
         transition: @transition;
     }
 
     .imgTitle {
-        color     : @black;
+        color: @black;
         transition: @transition;
     }
 
     .imgItem1:hover .imgTitle {
-        color     : @deepblue;
+        color: @deepblue;
         transition: @transition;
     }
 
     .el-carousel__item {
         border-radius: @borderRaduis;
     }
+
+    //统计分析
+    // .el-date-table td.end-date span, .el-date-table td.start-date span{
+    //     background-color: @deepblue;
+    // }
+
     //原始数据查询-测点历史数据查询
-    .el-date-editor.is-active, body .el-date-editor.is-active:hover, 
-        body .el-date-editor.is-focus .el-input__inner{
-            border-color: @deepblue;
+    .el-date-editor.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{
+
+    .el-date-editor .el-range__icon {
         color: @black;
     }
-    .el-date-editor .el-range__close-icon{
+
+    .el-date-editor .el-range__close-icon {
         color: @black;
     }
-    .el-picker-panel .el-picker-panel__footer{
+
+    .el-picker-panel .el-picker-panel__footer {
         background: @deepblue;
         border-color: @deepblue;
     }
-    .el-picker-panel .el-picker-panel__footer .el-button.is-plain{
+
+    .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{
+
+    .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{
+
+    .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{
+
+    .el-tree .el-checkbox__inner:hover {
         border-color: @blue;
     }
-   // 原始数据查询-数据导出
-    .com-table td{
-        color: @black !important;
+
+    .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);
     }
-    .el-input__prefix{
+
+    //原始数据查询-测点数据查询
+    .com-table tbody tr:nth-child(2n){
+        background: @white;
+    }
+    // 原始数据查询-数据导出
+    .com-table td {
+        color: @black  !important;
+    }
+
+    .el-input__prefix {
         color: @black;
     }
-    .el-input__suffix{
+
+    .el-input__suffix {
         color: @black;
     }
-    .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item.selected{
+    .el-popper.el-select__popper[role="tooltip"]{
+        background: @white;
+    }
+    .el-popper__arrow::before{
+        background: @white !important;
+        border: 1px solid @white !important;
+    }
+    .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item.selected {
         color: @deepblue;
     }
+
     .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item.hover {
-         background: @deepblue;
+        background: @deepblue;
         color: @white;
     }
-    .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item:hover{
+
+    .el-popper.el-select__popper[role="tooltip"] .el-select-dropdown__item:hover {
         background: @deepblue;
         color: @white;
     }
-    .el-select .el-input .el-select__caret{
+
+    .el-select .el-input .el-select__caret {
         color: @black;
     }
+
     //设备管理
-    .el-tabs--card>.el-tabs__header .el-tabs__nav{
-        border: 1px solid #bbbbce;
-        background: @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;
+    }
+    .swiperBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover, .itemBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover{
+        border: 3px solid @deepblue;
     }
 }

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

@@ -10,3 +10,4 @@
 @darkgray-1 : #7b7d7e;
 @green      : #05bb4c;
 @deepblueBg : 54, 52, 142;
+@gray-2:#dcdddf;

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/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/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: [],
               },
@@ -1300,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,
@@ -1317,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/XH_GDC.vue

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

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/components/boosterstation/mhs.vue

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

src/views/WindSite/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/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/sampleDatabase/performance/performanceEcharts.vue

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