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

src/views/Decision/Decision2.vue

@@ -409,7 +409,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 +587,8 @@
 				windNum2: 'dd',
 				tabs: [],
 				analyisDialog: [],
-				detailShow: 1
+				detailShow: 1,
+				ajaxData:[],
 			};
 		},
 		created() {
@@ -688,6 +689,7 @@
 						sort: ''
 					},
 					success(res) {
+						that.ajaxData = res.data;
 						var dataTab = [], //表格
 							fdl = [],
 							cz = [],
@@ -806,133 +808,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 +940,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"];