Переглянути джерело

风机绩效榜-明细;合并wangbo代码

mw_666 3 роки тому
батько
коміт
323355cf5c

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

@@ -22,7 +22,7 @@
 @import "../theme/light/light-sp.less"; // 沙盘
 @import "../theme/light/light-qt.less"; // 其他
 
-@import "../theme/light/jjyx-fjjxb.less"; // 风机绩效榜
+@import "../theme/light/jjyx-dbgl.less"; // 对标管理
 
 // 暗色主题
 @import "../theme/dark/dark-jsc.less"; // 驾驶舱

+ 95 - 0
src/assets/styles/theme/light/jjyx-dbgl.less

@@ -0,0 +1,95 @@
+// 对标管理
+@import "./setting.less";
+#appBody.light {
+	// 风机绩效榜
+    .com-table {
+		thead tr th{
+			color: @black;
+		}
+		
+		.el-scrollbar tr td {
+			color: @black;
+		}
+		
+		.el-scrollbar tr td.light span {
+			color: @blue;
+		}
+	}
+	.btn.green,.btn:hover{
+		color: @deepblue;
+		border-color: @deepblue;
+		background: rgba(54, 52, 142, 0.2);
+	}
+	
+	.el-select__popper.select,.el-picker__popper{
+		background: @white;
+        border-color: @white;
+		.el-popper__arrow::before{
+			border: 1px solid @white !important;
+			background: @white !important;
+		}
+		.el-select-dropdown__item.selected,.el-select-dropdown__item:hover {
+		    color: @deepblue;
+			background:fade(@deepblue, 20);
+			border: 1px solid @deepblue;
+		}
+		.el-select-dropdown__item{
+			color:@black;
+		}
+	}
+	
+	.el-picker__popper.el-popper[role="tooltip"] {
+		background: @white !important;
+		border-color: @white !important;
+		.el-date-table{
+			th{
+				color:@black ;
+			}
+			td.current:not(.disabled) span{
+				color: @white;
+				background:@blue;
+			}
+			td.today span,span:hover {
+			    color: @blue;
+			}
+			td.prev-month,td.next-month{
+				background: fade(@black,20);
+			}
+			span{
+				color:@black;
+			}
+		}
+		
+	}
+	.el-input{
+		.el-input__inner{
+			background: @white;
+			color: @black;
+		}
+	}
+	.query-item .lable{
+		color:@black;
+	}
+	
+	// 风机绩效榜-明细
+	.main-body{
+		input[type="checkbox"]:checked{
+			background:@blue;
+			border-color: @blue;
+		}
+		input[type="checkbox"]{
+			background: @white;
+			border-color: @white;
+		}
+	} 
+	
+	.decision-page-2{
+		.com-panel{
+			border-radius:0;
+			padding:0;
+		}
+	}
+	.action{
+		color: @blue;
+	}
+}

+ 0 - 57
src/assets/styles/theme/light/jjyx-fjjxb.less

@@ -1,57 +0,0 @@
-// 风机绩效榜
-@import "./setting.less";
-#appBody.light {
-    .com-table {
-		thead tr th{
-			color: @black;
-		}
-		
-		.el-scrollbar tr td {
-			color: @black;
-		}
-		
-		.el-scrollbar tr td.light span {
-			color: @blue;
-		}
-	}
-	.btn.green,.btn:hover{
-		color: @deepblue;
-		border-color: @deepblue;
-		background: rgba(54, 52, 142, 0.2);
-	}
-	
-	.el-select__popper.select{
-		background: @white;
-        border-color: @white;
-		.el-popper__arrow::before{
-			border: 1px solid @white !important;
-			background: @white !important;
-		}
-		.el-select-dropdown__item.selected,.el-select-dropdown__item:hover {
-		    color: @deepblue;
-			background:fade(@deepblue, 20);
-			border: 1px solid @deepblue;
-		}
-	}
-	
-	.el-select {
-	  .el-input {
-	    // .el-input__suffix {
-	    //   background: transparent;
-	    // }
-	    .el-input__inner {
-	      background: @white;
-	      background: @white;
-	    }
-	  }
-	
-	//   .el-select__tags .el-tag {
-	//     background-color: fade(@green, 50);
-	//     color: @white;
-	
-	//     .el-icon-close {
-	//       background-color: fade(@green, 50);
-	//     }
-	//   }
-	}
-}

+ 31 - 2
src/assets/styles/theme/light/jsc-jcjz.less

@@ -1,4 +1,4 @@
-// 经济运行模块-明细矩阵白色主题样式
+// 经济运行模块-基础矩阵白色主题样式
 
 @import "./setting.less";
 
@@ -12,8 +12,16 @@
         color: @black;
     }
     .light-matrix .panel{
-        background-color: rgb(216, 228, 231);
+        background-color: gainsboro;
     }
+    .green[data-v-065abbc5]{
+        color: @green;
+    }
+    .green[data-v-6a0a9536]{
+        color: @green;
+    }
+
+    // 经济运行模块-矩阵白色主题样式二级页面
     //基本信息-日发电量1
     .wind-site-base-info .generation {
         background: @white;
@@ -58,4 +66,25 @@
         background: @white;
         transition: @transition;
     }
+    .Inverter-Info .box-main .Inverter-Info-body .Inverter-Info-title{
+        position: relative;
+        background: @white;
+        transition: @transition;
+    }
+    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{
+        background: @white;
+        transition: @transition;
+    }
+    .wave{
+        z-index: 1;
+        // background: @white;
+        // transition: @transition;
+    }
+    .svg-icon.svg-icon-write svg use{
+        fill: @black;
+    }
 }

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

@@ -380,8 +380,8 @@
 	}
 	
 	.el-popper.is-light{
-		background:transparent;
 		border:none;
+		.el-menu{border-radius: 0px;}
 	}
 	
     .com-panel-3 {

+ 1 - 0
src/assets/styles/theme/light/setting.less

@@ -8,3 +8,4 @@
 @white : #ffffff;
 @gray-l     : #B3BDC0;
 @darkgray-1 : #7b7d7e;
+@green      : #05bb4c;

+ 25 - 10
src/components/chart/pie/dual-pie-chart.vue

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