1

src/views/MLargeScreen/components/smallComponents/DPcomputer8.vue

@@ -69,19 +69,23 @@ export default {
 					this.exploitationEfficiencyData.dayYield1 = text1;
 					this.exploitationEfficiencyData.dayMil1 = text2.toFixed(3);
 					let transitArr1 = [];
-					transitArr1.push((parseFloat(text2) / parseFloat(text1)).toFixed(4))
+					transitArr1.push((parseFloat(text2) / parseFloat(text1)).toFixed(2))
 					this.exploitationEfficiencyData.rate1 = transitArr1;
-					this.exploitationEfficiencyData.dayWorkTime2 = text3;
 					this.exploitationEfficiencyData.dayYield2 = text1;
-					let transitArr2 = [];
-					transitArr2.push((parseFloat(text3) / parseFloat(text1)).toFixed(4))
-					this.exploitationEfficiencyData.rate2 = transitArr2;
-					this.initLiquidEchart1();
-            		this.initLiquidEchart2();
+					HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery({carclass:'铲车'}).then((reschanche) => {
+						reschanche.forEach((itemchanche,indexchanche)=>{
+							text3 = text3 + (itemchanche.time ? parseFloat(itemchanche.time) : 0);
+						});
+						this.exploitationEfficiencyData.dayWorkTime2 = text3;
+						let transitArr2 = [];
+						transitArr2.push((parseFloat(text3) / parseFloat(text1)).toFixed(2))
+						this.exploitationEfficiencyData.rate2 = transitArr2;
+						this.initLiquidEchart1();
+            			this.initLiquidEchart2();
+					})
 				}
 			})
 			
-
 			this.DPcomputer8BoxTimer = setInterval(() => {
 				//矿石开采效率
 				HttpReq.truckDispatching.apiManmadesCheDayQueryDay({createTime:this.dayCurrentTimeFn(),size:9999,page:0}).then((res) => {
@@ -97,15 +101,20 @@ export default {
 						this.exploitationEfficiencyData.dayYield1 = text1;
 						this.exploitationEfficiencyData.dayMil1 = text2.toFixed(3);
 						let transitArr1 = [];
-						transitArr1.push((parseFloat(text2) / parseFloat(text1)).toFixed(4))
+						transitArr1.push((parseFloat(text2) / parseFloat(text1)).toFixed(2))
 						this.exploitationEfficiencyData.rate1 = transitArr1;
-						this.exploitationEfficiencyData.dayWorkTime2 = text3;
 						this.exploitationEfficiencyData.dayYield2 = text1;
-						let transitArr2 = [];
-						transitArr2.push((parseFloat(text3) / parseFloat(text1)).toFixed(4))
-						this.exploitationEfficiencyData.rate2 = transitArr2;
-						this.initLiquidEchart1();
-						this.initLiquidEchart2();
+						HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery({carclass:'铲车'}).then((reschanche) => {
+							reschanche.forEach((itemchanche,indexchanche)=>{
+								text3 = text3 + (itemchanche.time ? parseFloat(itemchanche.time) : 0);
+							});
+							this.exploitationEfficiencyData.dayWorkTime2 = text3;
+							let transitArr2 = [];
+							transitArr2.push((parseFloat(text3) / parseFloat(text1)).toFixed(2))
+							this.exploitationEfficiencyData.rate2 = transitArr2;
+							this.initLiquidEchart1();
+							this.initLiquidEchart2();
+						})
 					}
 				})