mw_666 3 роки тому
батько
коміт
07baf403d8

+ 1 - 2
src/assets/styles/common/common.less

@@ -17,12 +17,11 @@
 
 // 亮色主题
 @import "../theme/light/light-jsc.less"; // 驾驶舱
-@import "../theme/light/jsc-jcjz.less"; // 驾驶舱-基础矩阵
-@import "../theme/light/jsc-ztjs.less"; // 驾驶舱-状态监视
 @import "../theme/light/light-jjyx.less"; // 经济运行
 @import "../theme/light/light-sp.less"; // 沙盘
 @import "../theme/light/light-qt.less"; // 其他
 
+@import "../theme/light/jsc.less"; // 驾驶舱
 @import "../theme/light/jjyx.less"; // 经济运行
 @import "../theme/light/zhjx.less"; // 智慧检修	
 @import "../theme/light/aqgk.less"; // 安全管控

+ 0 - 38
src/assets/styles/theme/light/jsc-ztjs.less

@@ -1,38 +0,0 @@
-//驾驶舱模块-状态监视白色主题样式
-@import "./setting.less";
-#appBody.light {
-    .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;
-        // border: 00.093vh solid @deepblue;
-        // background-color: @blue;
-    }
-//驾驶舱模块-Agc白色主题样式
-    .com-panel2 .panel-header2 .panel-tools2{
-        color: @black;
-        opacity: 0.3;
-    }
-    .panel-table .data-item .data-item-count{
-        color: @deepblue;
-    }
-}

+ 42 - 3
src/assets/styles/theme/light/jsc-jcjz.less

@@ -1,9 +1,7 @@
-// 驾驶舱模块-基础矩阵白色主题样式
-
 @import "./setting.less";
 
-
 #appBody.light {
+	// 基础矩阵白色主题样式
     .panel-body{
         background:@white;
         transition: @transition;
@@ -103,4 +101,45 @@
     .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;
+		// border: 00.093vh solid @deepblue;
+		// background-color: @blue;
+	}
+//驾驶舱模块-Agc白色主题样式
+	.com-panel2 .panel-header2 .panel-tools2{
+		color: @black;
+		opacity: 0.3;
+	}
+	.panel-table .data-item .data-item-count{
+		color: @deepblue;
+	}
+	// 风场
+	.station-tip{
+		  background-color: @gray-l;
+		  color: @black;
+	}
 }

+ 5 - 1
src/assets/styles/theme/light/zhjx.less

@@ -68,7 +68,7 @@
 	// 健康推荐
   .selections {
 	.item {
-	  color: @font-color;
+	  color: @black;
 	  background: fade(@black, 20);
 	  border: 1px solid fade(@black, 20);
 
@@ -120,6 +120,9 @@
   .health-report {
 	// 健康报告 按钮样式
 	.actions {
+		.active{
+			border: 1px solid @deepblue;
+		}
 	  .item {
 		color: fade(@white, 75);
 		&.green {
@@ -158,4 +161,5 @@
 	  }
 	}
   }
+  
 }

+ 8 - 3
src/views/WindSite/pages/Home/Station.vue

@@ -463,7 +463,9 @@ export default {
             height: 8,
             attrs: {
               body: {
-                fill: partten.getColor("green"),
+                fill:this.$store.state.themeName === "dark"
+                    ? partten.getColor("green")
+                    : partten.getColor("blue"),
                 stroke: "transparent",
                 class: "node-hover",
                 "data-item": encodeURIComponent(JSON.stringify(data)),
@@ -574,6 +576,9 @@ export default {
       });
       this.initStation();
     },
+	"$store.state.themeName"() {
+	  this.initStation();
+	},
   },
 };
 </script>
@@ -594,11 +599,11 @@ export default {
     min-width: 30px;
     min-height: 32px;
     padding: 6px 8px;
-    color: #000000bf;
+    color: #fff;
     text-align: left;
     text-decoration: none;
     word-wrap: break-word;
-    background-color: #36348e;
+    background-color: #000000bf;
     border-radius: 2px;
     box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014,
       0 9px 28px 8px #0000000d;