Merge branch 'mw' of http://124.70.43.205:3000/yangxiao/sis_zhfx

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

@@ -59,7 +59,14 @@
 				color:@black;
 			}
 		}
-		
+		.el-year-table{
+			td{
+				color: @black;
+			}
+			td.today .cell,td:hover{
+				color: @blue;
+			}
+		}
 	}
 	.el-input{
 		.el-input__inner{
@@ -114,4 +121,109 @@
 	    }
 	  }
 	}
+	
+	// 状态转换率
+	.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));
+	  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.active,.action-bar .selections .item:hover{
+	// 	border: 1px solid @deepblue;
+	// 	color:@deepblue ;
+	// 	background-image: linear-gradient(to top,rgba(57, 54, 143, 0.5),rgba(5, 187, 76, 0));
+	// 	background: linear-gradient(to top, rgba(54, 52, 142, 0.5), rgba(54, 52, 142, 0));
+	// }
+	
+  .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/views/Decision/Decision2.vue

@@ -733,8 +733,6 @@ export default {
           that.ChangZhan = res.data;
           //  that.AjaxCommon();
           that.XiangMuVal(that.value2);
-          console.log("resCHANzhan:", res.data);
-          console.log("value2:", that.value2);
         },
       });
     },
@@ -758,7 +756,6 @@ export default {
         },
         success(res) {
           that.XiangMu = res.data;
-          console.log("Xiangmu:", res.data);
         },
       });
     },
@@ -833,7 +830,6 @@ export default {
         },
         success(res) {
           that.ajaxData = res.data;
-          console.log("resData:", res);
           var dataTab = [], //表格
             fdl = [],
             cz = [],

src/views/warningRank/index.vue

@@ -166,23 +166,26 @@ export default {
           },
           success(res) {
             let chartData = [];
-
+			let data = [];
+			let i = 1;
             res.data.forEach((ele, index) => {
-              ele.index = index + 1;
-              chartData.push({
-                title: ele.name,
-                yAxisIndex: 0,
-                value: [
-                  {
-                    text: ele.name,
-                    value: ele.frequencyday,
-                  },
-                ],
-              });
+				if(ele.name != null){
+					ele.index = i++;
+					data.push(ele)
+					chartData.push({
+					  title: ele.name,
+					  yAxisIndex: 0,
+					  value: [
+					    {
+					      text: ele.name,
+					      value: ele.frequencyday,
+					    },
+					  ],
+					});
+				}
             });
-
             that.chartData = chartData;
-            that.tableData.data = res.data;
+            that.tableData.data = data;
           },
         });
       }