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

智慧检修白色版改;预警分析时间加时分秒

mw_666 3 роки тому
батько
коміт
1bfd29be9b

+ 4 - 0
src/assets/styles/common/color.less

@@ -20,4 +20,8 @@
 @greenLinearRight: linear-gradient(to right, fade(@green, 50%), fade(@green, 0));
 @redLinearRight: linear-gradient(to right, fade(@red, 50%), fade(@red, 0));
 
+@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;

+ 240 - 0
src/assets/styles/theme/light/zhjx.less

@@ -162,4 +162,244 @@
 	}
   }
   
+  // 健康推荐-已分配任务
+  .track-info {
+    .form-info {
+      .work-flow {
+        background: fade(@gray, 20);
+        .work-flow-line {
+          background: @deepblue;
+        }
+  
+        .work-flow-item {
+          &.active {
+			  background: none;
+            .work-flow-icon-item {
+              .work-flow-icon-o {
+                  border: 1px solid @deepblue;
+                }
+  
+                .work-flow-icon-i {
+                  border: 2px solid @deepblue;
+                  background: linear-gradient(to bottom, @gray-l 0%,@gray-l 20%,@deepblue 100%);
+                }
+  
+                .svg-icon {
+                  svg {
+                    use {
+                      fill: @deepblue;
+                    }
+                  }
+                }
+            }
+  
+            .work-flow-text {
+              color: @deepblue;
+            }
+          }
+  
+          .work-flow-icon-item {
+            .work-flow-icon-o {
+              border: 1px solid #B3BDC0;
+            }
+  
+            .work-flow-icon-m {
+              border: 4px solid #212b2b;
+            }
+  
+            .work-flow-icon-i {
+              border: 2px solid @gray-l;
+              background: linear-gradient(to bottom, @gray 0%,@gray 20%,@gray-l 100%);
+            }
+  
+            .svg-icon {
+              svg {
+                use {
+                  fill: @gray-l;
+                }
+              }
+            }
+          }
+          .work-flow-text {
+              color: @black;
+            }
+        }
+      }
+    }
+  
+    .evaluate {
+  
+      .evaluate-item {
+        .evaluate-label,
+        .evaluate-unit {
+          color: @black;
+        }
+      }
+    }
+    .tabs {
+      border-left: 1px solid #53626833;
+  
+      .tab-box {
+  
+      .tab-item {
+        &.active {
+          color: @deepblue;
+          background-image: @deepblueLinearTop;
+  
+          &::after {
+            border: 1px solid @deepblue;
+          }
+        }
+      }
+    }
+    }
+  }
+  
+  .el-textarea {
+    .el-textarea__inner {
+      color: @black;
+	  background: fade(@gray-l, 20);
+    }
+  }
+  
+  .defect-elimination-tracking {
+	  background: fade(@white, 95);
+	  border: 1px solid fade(@deepblue, 50);
+	  
+    .defect-elimination-tracking-close {
+      &:hover {
+        i {
+          color: @blue;
+        }
+      }
+    }
+  
+    .header-tile-box {
+      .header-tile {
+  
+        .info-form-box {
+          .info-form {
+            .info-form-label {
+              color: @gray;
+            }
+            .info-form-value {
+              color: @black;
+            }
+          }
+        }
+      }
+    }
+    .det-chart-title {
+      color: @black;
+    }
+  
+    .det-chart-sub-title {
+      color: @black;
+    }
+  
+    .det-chart-sub-title-big {
+      color: @black;
+    }
+  }
+  
+  .health-2 {
+    // 电量健康情况
+    .power-info {
+      .info-tab {
+  
+        .tab {
+          color: @black;
+  
+          &:hover,
+          &.active {
+            background: fade(@deepblue, 20);
+            border: 1px solid @deepblue;
+            color: @deepblue;
+            i {
+              svg use {
+                fill: @deepblue;
+              }
+            }
+          }
+  
+          &.active::after {
+            border-bottom: 9px solid @deepblue;
+          }
+        }
+      }
+  
+    }
+    // 风场信息
+    .fc-info {
+      .fc-item {
+  
+        & > .title {
+          color: fade(@black, 75);
+        }
+  
+  
+        .tags {
+          .tag {
+            .tag-title {
+              color: @black;
+            }
+  
+            .tag-value {
+              color: @deepblue;
+              .unit {
+                color: @gray;
+              }
+            }
+          }
+        }
+        .health-info {
+          .title {
+            color: @black;
+            .actions {
+              .action {
+				  color: @gray;
+				  svg use {
+				    fill: @gray;
+				  }
+                &.active,
+                &:hover {
+					background: none;
+                  color: @deepblue;
+                  svg use {
+                    fill: @deepblue;
+                  }
+                }
+              }
+            }
+          }
+  
+          .info-body {
+            .device-list {
+              .item {
+                color: @black;
+                &.green {
+                  color: @green;
+                  background: fade(@green, 20);
+                  border-color: @green;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  .health-3{
+	  .com-panel{
+		  .green{
+		  		color:@green;
+				&.lengend{
+					background:@blue;
+				}
+		  }
+	  }
+	   
+  }
+  
 }

+ 11 - 4
src/components/chart/other/Dashboard2.vue

@@ -37,8 +37,10 @@ export default {
   computed: {},
   methods: {
     initChart() {
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
+		 
       let chart = echarts.init(this.$el);
-
       let value = this.value;
       let option = {
         grid: {
@@ -60,7 +62,7 @@ export default {
                 width: 8,
                 color: [
                   [0, partten.getColor("gray") + "33"],
-                  [value / 100, partten.getColor("green")],
+                  [value / 100,themeName ? partten.getColor("green") : partten.getColor("blue")],
                   [1, partten.getColor("gray") + "33"],
                 ],
               },
@@ -93,7 +95,7 @@ export default {
                 return params;
               },
               textStyle: {
-                color: partten.getColor("green"),
+                color: themeName ? partten.getColor("green") : partten.getColor("blue"),
                 fontSize: util.vh(16),
               },
             },
@@ -115,7 +117,7 @@ export default {
               lineStyle: {
                 width: 1,
                 color: [
-                  [this.value / 100, partten.getColor("green")],
+                  [this.value / 100, themeName ? partten.getColor("green") : partten.getColor("blue")],
                   [1, "#fff5"],
                 ],
               },
@@ -152,6 +154,11 @@ export default {
       this.initChart();
     });
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

+ 8 - 3
src/components/chart/other/thermometer-v-chart.vue

@@ -45,9 +45,9 @@ export default {
       return rgbaColor;
     },
     initChart() {
-      var mercuryColor = "#05BB4C";
       var borderColor = partten.getColor("gray");
-
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
       let option = {
         grid: {
           top: 0,
@@ -98,7 +98,7 @@ export default {
             barWidth: 16,
             itemStyle: {
               normal: {
-                color: mercuryColor,
+                color: themeName ? partten.getColor("green") : partten.getColor("deepblue"),
                 barBorderRadius: 100,
                 borderWidth: 8,
                 borderType: "dashed",
@@ -180,6 +180,11 @@ export default {
   updated() {
     this.initChart();
   },
+  watch: {
+      "$store.state.themeName"() {
+        this.initChart();
+      },
+    },
 };
 </script>
 

+ 1 - 1
src/views/HealthControl/defect-elimination-tracking.vue

@@ -78,7 +78,7 @@ export default {
   data() {
     return {
       showMe: false,
-      header: require("@assets/logo.png"),
+      header: require("@assets/userhead.jpg"),
       infoss:'',    //msg
       infols:'',    //chart
     };

+ 2 - 2
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="date" placeholder="选择日期"
+							<el-date-picker v-model="startdate" type="datetime" 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="date" placeholder="选择日期" popper-class="date-select">
+							<el-date-picker v-model="enddate" type="datetime" placeholder="选择日期" popper-class="date-select">
 							</el-date-picker>
 						</div>
 					</div>