'风机绩效榜数据替换'

src/views/Decision/Decision1.vue

@@ -374,10 +374,17 @@ import { cacher } from '@antv/x6/lib/util/function/function';
 						res.data.forEach((ele)=>{
 							that.nbdata.push({
 								uniformCode: ele.uniformCode,
+								theoryGeneration:ele.theoryGeneration,
 								meanWindSpeed: ele.meanWindSpeed,
+								generatingCapacity:ele.generatingCapacity,
+								faultLossPower:ele.faultLossPower,
+								maintainLossPower:ele.maintainLossPower,
+								implicateLossPower:ele.implicateLossPower,
+								limitLossPower:ele.limitLossPower,
+								performanceLossPower:ele.performanceLossPower,
+								category:ele.category
 							});
 						})
-						// console.log('12',that.nbdata);
 				},
 				fail(error){
 					console.log('01',error);
@@ -400,6 +407,23 @@ import { cacher } from '@antv/x6/lib/util/function/function';
 					},
 					success(res) {
 						console.log('666',res);
+						if(that.nbdata!=null){
+							res.data.forEach((item1)=>{
+                            that.nbdata.forEach((item2)=>{
+							if(item1.name === item2.uniformCode){
+								item1.llfdl=item2.theoryGeneration,
+								item1.sjfdl=item2.generatingCapacity,
+								item1.speed = item2.meanWindSpeed,
+								item1.fjhjx=item2.faultLossPower,
+								item1.jhjx= item2.maintainLossPower,
+								item1.sl=item2.implicateLossPower,
+								item1.xd=item2.limitLossPower,
+								item1.xn= item2.performanceLossPower,
+								item1.fnlly= item2.category
+							}
+							})
+							})
+							}
 						var name = [],
 							data = [],
 							llfdl = [],
@@ -470,20 +494,6 @@ import { cacher } from '@antv/x6/lib/util/function/function';
 						that.tableDataEnd = data2[data2.length - 1];
 						data2.pop();
 						that.tableData.data = data2;
-						// console.log('nb',data2);
-						if(that.nbdata!=null){
-							that.tableData.data.forEach((item1)=>{
-                            that.nbdata.forEach((item2)=>{
-							if(item1.name === item2.uniformCode){
-								item1.speed = item2.meanWindSpeed
-							}else{
-
-							}
-						})
-						})
-						}
-							
-						console.log('535',that.nbdata);
 					},
 				});
 			},