Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

src/components/chart/line/simple-line-chart.vue

@@ -352,7 +352,9 @@ export default {
     },
   },
   created() {
-    this.id = "pie-chart-" + util.newGUID();
+    this.$nextTick(()=>{
+      this.id = "pie-chart-" + util.newGUID();
+    });
   },
   mounted() {
     this.$nextTick(() => {

src/components/coms/table/table.vue

@@ -104,11 +104,20 @@ export default {
   },
   // 函数
   methods: {
+    clearCheckBox(time){
+      this.$nextTick(()=>{
+        setTimeout(()=>{
+          const domArray = document.querySelectorAll(".curCheckBox");
+          for(let i=0;i<domArray.length;i++){
+            domArray[i].checked=false;
+          }
+        },(time || 300));
+      });
+    },
     onClick(col, data) {
       if (col.click) col.click(event, data);
     },
     onSort(col) {
-		console.log(col)
       if (col.sortable == true) {
         this.sortCol = col.field;
         switch (this.sortType) {

src/router/index.js

@@ -64,7 +64,7 @@ const routes = [
     {
       path: 'boosterstation', // 升压站
       component: () => import(/* webpackChunkName: "boosterstation" */ '../views/WindSite/pages/BoosterStation.vue'),
-    },]
+    }]
   },
   {
     path: '/monitor/lightmatrix', // 光伏明细矩阵
@@ -154,6 +154,10 @@ const routes = [
   {
     path: '/health/health4',
     name: 'health4',
+    children: [{
+      path: 'healthLineChart', // 健康趋势
+      component: () => import(/* webpackChunkName: "healthLineChart" */ '../views/HealthControl/healthLineChart.vue'),
+    }],
     component: () => import('../views/HealthControl/Health4.vue'),
   },
   {

src/views/Decision/Decision2.vue

@@ -62,7 +62,7 @@
 		<div v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
-					<Table :data="tableData" :canScroll="false"></Table>
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
 			<el-row class="mg-b-16">
@@ -140,10 +140,13 @@
 							field: "check",
 							is_num: false,
 							is_light: false,
-							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+							template:() => {
+								// return "<el-checkbox v-model='row.checked'></el-checkbox>";
+								return "<input class='check curCheckBox' type='CheckBox' />";
 							},
 							click: function(event, data) {
+                console.log(11111,event)
+                console.log(22222,data)
 								// checkbox 事件
 								// event.target checkbox or td 需进行判断
 								// event.target.checked 判断 checkbox 是否选中
@@ -409,7 +412,7 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check checkItem' type='CheckBox' check v-model="+checkData+"/>";
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
@@ -587,7 +590,8 @@
 				windNum2: 'dd',
 				tabs: [],
 				analyisDialog: [],
-				detailShow: 1
+				detailShow: 1,
+				ajaxData:[],
 			};
 		},
 		created() {
@@ -613,6 +617,7 @@
 				this.value3 = [];
 				this.AjaxCommon();
 				this.XiangMuVal(val);
+        this.$refs.curRef.clearCheckBox()
 			},
 			XiangMuVal(val) {
 				var that = this;
@@ -688,6 +693,7 @@
 						sort: ''
 					},
 					success(res) {
+						that.ajaxData = res.data;
 						var dataTab = [], //表格
 							fdl = [],
 							cz = [],
@@ -806,133 +812,119 @@
 			},
 			AjaxDbfx() {
 				var that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "benchmarking/wxssl",
-					data: {
-						wpids: that.tableId,
-						projectids: that.value2,
-						lineids: that.value3,
-						beginDate: that.value4,
-						endDate: that.value5,
-						target: '',
-						sort: ''
-					},
-					success(res) {
-						var data = res.data;
-						that.windNum = data[0].name;
-						that.windNum2 = data[1].name;
-						that.tabs = [{
-							name: "发电量",
-							windData1: data[0].fdl,
-							windData2: data[1].fdl
-						}, {
-							name: "故障损失电量",
-							windData1: data[0].gzssdl,
-							windData2: data[1].gzssdl
-						}, {
-							name: "检修损失电量",
-							windData1: data[0].jxssdl,
-							windData2: data[1].jxssdl
-						}, {
-							name: "性能未达标损失电量",
-							windData1: data[0].xnssdl,
-							windData2: data[1].xnssdl
-						}, {
-							name: "受累损失电量",
-							windData1: data[0].slssdl,
-							windData2: data[1].slssdl
-						}, {
-							name: "风能利用率",
-							windData1: data[0].fnlyl,
-							windData2: data[1].fnlyl
-						}, {
-							name: "故障损失率",
-							windData1: data[0].gzssl,
-							windData2: data[1].gzssl
-						}, {
-							name: "检修损失率",
-							windData1: data[0].jxssl,
-							windData2: data[1].jxssl
-						}, {
-							name: "弃风率",
-							windData1: data[0].qfl,
-							windData2: data[1].qfl
-						}, {
-							name: "性能损失率",
-							windData1: data[0].xnssl,
-							windData2: data[1].xnssl
-						}, {
-							name: "受累损失率",
-							windData1: data[0].slssl,
-							windData2: data[1].slssl
-						}];
-
-						that.radarValue = [{
-							indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
-							data: [{
-								value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
-									data[0].xnsslpm, data[0].slsslpm
-								]
-							}, {
-								value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
-									data[1].xnsslpm, data[1].slsslpm
-								]
-							}]
-						}];
-
-						var analyis = [],
-							gzssdl = [],
-							jxssdl = [],
-							xnssdl = [],
-							xdssdl = [],
-							slssdl = [];
-						res.data.forEach((item, index) => {
-							gzssdl.push({
-								text: item.name,
-								value: item.gzssdl
-							});
-							jxssdl.push({
-								text: item.name,
-								value: item.jxssdl
-							});
-							xnssdl.push({
-								text: item.name,
-								value: item.xnssdl
-							});
-							xdssdl.push({
-								text: item.name,
-								value: item.xdssdl
-							});
-							slssdl.push({
-								text: item.name,
-								value: item.slssdl
-							});
-						})
-						analyis.push({
-							title: "故障损失电量",
-							yAxisIndex: 0,
-							value: gzssdl
-						}, {
-							title: "检修损失电量",
-							yAxisIndex: 0,
-							value: jxssdl
-						}, {
-							title: "性能损失电量",
-							yAxisIndex: 0,
-							value: xnssdl
-						}, {
-							title: "限电损失电量",
-							yAxisIndex: 0,
-							value: xdssdl
-						}, {
-							title: "受累损失电量",
-							yAxisIndex: 0,
-							value: slssdl
-						})
-						that.analyisDialog = analyis;
-					}
-				});
+				var data = that.ajaxData;
+				that.windNum = data[0].name;
+				that.windNum2 = data[1].name;
+				that.tabs = [{
+					name: "发电量",
+					windData1: data[0].fdl,
+					windData2: data[1].fdl
+				}, {
+					name: "故障损失电量",
+					windData1: data[0].gzssdl,
+					windData2: data[1].gzssdl
+				}, {
+					name: "检修损失电量",
+					windData1: data[0].jxssdl,
+					windData2: data[1].jxssdl
+				}, {
+					name: "性能未达标损失电量",
+					windData1: data[0].xnssdl,
+					windData2: data[1].xnssdl
+				}, {
+					name: "受累损失电量",
+					windData1: data[0].slssdl,
+					windData2: data[1].slssdl
+				}, {
+					name: "风能利用率",
+					windData1: data[0].fnlyl,
+					windData2: data[1].fnlyl
+				}, {
+					name: "故障损失率",
+					windData1: data[0].gzssl,
+					windData2: data[1].gzssl
+				}, {
+					name: "检修损失率",
+					windData1: data[0].jxssl,
+					windData2: data[1].jxssl
+				}, {
+					name: "弃风率",
+					windData1: data[0].qfl,
+					windData2: data[1].qfl
+				}, {
+					name: "性能损失率",
+					windData1: data[0].xnssl,
+					windData2: data[1].xnssl
+				}, {
+					name: "受累损失率",
+					windData1: data[0].slssl,
+					windData2: data[1].slssl
+				}];
+				
+				that.radarValue = [{
+					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
+					data: [{
+						value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
+							data[0].xnsslpm, data[0].slsslpm
+						]
+					}, {
+						value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
+							data[1].xnsslpm, data[1].slsslpm
+						]
+					}]
+				}];
+				
+				var analyis = [],
+					gzssdl = [],
+					jxssdl = [],
+					xnssdl = [],
+					xdssdl = [],
+					slssdl = [];
+				data.forEach((item, index) => {
+					gzssdl.push({
+						text: item.name,
+						value: item.gzssdl
+					});
+					jxssdl.push({
+						text: item.name,
+						value: item.jxssdl
+					});
+					xnssdl.push({
+						text: item.name,
+						value: item.xnssdl
+					});
+					xdssdl.push({
+						text: item.name,
+						value: item.xdssdl
+					});
+					slssdl.push({
+						text: item.name,
+						value: item.slssdl
+					});
+				})
+				analyis.push({
+					title: "故障损失电量",
+					yAxisIndex: 0,
+					value: gzssdl
+				}, {
+					title: "检修损失电量",
+					yAxisIndex: 0,
+					value: jxssdl
+				}, {
+					title: "性能损失电量",
+					yAxisIndex: 0,
+					value: xnssdl
+				}, {
+					title: "限电损失电量",
+					yAxisIndex: 0,
+					value: xdssdl
+				}, {
+					title: "受累损失电量",
+					yAxisIndex: 0,
+					value: slssdl
+				})
+				that.analyisDialog = analyis;
+				
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
@@ -952,7 +944,8 @@
 					that.dialogVisible = true;
 					this.AjaxDbfx();
 				}
-			}
+			},
+
 		}
 	};
 </script>

src/views/Decision/Decision2Cndb.vue

@@ -536,7 +536,8 @@
 				windNum2: 'dd',
 				tabs: [],
 				analyisDialog: [],
-				detailShow: 1
+				detailShow: 1,
+				ajaxData:[]
 			};
 		},
 		created() {
@@ -598,6 +599,7 @@
 					},
 					success(res) {
 						console.log(JSON.stringify(res))
+						that.ajaxData = res.data;
 						var dataTab = [], //表格
 							analyis = [],
 							gzssdl = [],
@@ -607,7 +609,7 @@
 							slssdl = [];
 						res.data.forEach((item, index) => {
 							that.tableDateArr.push(item.date);
-that.tableIdArr.push(item.id);
+							that.tableIdArr.push(item.id);
 							dataTab.push({ //表格
 								index: index + 1,
 								zhpm: item.zhpm,
@@ -690,135 +692,121 @@ that.tableIdArr.push(item.id);
 			},
 			AjaxDbfx() {
 				var that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "benchmarking/cndb",
-					data: {
-						wpid: that.value1,
-						beginDate: that.value4,
-						endDate: that.value5,
-						target: '',
-						sort: ''
-					},
-					success(res) {
-						var data = res.data;
-						that.windNum = data[0].date.substr(0, 10);
-						that.windNum2 = data[1].date.substr(0, 10);
-						that.tabs = [{
-							name: "发电量",
-							windData1: data[0].fdl,
-							windData2: data[1].fdl
-						}, {
-							name: "故障损失电量",
-							windData1: data[0].gzssdl,
-							windData2: data[1].gzssdl
-						}, {
-							name: "检修损失电量",
-							windData1: data[0].jxssdl,
-							windData2: data[1].jxssdl
-						}, {
-							name: "性能未达标损失电量",
-							windData1: data[0].xnssdl,
-							windData2: data[1].xnssdl
-						}, {
-							name: "受累损失电量",
-							windData1: data[0].slssdl,
-							windData2: data[1].slssdl
-						}, {
-							name: "风能利用率",
-							windData1: data[0].fnlyl,
-							windData2: data[1].fnlyl
-						}, {
-							name: "故障损失率",
-							windData1: data[0].gzssl,
-							windData2: data[1].gzssl
-						}, {
-							name: "检修损失率",
-							windData1: data[0].jxssl,
-							windData2: data[1].jxssl
-						}, {
-							name: "弃风率",
-							windData1: data[0].qfl,
-							windData2: data[1].qfl
-						}, {
-							name: "性能损失率",
-							windData1: data[0].xnssl,
-							windData2: data[1].xnssl
-						}, {
-							name: "受累损失率",
-							windData1: data[0].slssl,
-							windData2: data[1].slssl
-						}];
+				var data = that.ajaxData;
+				that.windNum = data[0].date.substr(0, 10);
+				that.windNum2 = data[1].date.substr(0, 10);
+				that.tabs = [{
+					name: "发电量",
+					windData1: data[0].fdl,
+					windData2: data[1].fdl
+				}, {
+					name: "故障损失电量",
+					windData1: data[0].gzssdl,
+					windData2: data[1].gzssdl
+				}, {
+					name: "检修损失电量",
+					windData1: data[0].jxssdl,
+					windData2: data[1].jxssdl
+				}, {
+					name: "性能未达标损失电量",
+					windData1: data[0].xnssdl,
+					windData2: data[1].xnssdl
+				}, {
+					name: "受累损失电量",
+					windData1: data[0].slssdl,
+					windData2: data[1].slssdl
+				}, {
+					name: "风能利用率",
+					windData1: data[0].fnlyl,
+					windData2: data[1].fnlyl
+				}, {
+					name: "故障损失率",
+					windData1: data[0].gzssl,
+					windData2: data[1].gzssl
+				}, {
+					name: "检修损失率",
+					windData1: data[0].jxssl,
+					windData2: data[1].jxssl
+				}, {
+					name: "弃风率",
+					windData1: data[0].qfl,
+					windData2: data[1].qfl
+				}, {
+					name: "性能损失率",
+					windData1: data[0].xnssl,
+					windData2: data[1].xnssl
+				}, {
+					name: "受累损失率",
+					windData1: data[0].slssl,
+					windData2: data[1].slssl
+				}];
+
+				that.radarValue = [{
+					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
+					data: [{
+						value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
+							data[0].xnsslpm, data[0].slsslpm
+						]
+					}, {
+						value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
+							data[1].xnsslpm, data[1].slsslpm
+						]
+					}]
+				}];
+
+				var analyis = [],
+					gzssdl = [],
+					jxssdl = [],
+					xnssdl = [],
+					xdssdl = [],
+					slssdl = [];
+				data.forEach((item, index) => {
+					gzssdl.push({
+						text: item.date.substr(0, 10),
+						value: item.gzssdl
+					});
+					jxssdl.push({
+						text: item.date.substr(0, 10),
+						value: item.jxssdl
+					});
+					xnssdl.push({
+						text: item.date.substr(0, 10),
+						value: item.xnssdl
+					});
+					xdssdl.push({
+						text: item.date.substr(0, 10),
+						value: item.xdssdl
+					});
+					slssdl.push({
+						text: item.date.substr(0, 10),
+						value: item.slssdl
+					});
+				})
+				analyis.push({
+					title: "故障损失电量",
+					yAxisIndex: 0,
+					value: gzssdl
+				}, {
+					title: "检修损失电量",
+					yAxisIndex: 0,
+					value: jxssdl
+				}, {
+					title: "性能损失电量",
+					yAxisIndex: 0,
+					value: xnssdl
+				}, {
+					title: "限电损失电量",
+					yAxisIndex: 0,
+					value: xdssdl
+				}, {
+					title: "受累损失电量",
+					yAxisIndex: 0,
+					value: slssdl
+				})
+				that.analyisDialog = analyis;
+
 
-						that.radarValue = [{
-							indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
-							data: [{
-								value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0]
-									.qflpm,
-									data[0].xnsslpm, data[0].slsslpm
-								]
-							}, {
-								value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1]
-									.qflpm,
-									data[1].xnsslpm, data[1].slsslpm
-								]
-							}]
-						}];
 
-						var analyis = [],
-							gzssdl = [],
-							jxssdl = [],
-							xnssdl = [],
-							xdssdl = [],
-							slssdl = [];
-						res.data.forEach((item, index) => {
-							if (index < 7) {
-								gzssdl.push({
-									text: item.date.substr(0, 10),
-									value: item.gzssdl
-								});
-								jxssdl.push({
-									text: item.date.substr(0, 10),
-									value: item.jxssdl
-								});
-								xnssdl.push({
-									text: item.date.substr(0, 10),
-									value: item.xnssdl
-								});
-								xdssdl.push({
-									text: item.date.substr(0, 10),
-									value: item.xdssdl
-								});
-								slssdl.push({
-									text: item.date.substr(0, 10),
-									value: item.slssdl
-								});
-							}
-						})
-						analyis.push({
-							title: "故障损失电量",
-							yAxisIndex: 0,
-							value: gzssdl
-						}, {
-							title: "检修损失电量",
-							yAxisIndex: 0,
-							value: jxssdl
-						}, {
-							title: "性能损失电量",
-							yAxisIndex: 0,
-							value: xnssdl
-						}, {
-							title: "限电损失电量",
-							yAxisIndex: 0,
-							value: xdssdl
-						}, {
-							title: "受累损失电量",
-							yAxisIndex: 0,
-							value: slssdl
-						})
-						that.analyisDialog = analyis;
-					}
-				});
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
@@ -850,6 +838,7 @@ that.tableIdArr.push(item.id);
 				height: calc(100vh - 24.5vh);
 			}
 		}
+
 		.project-table {
 			overflow: auto;
 

src/views/Decision/decision2Cjdb.vue

@@ -554,7 +554,8 @@
 				windNum2: 'dd',
 				tabs: [],
 				analyisDialog: [],
-				detailShow: 1
+				detailShow: 1,
+				ajaxData:[]
 			};
 		},
 		created() {
@@ -617,6 +618,7 @@
 					},
 					success(res) {
 						console.log(JSON.stringify(res))
+						that.ajaxData = res.data;
 						var dataTab = [], //表格
 							fdl = [],
 							cz = [],
@@ -732,133 +734,118 @@
 			},
 			AjaxDbfx() {
 				var that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "benchmarking/cjdb",
-					data: {
-						wpids: that.tableId,
-						projectids: that.value2,
-						lineids: that.value3,
-						beginDate: that.value4,
-						endDate: that.value5,
-						target: '',
-						sort: ''
-					},
-					success(res) {
-						var data = res.data;
-						that.windNum = data[0].name;
-						that.windNum2 = data[1].name;
-						that.tabs = [{
-							name: "发电量",
-							windData1: data[0].fdl,
-							windData2: data[1].fdl
-						}, {
-							name: "故障损失电量",
-							windData1: data[0].gzssdl,
-							windData2: data[1].gzssdl
-						}, {
-							name: "检修损失电量",
-							windData1: data[0].jxssdl,
-							windData2: data[1].jxssdl
-						}, {
-							name: "性能未达标损失电量",
-							windData1: data[0].xnssdl,
-							windData2: data[1].xnssdl
-						}, {
-							name: "受累损失电量",
-							windData1: data[0].slssdl,
-							windData2: data[1].slssdl
-						}, {
-							name: "风能利用率",
-							windData1: data[0].fnlyl,
-							windData2: data[1].fnlyl
-						}, {
-							name: "故障损失率",
-							windData1: data[0].gzssl,
-							windData2: data[1].gzssl
-						}, {
-							name: "检修损失率",
-							windData1: data[0].jxssl,
-							windData2: data[1].jxssl
-						}, {
-							name: "弃风率",
-							windData1: data[0].qfl,
-							windData2: data[1].qfl
-						}, {
-							name: "性能损失率",
-							windData1: data[0].xnssl,
-							windData2: data[1].xnssl
-						}, {
-							name: "受累损失率",
-							windData1: data[0].slssl,
-							windData2: data[1].slssl
-						}];
-
-						that.radarValue = [{
-							indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
-							data: [{
-								value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
-									data[0].xnsslpm, data[0].slsslpm
-								]
-							}, {
-								value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
-									data[1].xnsslpm, data[1].slsslpm
-								]
-							}]
-						}];
-
-						var analyis = [],
-							gzssdl = [],
-							jxssdl = [],
-							xnssdl = [],
-							xdssdl = [],
-							slssdl = [];
-						res.data.forEach((item, index) => {
-							gzssdl.push({
-								text: item.name,
-								value: item.gzssdl
-							});
-							jxssdl.push({
-								text: item.name,
-								value: item.jxssdl
-							});
-							xnssdl.push({
-								text: item.name,
-								value: item.xnssdl
-							});
-							xdssdl.push({
-								text: item.name,
-								value: item.xdssdl
-							});
-							slssdl.push({
-								text: item.name,
-								value: item.slssdl
-							});
-						})
-						analyis.push({
-							title: "故障损失电量",
-							yAxisIndex: 0,
-							value: gzssdl
-						}, {
-							title: "检修损失电量",
-							yAxisIndex: 0,
-							value: jxssdl
-						}, {
-							title: "性能损失电量",
-							yAxisIndex: 0,
-							value: xnssdl
-						}, {
-							title: "限电损失电量",
-							yAxisIndex: 0,
-							value: xdssdl
-						}, {
-							title: "受累损失电量",
-							yAxisIndex: 0,
-							value: slssdl
-						})
-						that.analyisDialog = analyis;
-					}
-				});
+				var data = that.ajaxData;
+				that.windNum = data[0].name;
+				that.windNum2 = data[1].name;
+				that.tabs = [{
+					name: "发电量",
+					windData1: data[0].fdl,
+					windData2: data[1].fdl
+				}, {
+					name: "故障损失电量",
+					windData1: data[0].gzssdl,
+					windData2: data[1].gzssdl
+				}, {
+					name: "检修损失电量",
+					windData1: data[0].jxssdl,
+					windData2: data[1].jxssdl
+				}, {
+					name: "性能未达标损失电量",
+					windData1: data[0].xnssdl,
+					windData2: data[1].xnssdl
+				}, {
+					name: "受累损失电量",
+					windData1: data[0].slssdl,
+					windData2: data[1].slssdl
+				}, {
+					name: "风能利用率",
+					windData1: data[0].fnlyl,
+					windData2: data[1].fnlyl
+				}, {
+					name: "故障损失率",
+					windData1: data[0].gzssl,
+					windData2: data[1].gzssl
+				}, {
+					name: "检修损失率",
+					windData1: data[0].jxssl,
+					windData2: data[1].jxssl
+				}, {
+					name: "弃风率",
+					windData1: data[0].qfl,
+					windData2: data[1].qfl
+				}, {
+					name: "性能损失率",
+					windData1: data[0].xnssl,
+					windData2: data[1].xnssl
+				}, {
+					name: "受累损失率",
+					windData1: data[0].slssl,
+					windData2: data[1].slssl
+				}];
+				
+				that.radarValue = [{
+					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
+					data: [{
+						value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
+							data[0].xnsslpm, data[0].slsslpm
+						]
+					}, {
+						value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
+							data[1].xnsslpm, data[1].slsslpm
+						]
+					}]
+				}];
+				
+				var analyis = [],
+					gzssdl = [],
+					jxssdl = [],
+					xnssdl = [],
+					xdssdl = [],
+					slssdl = [];
+				data.forEach((item, index) => {
+					gzssdl.push({
+						text: item.name,
+						value: item.gzssdl
+					});
+					jxssdl.push({
+						text: item.name,
+						value: item.jxssdl
+					});
+					xnssdl.push({
+						text: item.name,
+						value: item.xnssdl
+					});
+					xdssdl.push({
+						text: item.name,
+						value: item.xdssdl
+					});
+					slssdl.push({
+						text: item.name,
+						value: item.slssdl
+					});
+				})
+				analyis.push({
+					title: "故障损失电量",
+					yAxisIndex: 0,
+					value: gzssdl
+				}, {
+					title: "检修损失电量",
+					yAxisIndex: 0,
+					value: jxssdl
+				}, {
+					title: "性能损失电量",
+					yAxisIndex: 0,
+					value: xnssdl
+				}, {
+					title: "限电损失电量",
+					yAxisIndex: 0,
+					value: xdssdl
+				}, {
+					title: "受累损失电量",
+					yAxisIndex: 0,
+					value: slssdl
+				})
+				that.analyisDialog = analyis;
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];

src/views/Decision/decision2Xldb.vue

@@ -56,21 +56,16 @@
 				</div>
 			</div>
 			<el-row class="mg-b-16">
-				<el-col :span="8">
+				<el-col :span="12">
 					<panel title="发电量占比">
 						<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
 					</panel>
 				</el-col>
-				<el-col :span="8">
+				<el-col :span="12">
 					<panel title="各场站损失电量占比">
 						<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
 					</panel>
 				</el-col>
-				<el-col :span="8">
-					<panel title="理论发电量占比">
-						<dual-pie-chart height="21.296vh" :innerData="innerLl" :outerData="outerLl" />
-					</panel>
-				</el-col>
 			</el-row>
 			<div>
 				<panel title="损失电量分析">
@@ -576,7 +571,8 @@
 				windNum2: 'dd',
 				tabs: [],
 				analyisDialog: [],
-				detailShow: 1
+				detailShow: 1,
+				ajaxData:[]
 			};
 		},
 		created() {
@@ -657,6 +653,7 @@
 						sort: ''
 					},
 					success(res) {
+						that.ajaxData = res.data;
 						var dataTab = [], //表格
 							fdl = [],
 							cz = [],
@@ -774,134 +771,121 @@
 				});
 			},
 			AjaxDbfx() {
+				
 				var that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "benchmarking/xldb",
-					data: {
-						wpids: that.tableId,
-						projectids: '',
-						lineids: that.value3,
-						beginDate: that.value4,
-						endDate: that.value5,
-						target: '',
-						sort: ''
-					},
-					success(res) {
-						var data = res.data;
-						that.windNum = data[0].name;
-						that.windNum2 = data[1].name;
-						that.tabs = [{
-							name: "发电量",
-							windData1: data[0].fdl,
-							windData2: data[1].fdl
-						}, {
-							name: "故障损失电量",
-							windData1: data[0].gzssdl,
-							windData2: data[1].gzssdl
-						}, {
-							name: "检修损失电量",
-							windData1: data[0].jxssdl,
-							windData2: data[1].jxssdl
-						}, {
-							name: "性能未达标损失电量",
-							windData1: data[0].xnssdl,
-							windData2: data[1].xnssdl
-						}, {
-							name: "受累损失电量",
-							windData1: data[0].slssdl,
-							windData2: data[1].slssdl
-						}, {
-							name: "风能利用率",
-							windData1: data[0].fnlyl,
-							windData2: data[1].fnlyl
-						}, {
-							name: "故障损失率",
-							windData1: data[0].gzssl,
-							windData2: data[1].gzssl
-						}, {
-							name: "检修损失率",
-							windData1: data[0].jxssl,
-							windData2: data[1].jxssl
-						}, {
-							name: "弃风率",
-							windData1: data[0].qfl,
-							windData2: data[1].qfl
-						}, {
-							name: "性能损失率",
-							windData1: data[0].xnssl,
-							windData2: data[1].xnssl
-						}, {
-							name: "受累损失率",
-							windData1: data[0].slssl,
-							windData2: data[1].slssl
-						}];
-
-						that.radarValue = [{
-							indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
-							data: [{
-								value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
-									data[0].xnsslpm, data[0].slsslpm
-								]
-							}, {
-								value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
-									data[1].xnsslpm, data[1].slsslpm
-								]
-							}]
-						}];
-
-						var analyis = [],
-							gzssdl = [],
-							jxssdl = [],
-							xnssdl = [],
-							xdssdl = [],
-							slssdl = [];
-						res.data.forEach((item, index) => {
-							gzssdl.push({
-								text: item.name,
-								value: item.gzssdl
-							});
-							jxssdl.push({
-								text: item.name,
-								value: item.jxssdl
-							});
-							xnssdl.push({
-								text: item.name,
-								value: item.xnssdl
-							});
-							xdssdl.push({
-								text: item.name,
-								value: item.xdssdl
-							});
-							slssdl.push({
-								text: item.name,
-								value: item.slssdl
-							});
-						})
-						analyis.push({
-							title: "故障损失电量",
-							yAxisIndex: 0,
-							value: gzssdl
-						}, {
-							title: "检修损失电量",
-							yAxisIndex: 0,
-							value: jxssdl
-						}, {
-							title: "性能损失电量",
-							yAxisIndex: 0,
-							value: xnssdl
-						}, {
-							title: "限电损失电量",
-							yAxisIndex: 0,
-							value: xdssdl
-						}, {
-							title: "受累损失电量",
-							yAxisIndex: 0,
-							value: slssdl
-						})
-						that.analyisDialog = analyis;
-					}
-				});
+				var data = that.ajaxData;
+				that.windNum = data[0].name;
+				that.windNum2 = data[1].name;
+				that.tabs = [{
+					name: "发电量",
+					windData1: data[0].fdl,
+					windData2: data[1].fdl
+				}, {
+					name: "故障损失电量",
+					windData1: data[0].gzssdl,
+					windData2: data[1].gzssdl
+				}, {
+					name: "检修损失电量",
+					windData1: data[0].jxssdl,
+					windData2: data[1].jxssdl
+				}, {
+					name: "性能未达标损失电量",
+					windData1: data[0].xnssdl,
+					windData2: data[1].xnssdl
+				}, {
+					name: "受累损失电量",
+					windData1: data[0].slssdl,
+					windData2: data[1].slssdl
+				}, {
+					name: "风能利用率",
+					windData1: data[0].fnlyl,
+					windData2: data[1].fnlyl
+				}, {
+					name: "故障损失率",
+					windData1: data[0].gzssl,
+					windData2: data[1].gzssl
+				}, {
+					name: "检修损失率",
+					windData1: data[0].jxssl,
+					windData2: data[1].jxssl
+				}, {
+					name: "弃风率",
+					windData1: data[0].qfl,
+					windData2: data[1].qfl
+				}, {
+					name: "性能损失率",
+					windData1: data[0].xnssl,
+					windData2: data[1].xnssl
+				}, {
+					name: "受累损失率",
+					windData1: data[0].slssl,
+					windData2: data[1].slssl
+				}];
+				
+				that.radarValue = [{
+					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
+					data: [{
+						value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
+							data[0].xnsslpm, data[0].slsslpm
+						]
+					}, {
+						value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
+							data[1].xnsslpm, data[1].slsslpm
+						]
+					}]
+				}];
+				
+				var analyis = [],
+					gzssdl = [],
+					jxssdl = [],
+					xnssdl = [],
+					xdssdl = [],
+					slssdl = [];
+				data.forEach((item, index) => {
+					gzssdl.push({
+						text: item.name,
+						value: item.gzssdl
+					});
+					jxssdl.push({
+						text: item.name,
+						value: item.jxssdl
+					});
+					xnssdl.push({
+						text: item.name,
+						value: item.xnssdl
+					});
+					xdssdl.push({
+						text: item.name,
+						value: item.xdssdl
+					});
+					slssdl.push({
+						text: item.name,
+						value: item.slssdl
+					});
+				})
+				analyis.push({
+					title: "故障损失电量",
+					yAxisIndex: 0,
+					value: gzssdl
+				}, {
+					title: "检修损失电量",
+					yAxisIndex: 0,
+					value: jxssdl
+				}, {
+					title: "性能损失电量",
+					yAxisIndex: 0,
+					value: xnssdl
+				}, {
+					title: "限电损失电量",
+					yAxisIndex: 0,
+					value: xdssdl
+				}, {
+					title: "受累损失电量",
+					yAxisIndex: 0,
+					value: slssdl
+				})
+				that.analyisDialog = analyis;
+				
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];

src/views/Decision/decision2Xmdb.vue

@@ -570,7 +570,8 @@
 				windNum2: 'dd',
 				tabs: [],
 				analyisDialog: [],
-				detailShow: 1
+				detailShow: 1,
+				ajaxData:[]
 			};
 		},
 		created() {
@@ -650,6 +651,7 @@
 						sort: ''
 					},
 					success(res) {
+						that.ajaxData = res.data;
 						var dataTab = [], //表格
 							fdl = [],
 							cz = [],
@@ -768,133 +770,120 @@
 			},
 			AjaxDbfx() {
 				var that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "benchmarking/xmdb",
-					data: {
-						wpids: that.tableId,
-						projectids: [],
-						beginDate: that.value4,
-						endDate: that.value5,
-						target: '',
-						sort: ''
-					},
-					success(res) {
-						console.log(JSON.stringify(res))
-						var data = res.data;
-						that.windNum = data[0].name;
-						that.windNum2 = data[1].name;
-						that.tabs = [{
-							name: "发电量",
-							windData1: data[0].fdl,
-							windData2: data[1].fdl
-						}, {
-							name: "故障损失电量",
-							windData1: data[0].gzssdl,
-							windData2: data[1].gzssdl
-						}, {
-							name: "检修损失电量",
-							windData1: data[0].jxssdl,
-							windData2: data[1].jxssdl
-						}, {
-							name: "性能未达标损失电量",
-							windData1: data[0].xnssdl,
-							windData2: data[1].xnssdl
-						}, {
-							name: "受累损失电量",
-							windData1: data[0].slssdl,
-							windData2: data[1].slssdl
-						}, {
-							name: "风能利用率",
-							windData1: data[0].fnlyl,
-							windData2: data[1].fnlyl
-						}, {
-							name: "故障损失率",
-							windData1: data[0].gzssl,
-							windData2: data[1].gzssl
-						}, {
-							name: "检修损失率",
-							windData1: data[0].jxssl,
-							windData2: data[1].jxssl
-						}, {
-							name: "弃风率",
-							windData1: data[0].qfl,
-							windData2: data[1].qfl
-						}, {
-							name: "性能损失率",
-							windData1: data[0].xnssl,
-							windData2: data[1].xnssl
-						}, {
-							name: "受累损失率",
-							windData1: data[0].slssl,
-							windData2: data[1].slssl
-						}];
-
-						that.radarValue = [{
-							indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
-							data: [{
-								value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
-									data[0].xnsslpm, data[0].slsslpm
-								]
-							}, {
-								value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
-									data[1].xnsslpm, data[1].slsslpm
-								]
-							}]
-						}];
-
-						var analyis = [],
-							gzssdl = [],
-							jxssdl = [],
-							xnssdl = [],
-							xdssdl = [],
-							slssdl = [];
-						res.data.forEach((item, index) => {
-							gzssdl.push({
-								text: item.name,
-								value: item.gzssdl
-							});
-							jxssdl.push({
-								text: item.name,
-								value: item.jxssdl
-							});
-							xnssdl.push({
-								text: item.name,
-								value: item.xnssdl
-							});
-							xdssdl.push({
-								text: item.name,
-								value: item.xdssdl
-							});
-							slssdl.push({
-								text: item.name,
-								value: item.slssdl
-							});
-						})
-						analyis.push({
-							title: "故障损失电量",
-							yAxisIndex: 0,
-							value: gzssdl
-						}, {
-							title: "检修损失电量",
-							yAxisIndex: 0,
-							value: jxssdl
-						}, {
-							title: "性能损失电量",
-							yAxisIndex: 0,
-							value: xnssdl
-						}, {
-							title: "限电损失电量",
-							yAxisIndex: 0,
-							value: xdssdl
-						}, {
-							title: "受累损失电量",
-							yAxisIndex: 0,
-							value: slssdl
-						})
-						that.analyisDialog = analyis;
-					}
-				});
+				var data = that.ajaxData;
+				that.windNum = data[0].name;
+				that.windNum2 = data[1].name;
+				that.tabs = [{
+					name: "发电量",
+					windData1: data[0].fdl,
+					windData2: data[1].fdl
+				}, {
+					name: "故障损失电量",
+					windData1: data[0].gzssdl,
+					windData2: data[1].gzssdl
+				}, {
+					name: "检修损失电量",
+					windData1: data[0].jxssdl,
+					windData2: data[1].jxssdl
+				}, {
+					name: "性能未达标损失电量",
+					windData1: data[0].xnssdl,
+					windData2: data[1].xnssdl
+				}, {
+					name: "受累损失电量",
+					windData1: data[0].slssdl,
+					windData2: data[1].slssdl
+				}, {
+					name: "风能利用率",
+					windData1: data[0].fnlyl,
+					windData2: data[1].fnlyl
+				}, {
+					name: "故障损失率",
+					windData1: data[0].gzssl,
+					windData2: data[1].gzssl
+				}, {
+					name: "检修损失率",
+					windData1: data[0].jxssl,
+					windData2: data[1].jxssl
+				}, {
+					name: "弃风率",
+					windData1: data[0].qfl,
+					windData2: data[1].qfl
+				}, {
+					name: "性能损失率",
+					windData1: data[0].xnssl,
+					windData2: data[1].xnssl
+				}, {
+					name: "受累损失率",
+					windData1: data[0].slssl,
+					windData2: data[1].slssl
+				}];
+				
+				that.radarValue = [{
+					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
+					data: [{
+						value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
+							data[0].xnsslpm, data[0].slsslpm
+						]
+					}, {
+						value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
+							data[1].xnsslpm, data[1].slsslpm
+						]
+					}]
+				}];
+				
+				var analyis = [],
+					gzssdl = [],
+					jxssdl = [],
+					xnssdl = [],
+					xdssdl = [],
+					slssdl = [];
+				data.forEach((item, index) => {
+					gzssdl.push({
+						text: item.name,
+						value: item.gzssdl
+					});
+					jxssdl.push({
+						text: item.name,
+						value: item.jxssdl
+					});
+					xnssdl.push({
+						text: item.name,
+						value: item.xnssdl
+					});
+					xdssdl.push({
+						text: item.name,
+						value: item.xdssdl
+					});
+					slssdl.push({
+						text: item.name,
+						value: item.slssdl
+					});
+				})
+				analyis.push({
+					title: "故障损失电量",
+					yAxisIndex: 0,
+					value: gzssdl
+				}, {
+					title: "检修损失电量",
+					yAxisIndex: 0,
+					value: jxssdl
+				}, {
+					title: "性能损失电量",
+					yAxisIndex: 0,
+					value: xnssdl
+				}, {
+					title: "限电损失电量",
+					yAxisIndex: 0,
+					value: xdssdl
+				}, {
+					title: "受累损失电量",
+					yAxisIndex: 0,
+					value: slssdl
+				})
+				that.analyisDialog = analyis;
+				
+				
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];

src/views/HealthControl/Health4.vue

@@ -1,35 +1,140 @@
 <template>
-  <div class="health-4">
-    <simple-line-chart :height="'100px'" />
-    <simple-line-chart :height="'100px'" :color="'yellow'" :title="'发电机'" />
-    <simple-line-chart :height="'100px'" :color="'purple'" :title="'变桨系统'" />
-    <simple-line-chart :height="'100px'" :color="'blue'" :title="'主控系统'" />
-    <simple-line-chart :height="'100px'" :color="'orange'" :title="'齿轮箱'" />
+  <div class="wind-site">
+    <div class="page-common-body">
+      <div class="page-common-body-router">
+        <router-view />
+      </div>
+      <div class="page-common-body-menu">
+        <div class="page-common-body-menu-box">
+          <div class="page-common-body-menu-border left top"></div>
+          <div class="page-common-body-menu-border left bottom"></div>
+          <div class="page-common-body-menu-border right top"></div>
+          <div class="page-common-body-menu-border right bottom"></div>
+          <div class="page-common-body-menu-item" v-for="(menuData, index) of menuDatas" :key="index" @click="clickMenu(index)" :class="{ active: activeIndex == index }">
+            <router-link :to="menuData.path">
+              <span class="svg-icon" :class="activeIndex == index ? 'svg-icon-yellow' : 'svg-icon-green'">
+                <SvgIcon :svgid="menuData.icon"></SvgIcon>
+              </span>
+            </router-link>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import SimpleLineChart from "../../components/chart/line/simple-line-chart.vue";
+import SvgIcon from "@com/coms/icon/svg-icon.vue";
 export default {
   setup() {},
-  components: { SimpleLineChart },
+  components: { SvgIcon },
   data() {
-    return {};
+    return {
+      activeIndex:0,
+      menuDatas: [{
+        icon: "svg-agc",
+        path: "/health/health4/healthLineChart",
+      }]
+    };
   },
-  created() {},
+
+  created() {
+   
+  },
+  
+  methods:{
+    clickMenu: function(index) {
+      this.activeIndex = index;
+    },
+  }
 };
 </script>
 
-<style lang="less">
-.health-4 {
-  padding: 0 40px;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-  height: 100%;
+<style lang="less" scoped>
+.wind-site {
+  .page-common-body {
+    display: flex;
+    flex-direction: row;
+    margin-top: 0.741vh;
+
+    .page-common-body-router {
+      overflow: auto;
+      overflow-x: hidden;
+      height: calc(100vh - 7.037vh);
+      flex: 1 1 auto;
+    }
+
+    .page-common-body-menu {
+      width: 7.407vh;
+      padding: 0 1.481vh 1.481vh 1.481vh;
+
+      .page-common-body-menu-box {
+        border: 0.093vh solid @darkgray;
+        background-color: fade(@darkgray, 30%);
+        padding: 2.222vh 0.185vh;
+        position: relative;
+
+        .page-common-body-menu-border {
+          position: absolute;
+          width: 0.37vh;
+          height: 0.37vh;
+          background-color: @write;
+          border-radius: 50%;
+
+          &.left {
+            left: -0.185vh;
+          }
+
+          &.right {
+            right: -0.185vh;
+          }
+
+          &.top {
+            top: -0.185vh;
+          }
+
+          &.bottom {
+            bottom: -0.185vh;
+          }
+        }
+
+        .page-common-body-menu-item {
+          border: 0.093vh solid fade(@green, 40%);
+          width: 3.889vh;
+          height: 3.889vh;
+          border-radius: 0.278vh;
+          margin-top: 0.741vh;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          cursor: pointer;
+
+          a {
+            line-height: 0;
+          }
+
+          &:first-child {
+            margin-top: 0;
+          }
+
+          &.active {
+            border-color: fade(@yellow, 40%);
+            position: relative;
 
-  .chart {
-    flex: 0;
+            &::after {
+              content: "";
+              width: calc(100% - 0.37vh);
+              height: calc(100% - 0.37vh);
+              position: absolute;
+              border: 0.093vh solid @yellow;
+              box-shadow: 0 0 0.37vh @yellow;
+              top: 0.093vh;
+              left: 0.093vh;
+            }
+          }
+        }
+      }
+    }
   }
 }
-</style>
+</style>

src/views/HealthControl/healthLineChart.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="pageBox">
+    <simple-line-chart :height="'100px'" />
+    <simple-line-chart :height="'100px'" :color="'yellow'" :title="'发电机'" />
+    <simple-line-chart :height="'100px'" :color="'purple'" :title="'变桨系统'" />
+    <simple-line-chart :height="'100px'" :color="'blue'" :title="'主控系统'" />
+    <simple-line-chart :height="'100px'" :color="'orange'" :title="'齿轮箱'" />
+  </div>
+</template>
+
+<script>
+import SimpleLineChart from "../../components/chart/line/simple-line-chart.vue";
+export default {
+  setup() {},
+  components: { SimpleLineChart },
+  data() {
+    return {};
+  },
+
+  created() {
+    
+  },
+  
+  methods:{
+   
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.pageBox {
+  width: 100%;
+  height:calc(100% - 1.481vh * 2);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin:1.481vh 0;
+
+  .chart{
+    width: 100%;
+    height:25%;
+  }
+}
+</style>

src/views/Home/Home.vue

@@ -4,8 +4,8 @@
       <Col :span="6">
       <Row type="flex">
         <Col :span="24">
-        <com-panel title="银川" sub-title="AM 10:52 实况" icon="fa fa-map-marker">
-          <weather />
+        <com-panel :title="tqmap.name || 'yc'" :sub-title="nowTime + ' 实况'" icon="fa fa-map-marker">
+          <weather :data="tqmap" />
         </com-panel>
         </Col>
       </Row>
@@ -38,7 +38,7 @@
         <Row type="flex">
           <Col :span="24">
             <com-panel title="计划电量完成情况" sub-title="（单位：万KWh）">
-              <power-plan :data="planData" :showSingle="powerplanShowSingle" :id="wpId" @chartClick="showDownChart" />
+              <power-plan :data="planData" :title="planBtnName" :showSingle="powerplanShowSingle" :id="wpId" @chartClick="showDownChart" />
             </com-panel>
           </Col>
         </Row>
@@ -421,7 +421,7 @@
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="70%" top="10vh" custom-class="modal" :close-on-click-modal="true" @closed="dialogType = ''">
       <Table :data="dialogData" v-if="dialogType === 'table'" />
       <MultipleLineChart height="500px" :units="powerLineChartData.units" :list="powerLineChartData.value" :showLegend="true" v-if="dialogType === 'powerLineChart'" />
-      <multiple-bar-chart height="500px" :list="doneLineChartData.value" :units="doneLineChartData.units" v-if="dialogType === 'doneLineChart'" />
+      <multiple-bar-chart height="500px" :units="doneLineChartData.units" :list="doneLineChartData.value" v-if="dialogType === 'doneLineChart'" />
     </el-dialog>
   </div>
 </template>
@@ -469,12 +469,16 @@ export default {
   data () {
     return {
       timmer: null, // 计时器
+      timmer2:null,
       jczbmap: {},
       wxssmap: {},
       gxkmap: {},
       mxztmap: {},
       planData: {},
       powerData: {},
+      tqmap:{},
+      nowTime:"",
+      planBtnName:"全部",
       powerLineChartData: {
         // 图表所用单位
         units: [""],
@@ -621,28 +625,32 @@ export default {
             dialogTitle: "风速详情",
             subUrl: "genreset/findGLDetail",
             targetName: "ssfs",
-            dialogType: "powerLineChart"
+            dialogType: "powerLineChart",
+            max: res.data.jczbmap.zjts
           }, {
             title: "保证功率",
             value: res.data.jczbmap.bzgl,
             dialogTitle: "保证功率详情",
             subUrl: "genreset/findGLDetail",
             targetName: "bzgl",
-            dialogType: "powerLineChart"
+            dialogType: "powerLineChart",
+            max: res.data.jczbmap.zjts
           }, {
             title: "应发功率",
             value: res.data.jczbmap.yfgl,
             dialogTitle: "应发功率详情",
             subUrl: "genreset/findGLDetail",
             targetName: "yfgl",
-            dialogType: "powerLineChart"
+            dialogType: "powerLineChart",
+            max: res.data.jczbmap.zjts
           }, {
             title: "实际功率",
             value: res.data.jczbmap.sjgl,
             dialogTitle: "实际功率详情",
             subUrl: "genreset/findGLDetail",
             targetName: "sjgl",
-            dialogType: "powerLineChart"
+            dialogType: "powerLineChart",
+            max: res.data.jczbmap.zjts
           }];
 
           that.DayPower = DayPower;
@@ -652,6 +660,7 @@ export default {
           that.gxkmap = res.data.gxkmap;
           that.mxztmap = res.data.mxztmap;
           that.fcmap = res.data.fcmap;
+          that.tqmap = res.data.tqmap;
 
           that.ForecastPower = [{
             name: "当日预测电量",
@@ -684,7 +693,9 @@ export default {
     },
 
     // 点击地图展示类型
-    changeShowType(wpId){
+    changeShowType(wpId, planBtnName){
+      this.planBtnName = planBtnName;
+      this.jczbmap = {};
       clearInterval(this.timmer);
       this.timmer = null;
       this.wpId = wpId;
@@ -765,17 +776,23 @@ export default {
 
   created () {
     let that = this;
+    that.nowTime = new Date().formatDate("hh:mm:ss");
     that.$nextTick(() => {
       that.requestData(false);
       that.timmer = setInterval(() => {
         that.requestData(false);
       }, that.$store.state.websocketTimeSec);
+      that.timmer2 = setInterval(() => {
+        that.nowTime = new Date().formatDate("hh:mm:ss");
+      }, 1000);
     });
   },
 
   unmounted () {
     clearInterval(this.timmer);
+    clearInterval(this.timmer2);
     this.timmer = null;
+    this.timmer2 = null;
   }
 };
 </script>

src/views/Home/components/map.vue

@@ -171,18 +171,18 @@ export default {
       let wpId = (showType === "all" ? "0" : showType === "fc" ? "-1" : "-2");
       this.safeDay = "---";
       this.mapName = "nx";
-      this.$emit("mapClick", wpId);
+      this.$emit("mapClick", wpId, this.tabs[index].text);
     },
     backMap() {
       // this.mapName = "nx";
       // this.$emit("mapClick", wpId);
     },
-    clickLabel(wpId) {
+    clickLabel(wpId, planBtnName) {
       this.mapName = wpId;
-      this.$emit("mapClick", wpId);
+      this.$emit("mapClick", wpId, planBtnName);
     },
-    clickFj(wpId){
-      this.$emit("mapClick", wpId);
+    clickFj(wpId, planBtnName){
+      this.$emit("mapClick", wpId, planBtnName);
     }
   },
   watch:{

src/views/Home/components/map/MHS_FDC.vue

@@ -117,7 +117,7 @@
                     fill="#000000"
                     opacity="0.8"
                     class="item-label"
-                    @click.stop="clickFj('MHS03_XL')"
+                    @click.stop="clickFj('MHS03_XL', '麻黄山3#')"
                 />
                 <text x="250" y="37" fill="#919697" font-size="14">
                     3#集电线
@@ -136,7 +136,7 @@
                     fill="#000000"
                     opacity="0.8"
                     class="item-label"
-                    @click.stop="clickFj('MHS04_XL')"
+                    @click.stop="clickFj('MHS04_XL', '麻黄山4#')"
                 />
                 <text x="510" y="95" fill="#919697" font-size="14">
                     4#集电线
@@ -155,7 +155,7 @@
                     fill="#000000"
                     opacity="0.8"
                     class="item-label"
-                    @click.stop="clickFj('MHS02_XL')"
+                    @click.stop="clickFj('MHS02_XL', '麻黄山2#')"
                 />
                 <text x="290" y="144" fill="#919697" font-size="14">
                     2#集电线
@@ -174,7 +174,7 @@
                     fill="#000000"
                     opacity="0.8"
                     class="item-label"
-                    @click.stop="clickFj('MHS01_XL')"
+                    @click.stop="clickFj('MHS01_XL', '麻黄山1#')"
                 />
                 <text x="370" y="214" fill="#919697" font-size="14">
                     1#集电线
@@ -191,7 +191,7 @@
                 stroke-dasharray="8 4"
                 stroke-width="1"
             />
-            <text x="140" y="340" fill="#ffffff" font-size="14" class="curStyle" @click.stop="changeshowType('MHS01_GC')">一期</text>
+            <text x="140" y="340" fill="#ffffff" font-size="14" class="curStyle" @click.stop="changeshowType('MHS01_GC', '麻黄山一期')">一期</text>
             <line
                 x1="580"
                 y1="130"
@@ -201,7 +201,7 @@
                 stroke-dasharray="8 4"
                 stroke-width="1"
             />
-            <text x="650" y="120" fill="#ffffff" font-size="14" class="curStyle" @click.stop="changeshowType('MHS02_GC')">二期</text>
+            <text x="650" y="120" fill="#ffffff" font-size="14" class="curStyle" @click.stop="changeshowType('MHS02_GC', '麻黄山二期')">二期</text>
         </svg>
     </div>
 </template>
@@ -234,12 +234,12 @@ export default {
     },
     // 函数
     methods: {
-        changeshowType(id) {
+        changeshowType(id, planBtnName) {
             this.activeId = id;
-            this.$emit("clickFj", id);
+            this.$emit("clickFj", id, planBtnName);
         },
-        clickFj(id){
-          this.$emit("clickFj", id);
+        clickFj(id, planBtnName){
+          this.$emit("clickFj", id, planBtnName);
         }
     },
     created() {

src/views/Home/components/map/svg-map-nx.vue

@@ -93,7 +93,7 @@
                 transform="matrix(1 0 0 1 -113 60.6679)"
             ></image>
 
-            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click.stop="clickLabel('XS_FDC')" @mouseover="mouseover(0)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click.stop="clickLabel('XS_FDC', '香山风电场')" @mouseover="mouseover(0)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="150" y="195" />
                 <use xlink:href="#nx-map-circle-1" x="150" y="195" />
                 <!-- +25 -5 -->
@@ -111,7 +111,7 @@
                 <!-- +70 0 -->
                 <text x="245" y="207" fill="#05bb4c" font-size="14">{{sourceMap.XS_FDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click.stop="clickLabel" @mouseover="mouseover(1)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click.stop="clickLabel('MCH_GDC', '马场湖光电厂')" @mouseover="mouseover(1)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="280" y="40" />
                 <use xlink:href="#nx-map-circle-1" x="280" y="40" />
                 <!-- +25 -5 -->
@@ -129,7 +129,7 @@
                 <!-- +70 0 -->
                 <text x="375" y="52" fill="#05bb4c" font-size="14">{{sourceMap.MCH_GDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click.stop="clickLabel('XH_GDC')" @mouseover="mouseover(2)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click.stop="clickLabel('XH_GDC', '宣和光电厂')" @mouseover="mouseover(2)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="290" y="80" />
                 <use xlink:href="#nx-map-circle-1" x="290" y="80" />
                 <!-- +25 -5 -->
@@ -147,7 +147,7 @@
                 <!-- +70 0 -->
                 <text x="385" y="92" fill="#05bb4c" font-size="14">{{sourceMap.XH_GDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click.stop="clickLabel('NSS_FDC')" @mouseover="mouseover(3)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click.stop="clickLabel('NSS_FDC', '牛首山风电场')" @mouseover="mouseover(3)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="410" y="65" />
                 <use xlink:href="#nx-map-circle-1" x="410" y="65" />
                 <!-- +25 -5 -->
@@ -163,9 +163,9 @@
                 <!-- +5 +12| -->
                 <text x="440" y="77" fill="#919697" font-size="14">牛首山</text>
                 <!-- +70 0 -->
-                <text x="505" y="77" fill="#05bb4c" font-size="14">{{sourceMap.NSS_FDC_zjts}}</text>
+                <text x="505" y="77" fill="#05bb4c" font-size="14">{{sourceMap.NSS_FDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click="clickLabel('DWK_GDC')" @mouseover="mouseover(4)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click="clickLabel('DWK_GDC', '大武口电厂')" @mouseover="mouseover(4)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="570" y="5" />
                 <use xlink:href="#nx-map-circle-1" x="570" y="5" />
                 <!-- +25 -5 -->
@@ -183,7 +183,7 @@
                 <!-- +70 0 -->
                 <text x="665" y="17" fill="#05bb4c" font-size="14">{{sourceMap.DWK_GDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click="clickLabel('PL_GDC')" @mouseover="mouseover(5)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'gf'" class="item-label" @click="clickLabel('PL_GDC', '平罗光电厂')" @mouseover="mouseover(5)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="590" y="30" />
                 <use xlink:href="#nx-map-circle-1" x="590" y="30" />
                 <!-- +25 -5 -->
@@ -201,7 +201,7 @@
                 <!-- +70 0 -->
                 <text x="685" y="42" fill="#05bb4c" font-size="14">{{sourceMap.PL_GDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'fc'" class="item-label"  @click="clickLabel('SBQ_FDC')" @mouseover="mouseover(6)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'fc'" class="item-label"  @click="clickLabel('SBQ_FDC', '石板泉风电场')" @mouseover="mouseover(6)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="380" y="125" />
                 <use xlink:href="#nx-map-circle-1" x="380" y="125" />
                 <!-- +25 -5 -->
@@ -219,7 +219,7 @@
                 <!-- +70 0 -->
                 <text x="475" y="137" fill="#05bb4c" font-size="14">{{sourceMap.SBQ_FDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click="clickLabel('MHS_FDC')" @mouseover="mouseover(7)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click="clickLabel('MHS_FDC', '麻黄山风电场')" @mouseover="mouseover(7)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="390" y="155" />
                 <use xlink:href="#nx-map-circle-1" x="390" y="155" />
                 <!-- +25 -5 -->
@@ -237,7 +237,7 @@
                 <!-- +70 0 -->
                 <text x="485" y="167" fill="#05bb4c" font-size="14">{{sourceMap.MHS_FDC_zjts}}台</text>
             </g>
-            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click="clickLabel('QS_FDC')" @mouseover="mouseover(8)" @mouseout="mouseout">
+            <g v-if="showType === 'all' || showType === 'fc'" class="item-label" @click="clickLabel('QS_FDC', '青山风电场')" @mouseover="mouseover(8)" @mouseout="mouseout">
                 <use xlink:href="#nx-map-line-1" x="430" y="180" />
                 <use xlink:href="#nx-map-circle-1" x="430" y="180" />
                 <!-- +25 -5 -->
@@ -420,8 +420,8 @@ export default {
     },
     // 函数
     methods: {
-        clickLabel(wpId) {
-           this.$emit("clickLabel", wpId);
+        clickLabel(wpId, planBtnName) {
+           this.$emit("clickLabel", wpId, planBtnName);
         },
         popupHide: function () {
             for (let i = 0; i < this.popup.length; i++) {

src/views/Home/components/power-plan.vue

@@ -23,11 +23,12 @@ export default {
     return {
       planData: {},
       wpId: "",
+      showTitle:"",
       // tab项
       tabs: [
         {
           id: "1",
-          text: "风电"
+          text: ""
         }
       ],
       // 月计划完成率
@@ -54,6 +55,10 @@ export default {
     id:{
       type: String,
       default: ""
+    },
+    title:{
+      type: String,
+      default: ""
     }
   },
   computed: {
@@ -71,6 +76,7 @@ export default {
   mounted() {
     this.planData = this.data;
     this.wpId = this.id;
+    this.tabs[0].text = this.title;
   },
   methods: {
     selectionItemClick (item) {
@@ -145,6 +151,9 @@ export default {
     },
     id(res){
       this.wpId = res;
+    },
+    title(res){
+      this.tabs[0].text = res;
     }
   }
 };

src/views/Home/components/power-review.vue

@@ -3,7 +3,7 @@
     <Row type="flex" justify="center" :align="'middle'">
       <!-- 功率复核 PowerLoad -->
       <Col v-for="item in PowerLoad" :key="item" :span="6">
-        <dash-pie-chart :title="item.title" :value="item.value" height="9.722vh" @click="openDialog(item.dialogTitle, item.subUrl, item.targetName, item.dialogType)" />
+        <dash-pie-chart :title="item.title" :value="item.value" :max="item.max" height="9.722vh" @click="openDialog(item.dialogTitle, item.subUrl, item.targetName, item.dialogType)" />
       </Col>
     </Row>
   </div>

src/views/Home/components/weather.vue

@@ -3,14 +3,14 @@
   <div class="weather">
     <div class="weather-info">
       <span class="svg-icon">
-        <svg-icon class="weather-icon" svgid="svg-duoyun" />
+        <svg-icon class="weather-icon" :svgid="'svg-' + sourceMap.tqtp" />
       </span>
       <div>
-        <div class="temperature">{{ temperature }} °</div>
+        <div class="temperature">{{ sourceMap.wd }} °</div>
         <div class="other">
-          <span>{{ weather }}</span>
-          <span>{{ windDirection }}</span>
-          <span>{{ windSpeed }}</span>
+          <span>{{ sourceMap.tqmc }}</span>
+          <span>{{ sourceMap.fx }}</span>
+          <span>{{ sourceMap.fs }}</span>
         </div>
       </div>
     </div>
@@ -20,21 +20,21 @@
           <div class="svg-icon svg-icon-sm svg-icon-green other-icon">
             <svg-icon svgid="svg-能见度" />
           </div>
-          <div class="value">{{ visibility }}</div>
+          <div class="value">{{ sourceMap.qxd }}</div>
           <div class="text">能见度</div>
         </Col>
         <Col>
           <div class="svg-icon svg-icon-sm svg-icon-green other-icon">
             <svg-icon svgid="svg-湿度" />
           </div>
-          <div class="value">{{ humidity }}</div>
+          <div class="value">{{ sourceMap.sd }}</div>
           <div class="text">湿度</div>
         </Col>
         <Col>
           <div class="svg-icon svg-icon-sm svg-icon-green other-icon">
             <svg-icon svgid="svg-气压" />
           </div>
-          <div class="value">{{ pressure }}</div>
+          <div class="value">{{ sourceMap.dqyl }}kPa</div>
           <div class="text">气压</div>
         </Col>
         <Col>
@@ -63,9 +63,16 @@ import SvgIcon from "../../../components/coms/icon/svg-icon.vue";
 
 export default {
   components: { Row, Col, SvgIcon },
+  props:{
+    data:{
+      type:Object,
+      default:() => { }
+    }
+  },
   // 数据自己获取天气情况
   data() {
     return {
+      sourceMap:{},
       weather: "阴", // 气象
       temperature: "11", // 温度
       windDirection: "北风", // 风向
@@ -77,6 +84,16 @@ export default {
       sunset: "18:50", // 日落
     };
   },
+
+  mounted(){
+    this.sourceMap=this.data;
+  },
+
+  watch:{
+    data(res){
+      this.sourceMap=res;
+    }
+  }
 };
 </script>
 

src/views/layout/Menu.vue

@@ -124,7 +124,7 @@ export default {
             {
               text: "健康管理4",
               icon: "svg-wind-site",
-              path: "/health/health4",
+              path: "/health/health4/healthLineChart",
             },
             {
               text: "健康管理5",