五项损失率发电量添加、各个对标页面详情数据显示错误bug修改、单机月度分析中历史页面数据修改

src/views/Decision/Decision2.vue

@@ -397,7 +397,8 @@
 							is_light: false,
 						},
 						{
-							name: "",
+							// name: "",
+							name:"发电量",
 							field: "fdl",
 							is_num: false,
 							is_light: false,

src/views/Decision/Decision2Cjdb.vue

@@ -104,6 +104,8 @@
 		data() {
 			let that = this;
 			return {
+				detailId:'', //详情id
+				idArr:[],
 				tableIdArr: [], //放checkbox的id数组
 				tableId: [],
 				checkLength: 0, //对标分析只能选择2个
@@ -323,7 +325,11 @@
 								return "<a class='action'>详情</a>";
 							},
 							click: function(event, data) {
+								console.log('DetailData:',data)
 								var dataId = that.tableIdArr[data.index - 1];
+								console.log('dataIndex:',data.index)
+				console.log('that.tableIdArr:',that.tableIdArr)
+				console.log('dataId:',dataId)
 								that.clearDb();
 								that.detailShow = 2;
 								that.API.requestData({
@@ -331,7 +337,8 @@
 									baseURL: "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
-										id: dataId,
+										// id: dataId,
+										id:that.idArr.length==1?that.detailId:dataId,
 										beginDate: that.value4,
 										endDate: that.value5,
 										target: '',
@@ -642,6 +649,12 @@
 					},
 					success(res) {
 						that.ajaxData = res.data;
+							that.idArr = res.data
+							console.log('idArr:',that.idArr)
+						if(res.data.length==1){
+							that.detailId = res.data[0].id
+							console.log('detailId:',that.detailId)
+						}
 						var dataTab = [], //表格
 							fdl = [],
 							cz = [],
@@ -654,6 +667,7 @@
 							slssdl = [];
 						res.data.forEach((item, index) => {
 							that.tableIdArr.push(item.id);
+							console.log('ajaxTable:',that.tableIdArr)
 							dataTab.push({ //表格
 								index: index + 1,
 								fdl: item.fdl,

src/views/Decision/Decision2Cndb.vue

@@ -94,6 +94,8 @@
 		data() {
 			let that = this;
 			return {
+				detailId:'',
+				idArr:[],
 				tableIdArr: [], //放checkbox的id数组
 				tableId: [],
 				checkLength: 0, //对标分析只能选择2个
@@ -307,6 +309,8 @@
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
+								console.log('detailData:',data)
+								console.log('tableArr:',that.tableIdArr)
 								that.clearDb();
 								that.detailShow = 2;
 								// var that = this;
@@ -322,9 +326,11 @@
 										sort: ''
 									},
 									success(res) {
+										console.log('details:',res)
 										var dataTab = [];
 										res.data.forEach((item, index) => {
-											that.tableIdArr.push(item.date);
+											// that.tableIdArr.push(item.date);
+											that.tableIdArr.push(item.id);
 
 											dataTab.push({ //表格
 												index: index + 1,
@@ -621,8 +627,14 @@
 						sort: ''
 					},
 					success(res) {
-						console.log(JSON.stringify(res))
+						// console.log(JSON.stringify(res))
 						that.ajaxData = res.data;
+							that.idArr = res.data
+							console.log('idarr:',that.idArr)
+						// if(res.data.length==1){
+						// 	that.detailId = res.data[0].id
+						// 	console.log('detailId:',that.detailId)
+						// }
 						var dataTab = [], //表格
 							analyis = [],
 							gzssdl = [],
@@ -846,6 +858,7 @@
 			},
 			dbfx() {
 				var that = this;
+				console.log('dbid:',that.tableId)
 				if (that.tableId.length == 2) {
 					that.dialogVisible = true;
 					this.AjaxDbfx();

src/views/performanceAnalysis/index.vue

@@ -26,7 +26,7 @@
     <div class="df-table">
       <ComTable height="78vh" :data="tableData"></ComTable>
     </div>
-    <el-dialog title="切入切出风速整合历史" v-model="dialogShow" width="85%" top="10vh" custom-class="modal"
+    <el-dialog title="单机历史性能分析" v-model="dialogShow" width="85%" top="10vh" custom-class="modal"
       :close-on-click-modal="true" @closed="dialogType = ''">
       <div class="query mg-b-8">
         <div class="query-items">