白色版本

src/assets/styles/common/common.less

@@ -26,5 +26,9 @@
 @import "../theme/light/zhjx.less"; // 智慧检修	
 @import "../theme/light/aqgk.less"; // 安全管控
 
+// 驾驶舱模块
+@import "../theme/light/jsc/status.less"; // 状态监视
+@import "../theme/light/jsc/lightmatrix1.less"; // 基础矩阵
+@import "../theme/light/jsc/info.less"; // 单机状态监视
 // 暗色主题
 @import "../theme/dark/dark-jsc.less"; // 驾驶舱

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

@@ -2,92 +2,9 @@
 
 #appBody.light {
 
-    // 基础矩阵白色主题样式
-    .panel-body {
-        background: @white;
-        transition: @transition;
-    }
-
-    .card-panel .card-left .tag {
-        color: @black;
-    }
-
-    .light-matrix .panel {
-        background-color: gainsboro;
-    }
-
-    .green[data-v-065abbc5] {
-        color: @green;
-    }
-
-    .green[data-v-6a0a9536] {
-        color: @green;
-    }
-
-    .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 {
-        fill: @deepblue;
-    }
-
-    //明细矩阵
-    .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] {
-        color: @deepblue;
-        font-weight: bold;
-    }
-
-    //光伏矩阵
-    .light-matrix .panel-box .panel-title .panel-title-name[data-v-55c30df5] {
-        color: @deepblue;
-        font-weight: bold;
-    }
-
     //驾驶舱模块-矩阵白色主题样式二级页面
-    //基本信息-日发电量1
-    .wind-site-base-info .generation {
-        background: @white;
-    }
-
-    //基本信息-日发电量2
-    .el-col-10 {
-        background: @white;
-    }
-
-    //基本信息-日发电量右侧
-    .wind-site-warning[data-v-40a70b04] {
-        background: @white;
-        transition: @transition;
-    }
-
-    //右侧导航栏第一个-天气
-    .wind-site-weather[data-v-ccb406f8] {
-        background: @white;
-        transition: @transition;
-    }
 
-    .wind-site-base-info {
-		.wind-site-name {
-		    border: none;
-			background-color: @fadePurple;
-		}
-		.wind-site-other{
-			.wind-site-tag{
-				background-color: @white;
-			}
-		}
-	}
-
-    .title[data-v-2c3073c8] {
+    .title {
         font-weight: bold;
     }
 
@@ -98,14 +15,7 @@
     }
 
     //最右侧导航
-    .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 {
@@ -155,15 +65,10 @@
         font-weight: bold;
     }
 
-    .matrix .panel-title .panel-title-name[data-v-2e858362] {
+    .matrix .panel-title .panel-title-name {
         color: @deepblue;
     }
 
-    .com-panel.line {
-        margin-left: 1px;
-        z-index: 1;
-    }
-
     .wave {
         z-index: 1;
     }
@@ -176,36 +81,6 @@
         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;
@@ -305,19 +180,7 @@
 		}
 	}
 	
-	.wind-site-base-info {
-	  .wind-site-tag {
-		  background: @gray-3;
-			.tag-value {
-			  color: @deepblue;
-			}
-		}
-		.info-panel {
-			.panel-title {
-				background: @gray-3;
-			}
-		}
-	}
+	
 		
 	.table-form tr:nth-child(2n){
 		background: @gray-3;
@@ -334,4 +197,56 @@
 			background: @gray-3;
 		}
 	}
+	.Inverter-Info .box-main .Inverter-Info-body .inverter-datas .inverter-item .inverter-item-info .states{
+		.state-list .list-item{
+			background: rgba(96, 103, 105, 0.1);
+			&:nth-child(2n){
+				background: transparent
+			}
+			.state{
+				background: rgba(96, 103, 105, 0.2);
+			}
+		}
+		.counts {
+			.all{
+				background: rgba(96, 103, 105, 0.1);
+			}
+			.error{
+				color:@white;
+			}
+		}
+	}
+	.Inverter-Info .box-main {
+		.wind-site-menu{
+			background-color: @gray-3;
+		}
+		.Inverter-Info-body {
+			.inverter-datas .inverter-item .inverter-item-info{
+				border:1px solid @gray-3;
+				background-color: @white;
+			}
+		}
+	}
+	
+	.btn-group-with-icon .btn-group-with-icon-list a{
+		background-color: @white;
+		border: none;
+		color: @black;
+		&.active{
+			color: @white;
+			background-color: @deepblue;
+		}
+	}
+	// 暂无认领部分
+	// .el-scrollbar__wrap {
+	//     background: @white;
+	//     transition: @transition;
+	// }
+	
+	// .map-1 .btn-group-tabs {
+	//     display: flex;
+	//     flex-direction: row;
+	//     background: @white;
+	//     height: 50px;
+	// }
 }

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

@@ -0,0 +1,72 @@
+@import "../setting.less";
+
+#appBody.light {// 单机状态监视
+    
+   .wind-site-warning {//单机状态监视
+       background: @white;
+       transition: @transition;
+   }
+   
+   //右侧导航栏第一个-天气
+   .wind-site-weather {
+   	border-radius: 10px;
+   	border: none;
+       background: @white;
+       transition: @transition;
+   }
+   
+   .wind-site-base-info {
+	   .power-load{
+		   background-color: @white;
+	   }
+	   .wind-site-tag {
+	     background: @gray-3;
+	   	.tag-value {
+	   	  color: @deepblue;
+	   	}
+	   }
+	   .info-panel {
+	   	.panel-title {
+	   		background: @gray-3;
+	   	}
+	   }
+   	.generation {
+   	    background: @white;
+   	}
+   	.wind-site-name {
+   	    border: none;
+   		background-color: @fadePurple;
+   	}
+   	.wind-site-other{
+   		.wind-site-tag{
+   			background-color: @white;
+   		}
+   	}
+   }
+   .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box {
+       background-color: @white;
+       transition: @transition;
+		border: none;
+		border-radius: 5px;
+   	.page-common-body-menu-item{
+   		  border: none;
+   		  .svg-icon svg use{
+   			fill:@gray-font;
+   		  }
+   		  &.active{
+   			  background:@fadePurple;
+   			  border: none;
+   			  &::after{
+   				box-shadow:none;
+   				border: none;
+   			  }
+   			  .svg-icon.svg-icon-yellow svg use{
+   				  fill:@deepblue;
+   			  }
+   		  }
+   	}
+   	.page-common-body-menu-border{
+   		background-color: transparent;
+   	}
+   }
+}

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

@@ -0,0 +1,27 @@
+@import "../setting.less";
+
+#appBody.light { // 基础矩阵
+   .panel-body {
+       background: @white;
+       transition: @transition;
+   }
+   
+   .card-panel .card-left .tag {
+       color: @black;
+   }
+   
+   .light-matrix .panel {
+       background-color: gainsboro;
+   }
+   
+   .light-matrix .panel-box .panel-title .panel-title-name {
+       font-size: 1.296vh;
+       color: @deepblue;
+       font-weight: bold;
+   }
+   
+   .svg-icon.svg-icon-green svg use {
+       fill: @deepblue;
+   }
+   
+}

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

@@ -0,0 +1,53 @@
+@import "../setting.less";
+
+#appBody.light {
+    // 状态监视
+    .status-panel .status-com-panel{
+		.panel-body{
+			padding: 0;
+			.p-body {
+				.item-box .data-item{
+					background-color: @white;
+					border-top: 1px solid @gray-3;
+					.f3,.f5{
+						color: @deepblue;
+					}
+					&.light {
+						&:first-child{
+							background-color: @gray-3;
+							
+							div{
+								color: @black;
+							}
+							&::after{
+								background-color: @deepblue;
+							}
+						}
+						&::after{
+							background-color: transparent;
+						}
+						div{
+							&.f3,&.f5{
+								color: @deepblue;
+							}
+							color: @gray;
+						}
+						background-color: @white;
+					}
+				}
+				.category-box {
+				    width: 100%;
+				    background-color: @white;
+				    transition: @transition;
+				    display: flex;
+				    margin-bottom: 0.37vh;
+					.score span {
+					    color: @deepblue;
+						background-color: fade(@deepblue, 10%);
+						border: 0.093vh solid @deepblue;
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -229,11 +229,17 @@
         transition: @transition;
     }
 
-    .com-panel-3 .dot,
     .com-panel.line:before {
         background: @black;
         transition: @transition;
     }
+	.com-panel-3{
+		border-radius: 10px;
+		.dot{
+			background: transparent;
+			transition: @transition;
+		}
+	}
 
     .panel-header {
         background: #fff;
@@ -241,6 +247,7 @@
     }
 
     .fengji-icon {
+		box-shadow: inset 1.5px -1px 1px 0px @deepblue;
         svg use {
             fill      : @deepblue;
             transition: @transition;
@@ -290,17 +297,18 @@
         transition    : @transition;
     }
 
-    .com-panel.line::before {
-        width     : 4px;
-        height    : 4px;
-        background: @black;
-        margin    : 0.85vh 0.556vh 0vh 0.85vh;
-        transition: @transition;
-    }
-
     .com-panel.line {
         border-left: 0;
         transition : @transition;
+		margin-left: 1px;
+		z-index: 1;
+		font-weight: 900;
+		&::before {
+			width     : 0;
+			height    : 0;
+			margin    : 0;
+			transition: @transition;
+		}
     }
 
     .lightMenu {
@@ -324,34 +332,36 @@
     .main-body {
         transition : @transition;
     }
-
-    .dot.top-left {
-        top       : 0.85vh;
-        left      : 0.85vh;
-        background: @black;
-        transition: @transition;
-    }
-
-    .dot.bottom-left {
-        bottom    : 0.85vh;
-        left      : 0.85vh;
-        background: @black;
-        transition: @transition;
-    }
-
-    .dot.top-rignt {
-        top       : 0.85vh;
-        right     : 0.85vh;
-        background: @black;
-        transition: @transition;
-    }
-
-    .dot.bottom-right {
-        bottom    : 0.85vh;
-        right     : 0.85vh;
-        background: @black;
-        transition: @transition;
-    }
+	// .dot{
+		
+	// }
+    // .dot.top-left {
+    //     top       : 0.85vh;
+    //     left      : 0.85vh;
+    //     background: @black;
+    //     transition: @transition;
+    // }
+
+    // .dot.bottom-left {
+    //     bottom    : 0.85vh;
+    //     left      : 0.85vh;
+    //     background: @black;
+    //     transition: @transition;
+    // }
+
+    // .dot.top-rignt {
+    //     top       : 0.85vh;
+    //     right     : 0.85vh;
+    //     background: @black;
+    //     transition: @transition;
+    // }
+
+    // .dot.bottom-right {
+    //     bottom    : 0.85vh;
+    //     right     : 0.85vh;
+    //     background: @black;
+    //     transition: @transition;
+    // }
 
     .lightMenu .el-menu--collapse {
         width     : 54px;

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

@@ -226,25 +226,13 @@
     // }
 
     //专家知识-故障知识列表
-    .know-info .table-card tr[data-v-68c7e6e4] {
+    .know-info .table-card tr {
         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] {
+    .main-body .query .query-items {
         padding-bottom: 1vh;
     }
 
@@ -258,8 +246,8 @@
         background: @deepblue;
     }
 
-    .swiperBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover,
-    .itemBox .imageBox1 .imgItem1 .img1[data-v-247ee960]:hover {
+    .swiperBox .imageBox1 .imgItem1 .img1:hover,
+    .itemBox .imageBox1 .imgItem1 .img1:hover {
         border: 3px solid @deepblue;
     }
 

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

@@ -426,25 +426,6 @@
 	  }
   }
   
-  .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box {
-	  .page-common-body-menu-item{
-	  	  border: none;
-		  .svg-icon svg use{
-			fill:@gray-font;
-		  }
-		  &.active{
-			  background:@fadePurple;
-			  border: none;
-			  &::after{
-				box-shadow:none;
-				border: none;
-			  }
-			  .svg-icon.svg-icon-yellow svg use{
-				  fill:@deepblue;
-			  }
-		  }
-	  }
-  }
   .main-body input{
 	  color:@black;
 	  background:@white;

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

@@ -193,7 +193,7 @@ export default {
             itemStyle: {
               normal: {
                 borderWidth:this.$store.state.themeName === "dark" ? util.vh(14): util.vh(8),
-                borderColor: "#071812",
+                borderColor: this.$store.state.themeName === "dark" ? "#071812" : '#fff',
               },
             },
             label: {

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

@@ -571,7 +571,7 @@ export default {
               .state-list {
                 outline: 1px solid fade(@gray, 40);
                 margin-top: 8px;
-                height: calc(100% - 42px);
+                height: calc(100% - 45px);
 
                 .list-item {
                   display: flex;

src/views/layout/Menu.vue

@@ -17,7 +17,7 @@
             placement="bottom"
             :show-after="500"
             :enterable="false"
-            hide-after="10"
+            :hide-after="10"
           >
             <div
               class="menu-icon svg-icon"