public/static/config/modeConfig.js

@@ -16,7 +16,7 @@ const tilesMaxLevel = 18;
 const adapterUrl = "http://10.155.32.4:8011/";
 
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
-const showModuleName = 0;
+const showModuleName = 1;
 
 if (localTest) {
     // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林

src/assets/styles/common/common.less

@@ -21,14 +21,29 @@
 @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"; // 安全管控
+@import "../theme/light/components.less"; // 白色组件
 
 // 驾驶舱模块
 @import "../theme/light/jsc/status.less"; // 状态监视
 @import "../theme/light/jsc/lightmatrix1.less"; // 基础矩阵
-@import "../theme/light/jsc/info.less"; // 单机状态监视
+@import "../theme/light/jsc/info.less"; // 单机状态监视  /monitor/windsite/info/MHS_FDC/MG01_01
+@import "../theme/light/jsc/inverter-info.less"; //monitor/windsite/inverter-info/MHS_FDC/MG01_01
+@import "../theme/light/jsc/matrix.less";//风场矩阵 /monitor/windsite/matrix/MHS_FDC
+@import "../theme/light/jsc/agc.less";// AGC 监视
+@import "../theme/light/jsc/home.less";// 场站监视  /monitor/windsite/home/MHS_FDC
+@import "../theme/light/jsc/map.less";// 场站监视  /monitor/windsite/map/MHS_FDC
+
+
+// 经济运行模块
+@import "../theme/light/jjyx/decision1.less";//风机绩效榜 /decision/decision1
+@import "../theme/light/jjyx/decision3db.less";//单机横向对比 /decision/decision3db
+@import "../theme/light/jjyx/ztzhl.less";// 状态转换率 /decision/ztzhl
+@import "../theme/light/jjyx/ztfx.less"; //专题分析 /decision/ztfx
+
+// 智慧检修模块
+@import "../theme/light/zhjx/frist.less"; //健康推荐 /health/frist
+@import "../theme/light/zhjx/malfunctionRecall.less"; //故障回溯 /health/gzzd/malfunctionRecall
+// 安全管控模块
+@import "../theme/light/aqgk/personnel.less"; //人员矩阵 /save/personnel
 // 暗色主题
 @import "../theme/dark/dark-jsc.less"; // 驾驶舱

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

@@ -1,86 +0,0 @@
-//安全管控模块白色主题样式
-@import "./setting.less";
-#appBody.light {
-    .personnel .personnel-btn .i-btn:hover, .personnel .personnel-btn .i-btn.active{
-        border:1px solid rgba(75, 85, 174, 0.6);
-        background: rgba(75, 85, 174, 0.6);
-        color: @white;
-    }
-    .personnel .personnel-btn .i-btn{
-        background: rgb(220 221 223);
-        border: 1px solid @black;
-        color: @black;
-    }
-    //人员矩阵
-    .personnel .personnel-box .personnel-box-item{
-        background: @white;
-        border: 1px solid @black;
-    }
-    .personnel .personnel-box .personnel-box-item:hover{
-        border: 1px solid @deepblue;
-        background: @deepblue;
-    }
-    .personnel .personnel-box .personnel-box-item 
-        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-label{
-            color: @black;
-            font-weight: bold;
-        }
-    .personnel .personnel-box .personnel-box-item:hover 
-        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-label{
-            color: @white;
-        }
-    .personnel .personnel-box .personnel-box-item 
-        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-value{
-            color: @black;
-            font-weight: bold;
-        }
-    .personnel .personnel-box .personnel-box-item:hover 
-        .personnel-box-item-h .personnel-box-item-form .personnel-box-item-group .personnel-box-item-value{
-            color: @white
-        }
-    .personnel .personnel-box .personnel-box-item .personnel-box-item-f .personnel-box-item-name{
-            color: @black;
-            font-weight: bold;
-        }
-    .personnel .personnel-box .personnel-box-item:hover .personnel-box-item-f .personnel-box-item-name{
-            color: @white
-        }
-    .personnel .personnel-box .personnel-box-item .personnel-box-item-f .personnel-box-item-icon{
-            color: @black;
-            font-weight: bold;
-        }
-        .personnel .personnel-box .personnel-box-item:hover .personnel-box-item-f .personnel-box-item-icon{
-            color: @white
-        }
-    .font-md{
-        color: @black;
-    }
-    .date-select.el-picker__popper.el-popper[role="tooltip"] .el-picker-panel .el-picker-panel__footer{
-        background: @deepblue;
-        border-color: @deepblue;
-    }
-    .date-select.el-picker__popper.el-popper[role="tooltip"] .el-picker-panel .el-date-picker__editor-wrap 
-    .el-time-panel .el-time-panel__footer{
-        background: @deepblue;
-    }
-    .el-picker-panel .el-time-panel__btn.cancel{
-        color: @white;
-    }
-    .el-time-panel__btn.confirm{
-        color: @black;
-    }
-
-    .el-picker-panel .el-picker-panel__footer .el-button--text{
-        color: @white;
-    }
-    .el-picker-panel .el-picker-panel__footer .el-button.is-plain{
-        background: @white;
-        border-color: @deepblue;
-        color: @black;
-    }
-    //视频监视
-    .iframe4 .el-dialog{
-        background: @white;
-
-    }
-}

src/assets/styles/theme/light/aqgk/personnel.less

@@ -0,0 +1,62 @@
+@import '../setting.less';
+
+#appBody.light {
+	//人员矩阵
+	.personnel {
+		.personnel-btn {
+			.i-btn {
+				&:hover,
+				&.active {
+					border: 1px solid rgba(75, 85, 174, 0.6);
+					background: rgba(75, 85, 174, 0.6);
+					color: @white;
+				}
+				background: rgb(220 221 223);
+				border: 1px solid @black;
+				color: @black;
+			}
+		}
+		.personnel-box {
+			.personnel-box-item {
+				background: @white;
+				border: 1px solid @black;
+				&:hover {
+					border: 1px solid @deepblue;
+					background: @deepblue;
+					.personnel-box-item-h .personnel-box-item-form .personnel-box-item-group {
+						.personnel-box-item-label,
+						.personnel-box-item-value {
+							color: @white;
+						}
+					}
+
+					.personnel-box-item-f {
+						.personnel-box-item-name,
+						.personnel-box-item-icon {
+							color: @white;
+						}
+					}
+				}
+
+				.personnel-box-item-h .personnel-box-item-form .personnel-box-item-group {
+					.personnel-box-item-label,
+					.personnel-box-item-value {
+						color: @black;
+						font-weight: bold;
+					}
+				}
+
+				.personnel-box-item-f {
+					.personnel-box-item-name,
+					.personnel-box-item-icon {
+						color: @black;
+						font-weight: bold;
+					}
+				}
+			}
+		}
+	}
+	.iframe4 .el-dialog {
+		background: @white;
+	}
+}

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

@@ -0,0 +1,371 @@
+@import './setting.less';
+
+#appBody.light {
+	// 组件部分
+	.com-collapse {
+		.collapse-box {
+			.box-text {
+				&:hover {
+					color: @purple;
+					font-weight: 700;
+					background: @fadePurple;
+				}
+			}
+			&.active {
+				background: @white;
+				.box-text {
+				 color: @purple;
+				 font-weight: 700;
+					background: @fadePurple;
+				}
+			}
+			.collapse-items .item.active {
+				background: @fadePurple;
+				color: @deepblue;
+				cursor: pointer;
+				font-weight: bold;
+			}
+		}
+	}
+	.wave {
+		z-index: 1;
+	}
+	.svg-icon {
+		.svg-icon-write,
+		.svg-icon.svg-icon-gray-l {
+			svg use {
+				fill: @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;
+	}
+	.table-form tr:nth-child(2n) {
+		background: @gray-3;
+	}
+
+	.com-table {
+		thead tr th {
+			font-weight: 700;
+			background: @gray-3;
+		}
+		tbody tr:nth-child(2n) {
+			background: @gray-3;
+		}
+	}
+	.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;
+	}
+
+	.title {
+		font-weight: bold;
+	}
+
+	.general-appearance-body,
+	.booster-station-body {
+		//升压站白色状态
+		background: @white;
+		transition: @transition;
+	}
+
+	.com-table {
+		thead tr th {
+			color: @black;
+		}
+
+		.el-scrollbar tr td {
+			color: @black;
+		}
+
+		.el-scrollbar tr td.light span,
+		.el-scrollbar tr td.light div {
+			color: @blue;
+		}
+	}
+	.btn.green,
+	.btn:hover {
+		color: @deepblue;
+		border-color: @deepblue;
+		background: rgba(@deepblueBg, 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-year-table {
+			td {
+				color: @black;
+			}
+			td.today .cell,
+			td:hover {
+				color: @blue;
+			}
+		}
+	}
+	.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: @gray-l;
+		}
+	}
+
+	.el-select {
+		.el-select__tags .el-tag {
+			background-color: fade(@deepblue, 20);
+			color: @deepblue;
+
+			.el-icon-close {
+				background-color: fade(@deepblue, 50);
+			}
+		}
+	}
+
+	.active {
+		background: @fadePurple;
+		color: @deepblue;
+	}
+
+	.el-month-table td .cell:hover,
+	.el-date-picker__header-label.active,
+	.el-date-picker__header-label:hover {
+		color: @blue;
+	}
+
+	.action-bar {
+		.selections {
+			.item {
+				background: @white;
+				color: @black;
+				&:hover,
+				&.active {
+					background: fade(@deepblue, 20);
+					border: 1px solid @deepblue;
+					color: @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;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	.el-table {
+		th {
+			color: @black;
+		}
+
+		.el-table__body tr.hover-row.current-row > td,
+		.el-table__body tr.hover-row.el-table__row--striped.current-row > td,
+		.el-table__body tr.hover-row.el-table__row--striped > td,
+		.el-table__body tr.hover-row > td {
+			color: @blue;
+		}
+
+		.ascending .sort-caret.ascending {
+			border-bottom-color: @deepblue;
+		}
+
+		.descending .sort-caret.descending {
+			border-top-color: @deepblue;
+		}
+	}
+
+	.el-checkbox {
+		color: @black;
+		&.is-bordered {
+			&.is-checked {
+				border-color: @deepblue;
+			}
+		}
+		.el-checkbox__input.is-checked + .el-checkbox__label {
+			color: @deepblue;
+		}
+		.el-checkbox__input.is-disabled + span.el-checkbox__label {
+			color: @black;
+		}
+		.el-checkbox__input.is-checked .el-checkbox__inner,
+		.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+			background-color: @deepblue;
+			border-color: @deepblue;
+		}
+
+		.el-checkbox__input.is-focus .el-checkbox__inner {
+			border-color: @deepblue;
+		}
+	}
+	.el-textarea {
+		.el-textarea__inner {
+			color: @black;
+			background: fade(@gray-l, 20);
+		}
+	}
+	.el-time-panel__btn {
+		&.confirm {
+			color: @deepblue;
+		}
+		&.cancel {
+			color: @gray;
+		}
+	}
+	.main-body input {
+		color: @black;
+		background: @white;
+	}
+	.font-md {
+		color: @black;
+	}
+	.date-select.el-picker__popper.el-popper[role='tooltip'] .el-picker-panel .el-picker-panel__footer {
+		background: @deepblue;
+		border-color: @deepblue;
+	}
+	.el-time-panel .el-time-panel__footer {
+		background: @deepblue;
+	}
+	.el-picker-panel .el-time-panel__btn.cancel {
+		color: @white;
+	}
+	.el-time-panel__btn.confirm {
+		color: @black;
+	}
+
+	.el-picker-panel {
+		.el-picker-panel__footer {
+			.el-button--text {
+				color: @white;
+			}
+			.el-button.is-plain {
+				background: @white;
+				border-color: @deepblue;
+				color: @black;
+			}
+		}
+	}
+}

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

@@ -1,223 +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, .el-scrollbar tr td.light div{
-			color: @blue;
-		}
-	}
-	.btn.green,.btn:hover{
-		color: @deepblue;
-		border-color: @deepblue;
-		background: rgba(@deepblueBg, 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-year-table{
-			td{
-				color: @black;
-			}
-			td.today .cell,td:hover{
-				color: @blue;
-			}
-		}
-	}
-	.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: @gray-l;
-		}
-	} 
-	
-	.decision-page-2,.decision-page-3,.decision-page-4{
-		.com-panel{
-			border-radius:0;
-			padding:0;
-		}
-	}
-	.action{
-		color: @blue;
-	}
-	
-	//线路对标
-	.el-select {
-	  .el-select__tags .el-tag {
-	    background-color: fade(@deepblue, 20);
-	    color: @deepblue;
-	
-	    .el-icon-close {
-	      background-color: fade(@deepblue, 50);
-	    }
-	  }
-	}
-	
-	//单机横向对比
-	.direction-info {
-	  .com-table {
-	    th,
-	    td {
-	      color: @black;
-	    }
-	  }
-	}
-	
-	// 状态转换率
-	.newspan {
-	  color: @black;
-	}
-	.newspan:hover {
-	  background: linear-gradient(to top,rgba(54,52,142, 0.5),rgba(54,52,142, 0));
-	  color: @deepblue;
-	}
-	.newspan:hover::after {
-	  border: 0.093vh solid @deepblue;
-	}
-	.active {
-	  // background: linear-gradient(to top,rgba(54,52,142, 0.5),rgba(54,52,142, 0));
-	  background:@fadePurple;
-	  color: @deepblue;
-	}
-	.active::after {
-	  // border: 0.093vh solid @deepblue;
-	}
-	
-	.el-month-table td .cell:hover,
-	.el-date-picker__header-label.active,
-	.el-date-picker__header-label:hover{
-		color:@blue;
-	}
-	
-	// 综合分析
-	.ztfx {
-	  .table-complex {
-	    .table {
-	      tbody {
-	        tr:nth-child(2n) td {
-	          background-color: fade(@black, 20%);
-	          &.item {
-	            background-color: transparent;
-	          }
-	        }
-	      }
-	
-	      th {
-	        background: fade(@black, 40);
-	        color: @white;
-	      }
-	      td {
-	        color: @black;
-	      }
-	    }
-	  }
-	  .table-panel {
-	    .table {
-	      tbody {
-	        tr:nth-child(2n) td {
-	          background-color: fade(@black, 20%);
-	        }
-	      }
-	      th {
-	        background: fade(@black, 40);
-	        color: @white;
-	      }
-	      td {
-	        color: @black;
-	      }
-	    }
-	  }
-	}
-	
-  .action-bar {
-	.selections {
-	  .item {
-		color: @black;
-		&:hover,
-		&.active {
-		  background: fade(@deepblue, 20);
-		  border: 1px solid @deepblue;
-		  color: @deepblue;
-		}
-	  }
-	}
-  }
-
-  // 风场信息
-  .fc-info {
-	.fc-item {
-	  & > .title {
-		color: @black;
-	  }
-	  .tags {
-		.tag {
-		  .tag-title {
-			color: @black;
-		  }
-		  .tag-value {
-			color: @deepblue;
-		  }
-		}
-	  }
-	}
-  }
-}

src/assets/styles/theme/light/jjyx/decision1.less

@@ -0,0 +1,15 @@
+@import "../setting.less";
+
+#appBody.light {
+    // 风机绩效榜
+    .decision-page-2,.decision-page-3,.decision-page-4{
+    	.com-panel{
+    		border-radius:0;
+    		padding:0;
+    	}
+    }
+    .action{
+    	color: @blue;
+    }
+   
+}

src/assets/styles/theme/light/jjyx/decision3db.less

@@ -0,0 +1,13 @@
+@import '../setting.less';
+
+#appBody.light {
+	//单机横向对比
+	.direction-info {
+		.com-table {
+			th,
+			td {
+				color: @black;
+			}
+		}
+	}
+}

src/assets/styles/theme/light/jjyx/ztfx.less

@@ -0,0 +1,43 @@
+@import '../setting.less';
+
+#appBody.light {
+	// 专题分析
+	.ztfx {
+		.table-complex {
+			.table {
+				tbody {
+					tr:nth-child(2n) td {
+						background-color: fade(@black, 20%);
+						&.item {
+							background-color: transparent;
+						}
+					}
+				}
+
+				th {
+					background: fade(@black, 40);
+					color: @white;
+				}
+				td {
+					color: @black;
+				}
+			}
+		}
+		.table-panel {
+			.table {
+				tbody {
+					tr:nth-child(2n) td {
+						background-color: fade(@black, 20%);
+					}
+				}
+				th {
+					background: fade(@black, 40);
+					color: @white;
+				}
+				td {
+					color: @black;
+				}
+			}
+		}
+	}
+}

src/assets/styles/theme/light/jjyx/ztzhl.less

@@ -0,0 +1,15 @@
+@import '../setting.less';
+
+#appBody.light {
+	// 状态转换率
+	.newspan {
+		color: @black;
+	}
+	.newspan:hover {
+		background: linear-gradient(to top, rgba(54, 52, 142, 0.5), rgba(54, 52, 142, 0));
+		color: @deepblue;
+	}
+	.newspan:hover::after {
+		border: 0.093vh solid @deepblue;
+	}
+}

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

@@ -1,252 +0,0 @@
-@import "./setting.less";
-
-#appBody.light {
-
-    //驾驶舱模块-矩阵白色主题样式二级页面
-
-    .title {
-        font-weight: bold;
-    }
-
-    //右侧导航栏第一个-最右侧
-    .light-matrix-small {
-        background: @white;
-        transition: @transition;
-    }
-
-    //最右侧导航
-   
-
-    //右侧导航栏第二个底色
-    .df-table .custom-table.el-table {
-        background: @white;
-        transition: @transition;
-    }
-
-    .general-appearance-body {
-        background: @white;
-        transition: @transition;
-    }
-
-    .booster-station-body {
-        background: @white;
-        transition: @transition;
-    }
-
-    .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 {
-        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 {
-        background: @white;
-        transition: @transition;
-    }
-
-    .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 {
-        color: @deepblue;
-        cursor: pointer;
-        font-weight: bold;
-    }
-
-    .matrix .panel-title .panel-title-name {
-        color: @deepblue;
-    }
-
-    .wave {
-        z-index: 1;
-    }
-
-    .svg-icon.svg-icon-write svg use {
-        fill: @black;
-    }
-
-    .svg-icon.svg-icon-gray-l svg use {
-        fill: @black;
-    }
-
-    //驾驶舱模块-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;
-    }
-	
-	.wind-site-info {
-		.wind-site-menu {
-			border-radius: 0 15px 0 0;
-			color: @black;
-		  background: @gray-3;
-		}
-	}
-	
-	.com-collapse {
-		.collapse-box {
-			.box-text {
-				&:hover {
-					color: @purple;
-					font-weight: 700;
-				  background: @fadePurple;
-				}
-			}
-			&.active {
-				background: @white;
-			  .box-text {
-				  color: @purple;
-				  font-weight: 700;
-				background: @fadePurple;
-			  }
-			}
-			.collapse-items .item.active{
-				background: @fadePurple;
-			}
-		}
-	}
-	
-	.wind-site-warning .search .options .option-item{
-		background: @white;
-		.count,.text{
-			border-radius: 0.3125rem;
-			border: none;
-			background: @gray-3;
-		}
-		&.active{
-			.count,.text{
-				background: @fadePurple;
-				color: @deepblue;
-			}
-		}
-	}
-	
-	.wind-site-info{
-		.wind-site-info-body {
-			.info-menu {
-				.info-menu-item {
-					& + .info-menu-item {
-						border: none;
-						background-color: @white;
-					}
-				}
-			}
-		}
-	}
-	
-	
-		
-	.table-form tr:nth-child(2n){
-		background: @gray-3;
-	}
-	.generator .info-panel .panel-title{
-		background: @gray-3;
-	}
-	.com-table {
-		thead tr th{
-			font-weight: 700;
-			background: @gray-3;
-		}
-		tbody tr:nth-child(2n){
-			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/agc.less

@@ -0,0 +1,24 @@
+@import '../setting.less';
+
+#appBody.light {
+	// AGC 监视
+	.com-panel2 .panel-header2 {
+		&::after {
+			background-image: linear-gradient(to right, @white, rgba(5, 187, 76, 0));
+		}
+		.panel-tools2 {
+			color: @black;
+			opacity: 0.3;
+		}
+		.panel-title2 {
+			color: @deepblue;
+			.panel-icon2 {
+				color: @black;
+			}
+		}
+	}
+
+	.panel-table .data-item .data-item-count {
+		color: @deepblue;
+	}
+}

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

@@ -0,0 +1,31 @@
+@import '../setting.less';
+
+#appBody.light {
+	//风场-场站监视
+	.station-tip {
+		background-color: @gray-l;
+		color: @black;
+	}
+
+	.wind-site-info {
+		//场站监视
+		.wind-site-info-body {
+			.info-menu {
+				.info-menu-item {
+					& + .info-menu-item {
+						border: none;
+						background-color: @white;
+					}
+				}
+			}
+		}
+	}
+	.light-matrix-small {
+		background: @white;
+		transition: @transition;
+	}
+	.df-table .custom-table.el-table {
+		background: @white;
+		transition: @transition;
+	}
+}

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

@@ -1,72 +1,94 @@
-@import "../setting.less";
+@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;
+#appBody.light {
+	// 单机状态监视
+	.wind-site-warning .search .options .option-item {
+		background: @white;
+		transition: @transition;
+		.count,
+		.text {
+			border-radius: 0.3125rem;
+			border: none;
+			background: @gray-3;
+		}
+		&.active {
+			.count,
+			.text {
+				background: @fadePurple;
+				color: @deepblue;
+			}
+		}
+	}
+
+	//右侧导航栏第一个-天气
+	.wind-site-weather {
+		border-radius: 10px;
+		border: none;
+		background: @white;
+		transition: @transition;
+	}
+	.generator .info-panel .panel-title {
+		background: @gray-3;
+	}
+	.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-info {
+		.wind-site-menu {
+			border-radius: 0 15px 0 0;
+			color: @black;
+			background: @gray-3;
+		}
+	}
+	.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;
-   	}
-   }
-}
+		.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/inverter-info.less

@@ -0,0 +1,53 @@
+@import '../setting.less';
+
+#appBody.light {
+	//
+	.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;
+				.states {
+					background: @white;
+					transition: @transition;
+					.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-title {
+				position: relative;
+				background: @white;
+				transition: @transition;
+				.title {
+					color: @deepblue;
+					font-weight: bold;
+				}
+				.title-tools-left {
+					color: @black;
+				}
+			}
+			.table-form.mg-b-8 {
+				background: @white;
+				transition: @transition;
+			}
+		}
+	}
+}

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

@@ -1,27 +1,27 @@
-@import "../setting.less";
+@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;
-   }
-   
-}
+#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/map.less

@@ -0,0 +1,11 @@
+@import "../setting.less";
+
+#appBody.light {
+    // 
+   .map-1 .btn-group-tabs {
+       display: flex;
+       flex-direction: row;
+       background: @white;
+       height: 50px;
+   }
+}

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

@@ -0,0 +1,7 @@
+@import "../setting.less";
+
+#appBody.light {
+   .matrix .panel-title .panel-title-name {//风场矩阵
+       color: @deepblue;
+   }
+}

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

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

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

@@ -201,10 +201,6 @@
         color: @black;
     }
 
-    .action-bar .selections .item {
-        background: @white;
-    }
-
     //预警记录-升压站报警
     .number {
         background: @white;
@@ -215,6 +211,7 @@
     .custom-report-items .title {
         background: @white;
         color: @black;
+		width: 18.2vw;
     }
 
     .el-pagination .el-pager li {

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

@@ -1,433 +0,0 @@
-@import "./setting.less";
-#appBody.light {
-	// 故障诊断
-	.el-table{
-		th{
-			color:@black;
-		}
-		
-		.el-table__body tr.hover-row.current-row > td,
-		.el-table__body tr.hover-row.el-table__row--striped.current-row > td,
-		.el-table__body tr.hover-row.el-table__row--striped > td,
-		.el-table__body tr.hover-row > td {
-		  color: @blue;
-		}
-		
-		.ascending .sort-caret.ascending {
-		  border-bottom-color: @deepblue;
-		}
-		
-		.descending .sort-caret.descending {
-		  border-top-color: @deepblue;
-		}
-	} 
-	
-	
-	// 故障回溯
-	.el-checkbox {
-	  color: @black;
-	
-	  &.is-bordered {
-	    &.is-checked {
-	      border-color: @deepblue;
-	    }
-	  }
-	
-	  .el-checkbox__input.is-checked + .el-checkbox__label {
-	    color: @deepblue;
-	  }
-	  .el-checkbox__input.is-disabled+span.el-checkbox__label{
-		  color: @black;
-	  }
-	  .el-checkbox__input.is-checked .el-checkbox__inner,
-	  .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-	    background-color: @deepblue;
-	    border-color: @deepblue;
-	  }
-	
-	  .el-checkbox__input.is-focus .el-checkbox__inner {
-	    border-color: @deepblue;
-	  }
-	}
-	
-	.time-axis-box {
-	    .time-axis-progress-box {
-	        .time-axis-progress {
-	            background: fade(@deepblue, 60);
-	        }
-	        .time-axis-progress-scale {
-	            border: 1px solid @deepblue;
-	        }
-	    }
-	}
-	
-	.fdp-sub-title {
-	    color: @deepblue;
-	}
-	
-	// 健康推荐
-  .selections {
-	.item {
-	  color: @black;
-	  background: fade(@black, 20);
-	  border: 1px solid fade(@black, 20);
-
-	  &:hover,
-	  &.active {
-		background: fade(@deepblue, 20);
-		border: 1px solid @deepblue;
-		color: @deepblue;
-	  }
-	}
-  }
-
-  .power-info {
-
-	.info-tab {
-	  .tab {
-		color: @black;
-		background: fade(@black, 20);
-		border: 1px solid fade(@black, 20);
-		i {
-		  svg use {
-			fill: @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;
-		}
-
-		&.active::before {
-		  border-bottom: 9px solid #063319;
-		}
-	  }
-
-	}
-  }
-
-  .health-report {
-	// 健康报告 按钮样式
-	.actions {
-		.active{
-			border: 1px solid @deepblue;
-		}
-	  .item {
-		color: fade(@white, 75);
-		&.green {
-		  background: @deepblue;
-		}
-
-		&.purple {
-		  background: @purple;
-		}
-
-		&.gray {
-		  background: @black;
-		}
-	  }
-	}
-
-	.report-items {
-
-	  .item {
-		.title {
-		  background: fade(@black, 40);
-		  color: @black;
-		}
-
-		.info {
-		  background: fade(@black, 20);
-		  color: @font-color;
-		  .actions {
-			.success {
-			  border-color:@deepblue;
-			  color: @deepblue;
-			  background: fade(@deepblue,20);
-			}
-		  }
-		}
-	  }
-	}
-  }
-  
-  // 健康推荐-已分配任务
-  .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;
-				}
-		  }
-	  }
-  }
-  .el-time-panel__btn.confirm {
-    color: @deepblue;
-  }
-  
-  // .el-time-panel__btn.cancel {
-  //   color: @gray;
-  // }
-  .health-6 .header-info .selections .item:hover i svg use, .health-6 .header-info .selections .item.active i svg use {
-      fill: @deepblue;
-  }
-  .health-matrix{
-	  .green{
-		  color:@green;
-	  }
-	  .health-matrix-panel {
-		  .header{
-			  .svg-icon svg use{
-				  fill:@black;
-			  }
-			  .tools .tool-block .legend-value{
-			  		color: @black;
-			  }
-		  } 
-	  }
-  }
-  
-  .main-body input{
-	  color:@black;
-	  background:@white;
-  }
-}

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

@@ -0,0 +1,280 @@
+@import '../setting.less';
+
+#appBody.light {
+	// 健康推荐
+	.selections {
+		.item {
+			color: @black;
+			background: fade(@black, 20);
+			border: 1px solid fade(@black, 20);
+
+			&:hover,
+			&.active {
+				background: fade(@deepblue, 20);
+				border: 1px solid @deepblue;
+				color: @deepblue;
+			}
+		}
+	}
+
+	.power-info {
+		.info-tab {
+			.tab {
+				color: @black;
+				background: fade(@black, 20);
+				border: 1px solid fade(@black, 20);
+				i {
+					svg use {
+						fill: @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;
+				}
+
+				&.active::before {
+					border-bottom: 9px solid #063319;
+				}
+			}
+		}
+	}
+	.health-report {
+		// 健康报告 按钮样式
+		.actions {
+			.active {
+				border: 1px solid @deepblue;
+			}
+			.item {
+				color: fade(@white, 75);
+				&.green {
+					background: @deepblue;
+				}
+
+				&.purple {
+					background: @purple;
+				}
+
+				&.gray {
+			  background: @black;
+				}
+			}
+		}
+
+		.report-items {
+			.item {
+				.title {
+					background: fade(@black, 40);
+					color: @black;
+				}
+
+				.info {
+					background: fade(@black, 20);
+					color: @font-color;
+					.actions {
+						.success {
+					  border-color: @deepblue;
+							color: @deepblue;
+							background: fade(@deepblue, 20);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// 健康推荐-已分配任务
+	.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;
+						}
+					}
+				}
+			}
+		}
+	}
+	.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;
+					}
+				}
+			}
+		}
+	}
+
+	.health-3 {
+		.com-panel {
+			.green {
+				color: @green;
+				&.lengend {
+					background: @blue;
+				}
+			}
+		}
+	}
+	.health-6 .header-info .selections .item:hover i svg use,
+	.health-6 .header-info .selections .item.active i svg use {
+		fill: @deepblue;
+	}
+	.health-matrix {
+		.green {
+			color: @green;
+		}
+		.health-matrix-panel {
+			.header {
+				.svg-icon svg use {
+					fill: @black;
+				}
+				.tools .tool-block .legend-value {
+					color: @black;
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,19 @@
+@import "../setting.less";
+
+#appBody.light {
+    // 故障回溯
+   .time-axis-box {
+       .time-axis-progress-box {
+           .time-axis-progress {
+               background: fade(@deepblue, 60);
+           }
+           .time-axis-progress-scale {
+               border: 1px solid @deepblue;
+           }
+       }
+   }
+   
+   .fdp-sub-title {
+       color: @deepblue;
+   }
+}

src/components/arcgis/MHS_FDC.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div class="map-1" style="width: 100%; height: 100%">
     <arcgis
       class="arcgis-layer"
       @when="when"

src/components/arcgis/NSS_FDC.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div class="map-1" style="width: 100%; height: 100%">
     <arcgis
       class="arcgis-layer"
       @when="when"

src/components/arcgis/QS_FDC.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div class="map-1" style="width: 100%; height: 100%">
     <arcgis
       class="arcgis-layer"
       @when="when"

src/components/arcgis/SBQ_FDC.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div class="map-1" style="width: 100%; height: 100%">
     <arcgis
       class="arcgis-layer"
       @when="when"

src/components/arcgis/XS_FDC.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div class="map-1" style="width: 100%; height: 100%">
     <arcgis
       class="arcgis-layer"
       @when="when"

src/components/chart/bar/multiple-bar-chart.vue

@@ -387,7 +387,11 @@ export default {
 
   watch: {
     "$store.state.themeName"() {
-      this.initChart();
+      let myChart = echarts.init(document.getElementById(this.id));
+      myChart.dispose();
+      setTimeout(() => {
+        this.initChart();
+      }, 300);
     },
   },
 };

src/components/coms/collapse/collapse-list.vue

@@ -231,4 +231,5 @@ export default {
     }
   }
 }
+
 </style>

src/views/About.vue

@@ -355,7 +355,7 @@ export default {
           fontSize: util.vh(16),
           color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
         },
-        //图例-每一条数据的名字叫销量
+        //图例-每一条数据的名字
         legend: {
           show: true,
           data: ["风速功率", "实际功率", "最优功率"],
@@ -450,7 +450,9 @@ export default {
         series,
       };
 
+      myChart.off("brushSelected");
       myChart.on("brushSelected", (params) => {
+        console.log(123123, params);
         const selected = params.batch[0]?.selected;
         let selectRes = [];
         selected?.forEach((pEle) => {

src/views/HealthControl/Health10.vue

@@ -30,9 +30,13 @@
                 <tr>
                   <th rowspan="1" class="type1" style="width: 50px"></th>
                   <th rowspan="1" class="type1" style="width: 105px">健康度</th>
-                  <th rowspan="2" class="type1" style="width: 400px">MTBF（H/H）</th>
+                  <th rowspan="2" class="type1" style="width: 400px">
+                    MTBF（H/H）
+                  </th>
                   <th rowspan="1" class="type1" style="width: 180px"></th>
-                  <th rowspan="1" class="type1" style="width: 100px">MTTR（H）</th>
+                  <th rowspan="1" class="type1" style="width: 100px">
+                    MTTR（H）
+                  </th>
                 </tr>
               </thead>
             </table>
@@ -45,13 +49,22 @@
                         {{ item[1] }}
                       </td>
                       <td style="width: 105px">
-                        <div :style="'background-color: ' + item[0] + ';width:10px;height:10px;margin:0 auto;'"></div>
+                        <div
+                          :style="
+                            'background-color: ' +
+                            item[0] +
+                            ';width:10px;height:10px;margin:0 auto;'
+                          "
+                        ></div>
                       </td>
                       <td style="width: 400px">
                         <div class="percent-item">
                           {{ item[3] }}%
                           <div class="percent-bar" style="margin-right: 4px">
-                            <div class="percent-value" :style="'width:' + item[3] + '%'"></div>
+                            <div
+                              class="percent-value"
+                              :style="'width:' + item[3] + '%'"
+                            ></div>
                           </div>
                           <!-- 剩余9999/建个故障9999 -->
                           {{ item[4] }}
@@ -74,9 +87,17 @@
       <el-col :span="12">
         <div class="chart-title">
           <div class="title-panel" style="">
-            <span style="text-align: left; padding-left: 20px; font-size: 12px">故障信息 </span>
-            <span class="des-title">预计损失电量<span class="num">73824.0</span><span class="unit">Kwh</span></span>
-            <span class="des-title">预计检修时长<span class="num">29.33</span><span class="unit">H</span></span>
+            <span style="text-align: left; padding-left: 20px; font-size: 12px"
+              >故障信息
+            </span>
+            <span class="des-title"
+              >预计损失电量<span class="num">73824.0</span
+              ><span class="unit">Kwh</span></span
+            >
+            <span class="des-title"
+              >预计检修时长<span class="num">29.33</span
+              ><span class="unit">H</span></span
+            >
           </div>
           <!-- <img-line-chart
             height="270px"
@@ -87,13 +108,17 @@
     </el-row>
     <div class="fc-info mg-b-16">
       <panel :title="'曲线'" :showLine="false">
-        <zoom-line-chart height="28vh" :list="powerChartData.value" :units="powerChartData.units" />
+        <zoom-line-chart
+          height="28vh"
+          :list="powerChartData.value"
+          :units="powerChartData.units"
+        />
       </panel>
     </div>
     <HealthReport
       :show="healthReportShow"
       :params="reportparams"
-	  ref="eport"
+      ref="eport"
       @closed="
         (res) => {
           this.healthReportShow = false;
@@ -170,7 +195,7 @@ export default {
             click(e, row) {
               // that.recorddate = row.date;
               that.healthReportShow = true;
-			  that.$refs.eport.getReport(that.wtId,row.date);
+              that.$refs.eport.getReport(that.wtId, row.date);
             },
           },
         ],
@@ -242,7 +267,11 @@ export default {
             name: "故障名称",
             field: "v1",
             template: function (data) {
-              return "<div style='overflow: hidden;text-overflow:ellipsis;white-space: nowrap;'>" + data + "</div>";
+              return (
+                "<div style='overflow: hidden;text-overflow:ellipsis;white-space: nowrap;'>" +
+                data +
+                "</div>"
+              );
             },
           },
           {
@@ -329,8 +358,9 @@ export default {
       this.getWeather();
     },
     switchWt(data) {
-      this.$router.push(`/health/health10/${data.wpId}/${data.wtId}`);
-      this.init();
+      if (data.wpId && data.wtId) {
+        this.$router.replace(`/health/health10/${data.wpId}/${data.wtId}`);
+      }
     },
     // 获取等级评价
     getTop5() {
@@ -366,7 +396,9 @@ export default {
       for (let i = 0; i < day; i++) {
         tableData.push({
           index: i + 1,
-          date: new Date(new Date().getTime() - 3600 * 1000 * 24 * (i + 1)).formatDate("yyyy-MM-dd hh:mm:ss"),
+          date: new Date(
+            new Date().getTime() - 3600 * 1000 * 24 * (i + 1)
+          ).formatDate("yyyy-MM-dd hh:mm:ss"),
           wtId: this.wtId,
         });
       }
@@ -390,8 +422,12 @@ export default {
             const item = {
               index: index + 1,
               warnDesc: ele.warnDesc,
-              startTime: new Date(ele.startTime).formatDate("yyyy-MM-dd hh:mm:ss"),
-              stopTime: new Date(ele.stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+              startTime: new Date(ele.startTime).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              ),
+              stopTime: new Date(ele.stopTime).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              ),
               stopHours: ele.stopHours,
             };
             if (index < 5) {
@@ -502,6 +538,11 @@ export default {
       }
     },
   },
+  watch: {
+    $route() {
+      this.init();
+    },
+  },
 };
 </script>
 

src/views/HealthControl/Health4.vue

@@ -48,18 +48,22 @@ export default {
         {
           icon: "svg-q实时监视",
           path: "/health/health0",
+          text: "风机实时监视",
         },
         {
           icon: "svg-q健康",
           path: "/health/health10",
+          text: "风机健康总览",
         },
         {
           icon: "svg-q趋势",
           path: "/health/health4/healthLineChart2",
+          text: "风机健康趋势",
         },
         {
           icon: "svg-q曲线",
           path: "/health/health4/healthLineChart",
+          text: "风机健康曲线",
         },
       ],
     };
@@ -74,8 +78,9 @@ export default {
   },
 
   methods: {
-    clickMenu: function (index) {
+    clickMenu(index) {
       this.activeIndex = index;
+      this.$store.dispatch("changeModuleName", this.menuDatas[index].text);
     },
   },
 };

src/views/HealthControl/healthLineChart.vue

@@ -1,19 +1,27 @@
 <template>
   <div class="pageBox">
     <wt-chooser @change="switchWt" :wpId="wpId" :wtId="wtId"></wt-chooser>
-    <simple-line-chart :height="'100px'" v-for="(item, index) in chartData" :key="index" :title="item.title" :data="item.data" :color="item.color" :lineTitle="item.lineTitle" />
+    <simple-line-chart
+      :height="'100px'"
+      v-for="(item, index) in chartData"
+      :key="index"
+      :title="item.title"
+      :data="item.data"
+      :color="item.color"
+      :lineTitle="item.lineTitle"
+    />
   </div>
 </template>
 
 <script>
 import SimpleLineChart from "../../components/chart/line/simple-line-chart.vue";
-import WtChooser from "@com/coms/wt-chooser/wt-chooser.vue"
+import WtChooser from "@com/coms/wt-chooser/wt-chooser.vue";
 export default {
   setup() {},
-  components: { SimpleLineChart ,WtChooser},
+  components: { SimpleLineChart, WtChooser },
   data() {
     return {
-      chartData:[]
+      chartData: [],
     };
   },
 
@@ -22,59 +30,66 @@ export default {
     this.wpId = this.$route.params.wpId;
     this.requestData();
   },
-  
-  methods:{
-    switchWt(data){
-      this.$router.push(`/health/health4/healthLineChart/${data.wpId}/${data.wtId}`);
-      this.wtId = this.$route.params.wtId;
-      this.wpId = this.$route.params.wpId;
-      this.requestData();
+
+  methods: {
+    switchWt(data) {
+      if (data.wpId && data.wtId) {
+        this.$router.push(
+          `/health/health4/healthLineChart/${data.wpId}/${data.wtId}`
+        );
+      }
     },
-    requestData(){
-      let that=this;
+    requestData() {
+      let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "healthsub/hsFjValueIndex",
-        data:{
-          wtId: that.wtId
+        data: {
+          wtId: that.wtId,
         },
         success(res) {
+          const color = ["green", "yellow", "purple", "blue", "orange"];
+          let chartData = [];
+          let lineTitle = [];
 
-          const color=["green","yellow","purple","blue","orange"];
-          let chartData=[];
-          let lineTitle=[];
-
-          res.data.xData.forEach(ele=>{
+          res.data.xData.forEach((ele) => {
             lineTitle.push(new Date(ele).formatDate("hh:mm"));
           });
 
-          res.data.datasets.forEach((ele,index)=>{
+          res.data.datasets.forEach((ele, index) => {
             chartData.push({
-              title:ele.name,
-              data:ele.data,
-              color:color[index],
-              lineTitle
+              title: ele.name,
+              data: ele.data,
+              color: color[index],
+              lineTitle,
             });
           });
-          that.chartData=chartData;
+          that.chartData = chartData;
         },
       });
-    }
-  }
+    },
+  },
+  watch: {
+    $route(res) {
+      this.wtId = res.params.wtId;
+      this.wpId = res.params.wpId;
+      this.requestData();
+    },
+  },
 };
 </script>
 
 <style lang="less" scoped>
 .pageBox {
   width: 100%;
-  height:calc(100% - 1.481vh * 2);
+  height: calc(100% - 1.481vh * 2);
   display: flex;
   flex-direction: column;
   justify-content: space-between;
 
-  .chart{
+  .chart {
     width: 100%;
-    height:25%;
+    height: 25%;
   }
 }
 </style>

src/views/HealthControl/healthLineChart2.vue

@@ -19,7 +19,11 @@
       </div>
       <div class="info-chart">
         <panel class="info-chart-panel" :title="'健康趋势'">
-          <vertival-bar-line-chart :height="'310px'" :bardata="bardata" :lineData="lineData"/>
+          <vertival-bar-line-chart
+            :height="'310px'"
+            :bardata="bardata"
+            :lineData="lineData"
+          />
         </panel>
       </div>
     </div>
@@ -40,25 +44,39 @@ import NormalLineChart from "../../components/chart/line/normal-line-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
 import Table from "../../components/coms/table/table.vue";
-import WtChooser from "@com/coms/wt-chooser/wt-chooser.vue"
+import WtChooser from "@com/coms/wt-chooser/wt-chooser.vue";
 export default {
   setup() {},
-  components: { SvgIcon, Panel, VertivalBarLineChart, NormalLineChart, Table, WtChooser },
+  components: {
+    SvgIcon,
+    Panel,
+    VertivalBarLineChart,
+    NormalLineChart,
+    Table,
+    WtChooser,
+  },
   data() {
     return {
       infoList: [
         // {title: '24小时健康趋势', svgid: 'svg-24-houre', active: false, type: 'houre'},
         { title: "7日健康趋势", svgid: "svg-h-day", active: true, type: "day" },
-        { title: "30日健康趋势", svgid: "svg-h-month", active: false, type: "month"},
+        {
+          title: "30日健康趋势",
+          svgid: "svg-h-month",
+          active: false,
+          type: "month",
+        },
       ],
       tableData: {
         column: [
-          { name: "部件名称",field: "name" },
-          { name: "MTBF（h）",field: "v1", is_num: true },
-          { name: "MTTR（h）",field: "v2", is_num: true },
-          { name: "损失电量（kw/h）",field: "v3",is_num: true },
-          { name: "当前状态",field: "v4",
-            template: function(data) {
+          { name: "部件名称", field: "name" },
+          { name: "MTBF（h）", field: "v1", is_num: true },
+          { name: "MTTR（h）", field: "v2", is_num: true },
+          { name: "损失电量（kw/h）", field: "v3", is_num: true },
+          {
+            name: "当前状态",
+            field: "v4",
+            template: function (data) {
               if (data == 1) return "<div class='dot green'></div>";
               else if (data == 2) return "<div class='dot purple'></div>";
               else if (data == 3) return "<div class='dot yellow'></div>";
@@ -72,25 +90,28 @@ export default {
       lineData: [],
       wtId: undefined,
       wpId: undefined,
-      hisValue: {},  //健康走势图
+      hisValue: {}, //健康走势图
     };
   },
   created() {
     this.init();
   },
-  methods:{
-    init(){
+  methods: {
+    init() {
       this.wtId = this.$route.params.wtId;
       this.wpId = this.$route.params.wpId;
       this.requestCoulometry(2);
       this.requestHisValue();
       this.requestMttrrand();
     },
-    switchWt(data){
-      this.$router.push(`/health/health4/healthLineChart2/${data.wpId}/${data.wtId}`);
-      this.init();
+    switchWt(data) {
+      if (data.wpId && data.wtId) {
+        this.$router.replace(
+          `/health/health4/healthLineChart2/${data.wpId}/${data.wtId}`
+        );
+      }
     },
-     // 未确认缺陷按钮下的健康趋势选项
+    // 未确认缺陷按钮下的健康趋势选项
     onClickInfo(item) {
       this.infoList.forEach((element) => {
         if (item.type == element.type) {
@@ -128,46 +149,99 @@ export default {
       });
     },
     //风机健康走势图
-    requestHisValue(){
+    requestHisValue() {
       let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "healthsub/findWtHisValueForBj",
         data: { wtId: that.wtId },
         success(res) {
-          if(res.code == 200){
+          if (res.code == 200) {
             let data = res.data;
-            data.time = data.time.slice(0, 65)
-            that.hisValue = data
+            data.time = data.time.slice(0, 65);
+            that.hisValue = data;
           }
         },
       });
     },
     //部件健康情况
-    requestMttrrand(){
+    requestMttrrand() {
       let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "healthsub/getWtMttrandMtbfByBj",
         data: { wtId: that.wtId },
         success(res) {
-          if(res.code == 200){
+          if (res.code == 200) {
             let data = res.data;
             that.tableData.data = [
-              {name:data.clx[1], v1:data.clx[4], v2:data.clx[5], v3:data.clx[6], v4:data.clx[0]},
-              {name:data.fdj[1], v1:data.fdj[4], v2:data.fdj[5], v3:data.fdj[6], v4:data.fdj[0]},
-              {name:data.bj[1], v1:data.bj[4], v2:data.bj[5], v3:data.bj[6], v4:data.bj[0]},
-              {name:data.zk[1], v1:data.zk[4], v2:data.zk[5], v3:data.zk[6], v4:data.zk[0]},
-              {name:data.zz[1], v1:data.zz[4], v2:data.zz[5], v3:data.zz[6], v4:data.zz[0]},
-              {name:data.ph[1], v1:data.ph[4], v2:data.ph[5], v3:data.ph[6], v4:data.ph[0]},
-              {name:data.jc[1], v1:data.jc[4], v2:data.jc[5], v3:data.jc[6], v4:data.jc[0]},
-              {name:data.bpq[1], v1:data.bpq[4], v2:data.bpq[5], v3:data.bpq[6], v4:data.bpq[0]},
-            ]
+              {
+                name: data.clx[1],
+                v1: data.clx[4],
+                v2: data.clx[5],
+                v3: data.clx[6],
+                v4: data.clx[0],
+              },
+              {
+                name: data.fdj[1],
+                v1: data.fdj[4],
+                v2: data.fdj[5],
+                v3: data.fdj[6],
+                v4: data.fdj[0],
+              },
+              {
+                name: data.bj[1],
+                v1: data.bj[4],
+                v2: data.bj[5],
+                v3: data.bj[6],
+                v4: data.bj[0],
+              },
+              {
+                name: data.zk[1],
+                v1: data.zk[4],
+                v2: data.zk[5],
+                v3: data.zk[6],
+                v4: data.zk[0],
+              },
+              {
+                name: data.zz[1],
+                v1: data.zz[4],
+                v2: data.zz[5],
+                v3: data.zz[6],
+                v4: data.zz[0],
+              },
+              {
+                name: data.ph[1],
+                v1: data.ph[4],
+                v2: data.ph[5],
+                v3: data.ph[6],
+                v4: data.ph[0],
+              },
+              {
+                name: data.jc[1],
+                v1: data.jc[4],
+                v2: data.jc[5],
+                v3: data.jc[6],
+                v4: data.jc[0],
+              },
+              {
+                name: data.bpq[1],
+                v1: data.bpq[4],
+                v2: data.bpq[5],
+                v3: data.bpq[6],
+                v4: data.bpq[0],
+              },
+            ];
           }
         },
       });
-    }
-  }
+    },
+  },
+  watch: {
+    $route() {
+      this.init();
+    },
+  },
 };
 </script>
 

src/views/MalfunctionWarning/components/superviseDataClassify.vue

@@ -361,8 +361,8 @@ export default {
       params.dataInfos = dataInfos
       axios({
         method: "post",
-        url: "http://10.155.32.14:9090/api/supervised/execute",
-		// url: "http://192.168.10.16:8080/api/supervised/execute",
+        // url: "http://10.155.32.14:9090/api/supervised/execute",
+		url: "http://192.168.10.16:8080/api/supervised/execute",
         data: params,
         header: {
           "Content-Type": "application/json",

src/views/WindSite/pages/Home/wind-site-weather.vue

@@ -1,4 +1,4 @@
-// 天气分析
+<!-- 天气分析 -->
 <template>
   <div class="wind-site-weather">
     <!-- <div class="title">风场 {{ nowTime }} 实况</div> -->

src/views/alarmCenter/customStatistics.vue

@@ -292,6 +292,8 @@ export default {
 .custom-report-items {
   display: flex;
   flex-wrap: wrap;
+  height: 80vh;
+  overflow-y:auto;
   .title {
     height: 80px;
     width: 18.8vw;

src/views/faultManual/index.vue

@@ -85,18 +85,21 @@ export default {
           {
             name: "故障分类",
             field: "widget",
+            width: '200px',
             is_num: false,
             is_light: false,
           },
           {
             name: "故障名称",
             field: "name",
+            width: '350px',
             is_num: false,
             is_light: false,
           },
           {
             name: "故障原因",
             field: "cause",
+            width: '500px',
             is_num: false,
             is_light: false,
           },
@@ -109,6 +112,7 @@ export default {
           {
             name: "操作",
             field: "",
+            width: '200px',
             is_num: false,
             is_light: false,
             template() {
@@ -154,7 +158,7 @@ export default {
           },
           success(res) {
             that.WidgetArray = res.data;
-            that.WidgetType = res?.data[0]?.widget;
+            that.WidgetType = res?.data[0]?.code;
             that.getTableData();
           },
         });

src/views/layout/Menu.vue

@@ -993,14 +993,14 @@ export default {
                   path: "/others/fault",
                 },
                 {
-                  text: "性能下降样本库",
+                  text: "预警分析样本库",
                   icon: "svg-matrix",
-                  path: "/others/performance",
+                  path: "/others/warning",
                 },
                 {
-                  text: "预警分析样本库",
+                  text: "性能下降样本库",
                   icon: "svg-matrix",
-                  path: "/others/warning",
+                  path: "/others/performance",
                 },
                 {
                   text: "性能预警综合分析",
@@ -1013,7 +1013,17 @@ export default {
                 //   path: "/others/powerline/analysis",
                 // },
                 {
-                  text: "知识库",
+                  text: "风机检修规则",
+                  icon: "svg-matrix",
+                  path: "/others/overhaulRule",
+                },
+                {
+                  text: "故障检修手册",
+                  icon: "svg-matrix",
+                  path: "/others/faultManual",
+                },
+                {
+                  text: "故障维修记录",
                   icon: "svg-matrix",
                   path: "/others/knowledgeBase",
                 },
@@ -1027,16 +1037,6 @@ export default {
                 //   icon: "svg-matrix",
                 //   path: "/others/market",
                 // }
-                {
-                  text: "风机检修规则",
-                  icon: "svg-matrix",
-                  path: "/others/overhaulRule",
-                },
-                {
-                  text: "故障手册",
-                  icon: "svg-matrix",
-                  path: "/others/faultManual",
-                },
               ],
             },
           ],

src/views/overhaulRule/index.vue

@@ -57,14 +57,7 @@ export default {
     return {
       maintenanceType: 3,
       radioArray: [],
-      tableData: [],
-      knowledge: "故障维修记录库",
-      knowledgeList: [
-        {
-          label: "故障维修记录库",
-          value: "0",
-        },
-      ],
+      tableData: []
     };
   },
   components: {},
@@ -111,8 +104,8 @@ export default {
 
   .radioBox {
     width: 20%;
-    height: 80%;
-    max-height: 80%;
+    height: 95%;
+    max-height: 95%;
     margin: 10% 0 10% 20px;
     overflow-y: scroll;
     display: flex;
@@ -125,8 +118,8 @@ export default {
   }
 
   .tableBox {
-    width: 80%;
-    height: 80%;
+    width: 90%;
+    height: 90%;
     margin: 10% 20px;
   }
 }

src/views/powerCurve/index.vue

@@ -91,9 +91,7 @@ export default {
       wtArray: [],
       wpId: "",
       wtId: "",
-      recorddate: "2021-09" || new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
-        "yyyy-MM"
-      ),
+      recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate("yyyy-MM"),
       chartLineData: {
         xTitle: "风速",
         yTitle: "功率",

src/views/report/dwkscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$LULDWFLWIVVVPWQUT632ECFUACUUYYR4.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$KEY9DXNZFMKMLDNEDBTSANSVARESUFTT.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/mhsscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$C9NAUTIMJ5Z5AEO9CYUEOB2UTB935UID.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$C9NAUTIMJ5Z5AEO9CYUEOB2UTB935UID.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/missfdrb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$1JNXM4ZKRNKNTSUJAPFKOLKAZ2JTQZVT.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$KMUISUIUO6S6U4CM8E5643AKDDMVKM9V.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/missgfrb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$NTRWIYTR1JCJJSBT3MKWZLM1RUTI3EN0.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$UD6EZU4N2UDUYT0DKNRK46W316DKU3IW.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/nssscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$QLYSPJ3M52L2MZ6LBXLELW5KWOL4YMVT.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$QLYSPJ3M52L2MZ6LBXLELW5KWOL4YMVT.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/oafd.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$UUU5NL66EZYZWU4U8RXMOJMIS3U0IAC7.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$MACFISNWPDOD8ISABIBBCY9MNNACUDTI.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/oagf.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$TLK2LA0ZZTOTYYKL8NN3SWKUO4LM8WNY.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$B1NZ9OKLUYJYL8M1ISN2OUUOU01UBPUB.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/plscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$E3UCCFKVLUYU8U73NVCOIZCSM839LASD.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$02T729RU9PJPUMN2TTU0TNUN6X2N15E0.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/qsscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$C9QU8I5UYX1XTRE9O7KMTBEPWS92UEMD.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$C9QU8I5UYX1XTRE9O7KMTBEPWS92UEMD.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/sbqscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$1SBX72Z9RNCNDSUSAPFS1CV7N2STLTEU.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$1SBX72Z9RNCNDSUSAPFS1CV7N2STLTEU.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/xhscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$FMB6KUWS4KTKYM1MKUZKUK5JSVMARFU1.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$YMNT4AMXBO9OL3DMTSJKC3N56PMIENKV.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/xnygfscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$VZCQU9AYVZPOYRQZLRNI9SUUMUZTM6LU$1$PY64IU1O0MIM2UAYETU0Y9NIXWYJ7IYJ.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$XRBIWFQ1CWXW51URC46OKMCBNLRUNXUC.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/report/xsscyb.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$9MU3UTV460W0SKWM1Z2YL30MUCM163NV.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$9MU3UTV460W0SKWM1Z2YL30MUCM163NV.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
     }
   }
 }

src/views/sampleDatabase/analysis/index.vue

@@ -301,21 +301,20 @@ export default {
         });
         
         await that.API.requestData({
-        method: "GET",
-        baseURL: "http://192.168.1.18:9002/",
-        // baseURL: "http://192.168.10.4:9002/",
-        subUrl: "case/performance/line",
-        data: {
-          id: val.id,
-          interval: 30,
-        },
-        success(res) {
-          if (res.code == 200) {
-            that.scatterLineData = res.data;
-            BASE.closeLoading();
-          }
-        },
-      });
+          method: "GET",
+          baseURL: "http://192.168.1.18:9002/",
+          subUrl: "case/performance/line",
+          data: {
+            id: val.id,
+            interval: 30,
+          },
+          success(res) {
+            if (res.code == 200) {
+              that.scatterLineData = res.data;
+              BASE.closeLoading();
+            }
+          },
+        });
       }
     },
   },

src/views/sampleDatabase/knowledgeBase/index.vue

@@ -3,23 +3,29 @@
     <div class="query mg-b-8">
       <div class="query-items">
         <div class="query-item">
-          <div class="lable">知识库：</div>
+          <div class="lable">故障类型：</div>
           <div class="search-input">
             <el-select
-              v-model="knowledge"
+              v-model="faultmodel"
+              multiple
               clearable
+              collapse-tags
               placeholder="请选择"
               popper-class="select"
+              @change="getTableData"
             >
               <el-option
-                v-for="item in knowledgeList"
-                :key="item.value"
-                :value="item.value"
-                :label="item.label"
+                v-for="item in faultList"
+                :key="item.code"
+                :value="item.code"
+                :label="item.widget"
               />
             </el-select>
           </div>
         </div>
+        <div class="query-actions">
+          <button class="btn green" @click="getTableData">搜索</button>
+      </div>
       </div>
     </div>
     <el-row :type="'flex'" class="content">
@@ -91,28 +97,39 @@ export default {
   data() {
     return {
       tableData: [],
-      knowledge: '故障维修记录库',
-      knowledgeList: [
-        {
-          label: "故障维修记录库",
-          value: "0",
-        },
-      ],
+      faultmodel: [],
+      faultList:[],
     };
   },
   components: {},
   created() {
-    this.getData();
+    this.getFaultType();
   },
   methods: {
-    getData() {
+    getFaultType(){
+      let that = this;
+      this.API.requestData({
+        method: "GET",
+        subUrl: "http://192.168.1.18:9002/know/fault/fix/widget",
+        success(res) {
+          if (res) {
+            that.faultList = res?.data;
+            that.faultmodel.push(res?.data[1].code);
+            that.getTableData();
+          }
+        },
+      });
+    },
+    getTableData() {
       let that = this;
       this.API.requestData({
         method: "GET",
         subUrl: "http://192.168.1.18:9002/know/fault/fix/all",
+        data:{
+          faultCode: that.faultmodel
+        },
         success(res) {
           if (res) {
-              console.log(res);
             res.data.forEach((item, index) => {
               item.indexs = index +1;
             });