6-4 6

src/assets/js/normRanking/goodnessfitRank.js

@@ -98,10 +98,11 @@ export default {
             this.h_Date = {};
             this.h_Date = res.data;
             this.histogram_sers = res.data.sers;
+            this.$store.commit('loadingStore',false);
             
           }).catch(e=>e);
       }
-      this.$store.commit('loadingStore',false);
+      
       
     },
     toExcel() {

src/assets/js/performanceAnalysis/singleMachineAnalysisOperation.js

@@ -132,19 +132,22 @@ export default {
                     this.tableData.tqzb.fs + 'm/s，有效风时数' + this.tableData.byzb.yxfss + '小时、同比' + this.tableData.tqzb.yxfss + '小时，实际发电电量' +
                     this.tableData.byzb.fdl + '万kwh、同比' + this.tableData.tqzb.fdl + '万kwh，同比增长率' + this.tableData.tbzb.fdl + '%，各项损失电量累计' +
                     this.tableData.byzb.xnss + '万kwh、同比' + this.tableData.tqzb.xnss + '万kwh，同比增长率' + this.tableData.tbzb.xnss + '%，理论发电量' +
-                    this.tableData.byzb.llfdl + '万kwh、实际发电量与理论发电量相差' + this.tableData.tbzb.llfdl + '万kwh';
+                    this.tableData.byzb.llfdl + '万kwh、实际发电量与理论发电量相差' + (this.tableData.byzb.fdl - this.tableData.byzb.llfdl) + '万kwh';
             })
             this.API.post('/singleanalysis/singleanalysisChart', performance).then((res) => {
                 this.fdlChart = res.data.ff;
                 for (let i = 0; i < this.fdlChart.length; i++) {
                     let date = this.BASE.getBzDate(new Date(this.fdlChart[i].recorddate),0);
                     this.date.push(date);
+                    debugger
                     this.fdldata.push(this.fdlChart[i].fdl);
                     this.fsdata.push(this.fdlChart[i].fs);
-                    this.$nextTick(function () {
-                        this.getChartDataImport('chartHistogram')
-                    })
+                    debugger
+                    
                 }
+                this.$nextTick(function () {
+                    this.getChartDataImport('chartHistogram')
+                })
                 this.wsChart = res.data.ws;
                 console.log(this.wsChart)
                 for (let i = 0; i < this.wsChart.length; i++) {