首页接口对接

src/views/dashboard/editor/index.vue

@@ -327,6 +327,10 @@ export default {
   created() {
     this.getRow2List1()
     this.getRow2Chart1()
+    this.getRow2Chart2()
+    this.getRow2Chart3()
+    this.getRow2Chart4()
+    this.getRow3Chart1()
   },
   methods: {
     form_seeDetails(item) {
@@ -372,7 +376,6 @@ export default {
         } else {
           this.row2.chart1.data = []
         }
-        this.getRow2Chart2()
         this.roadRow2Chart1(this.row2.chart1.data)
       })
     },
@@ -586,7 +589,6 @@ export default {
       this.row2.chart1.pasture.listLoading = true
       let url = "authdata/pasture/index"
       let data = '?pastureName=' + this.row3.chart4.getdataListParm.parammaps.pastureName
-      
       getJson(url,data).then(response => {
         if (response.data.list !== null) {
           this.row2.chart1.pasture.list.monthBudgets = response.data.budget
@@ -617,27 +619,27 @@ export default {
           var data1 = ['维修','水','电','燃动']
           var data2 = [
             response.data.repair.budget,
-            response.data.repair.actual,
-            response.data.repair.lastActual,
-            response.data.repair.singleCow,
+            response.data.water.budget,
+            response.data.electricity.budget,
+            response.data.ignition.budget
           ]
           var data3 = [
-            response.data.water.budget,
+            response.data.repair.actual,
             response.data.water.actual,
-            response.data.water.lastActual,
-            response.data.water.singleCow,
+            response.data.electricity.actual,
+            response.data.ignition.actual
           ]
           var data4 = [
-            response.data.electricity.budget,
-            response.data.electricity.actual,
+            response.data.repair.lastActual,
+            response.data.water.lastActual,
             response.data.electricity.lastActual,
-            response.data.electricity.singleCow,
+            response.data.ignition.lastActual
           ]
           var data5 = [
-            response.data.ignition.budget,
-            response.data.ignition.actual,
-            response.data.ignition.lastActual,
-            response.data.ignition.singleCow,
+            response.data.repair.singleCow,
+            response.data.water.singleCow,
+            response.data.electricity.singleCow,
+            response.data.ignition.singleCow
           ]
           this.row2.chart2.data = {
             data1:data1,
@@ -649,7 +651,6 @@ export default {
         } else {
           this.row2.chart2.data = []
         }
-        this.getRow2Chart3()
         this.roadRow2Chart2(this.row2.chart2.data)
       })
     },
@@ -710,7 +711,6 @@ export default {
         } else {
           this.row2.chart3.data = []
         }
-        this.getRow2Chart4()
         this.roadRow2Chart3(this.row2.chart3.data)
         setTimeout(() => {
           this.row2.chart3.listLoading = false
@@ -755,7 +755,6 @@ export default {
         } else {
           this.row2.chart4.data = []
         }
-        this.getRow3Chart1()
         this.roadRow2Chart4(this.row2.chart4.data)
       })
     },
@@ -857,8 +856,6 @@ export default {
             data3:electricity_data3,
             data4:electricity_data4
           }
-
-
           var ignition_data1 = []
           var ignition_data2 = []
           var ignition_data3 = []
@@ -866,9 +863,9 @@ export default {
           var ignition_str1 = ''
           response.data.ignition.forEach((i,j)=>{
             ignition_data1.push(i.Center)
-            ignition_data2.push(i.budget)
-            ignition_data3.push(i.actual)
-            ignition_data4.push(i.lastActual)
+            ignition_data2.push(i.budget) //预算
+            ignition_data3.push(i.actual) //当年实际
+            ignition_data4.push(i.lastActual) //去年实际
             ignition_str1 +=  i.Center + ':'+ i.singleCow
           })
           this.row3.chart4.list = ignition_str1
@@ -947,7 +944,7 @@ export default {
       }
     },
 
-    
+
     roadRow3Chart2(chart_data1) {
       if (this.row3.chart2.Chart != null) {
         this.row3.chart2.Chart.dispose()
@@ -1005,7 +1002,7 @@ export default {
       }
     },
 
-    
+
     roadRow3Chart3(chart_data1) {
       if (this.row3.chart3.Chart != null) {
         this.row3.chart3.Chart.dispose()
@@ -1032,7 +1029,7 @@ export default {
         yAxis: [{ type: 'value', name: '', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
         series: [
           {
-            name: '今年预算',
+            name: '迄今预算',
             textStyle: {
               fontSize: 12,
               fontWeight: 'bolder',
@@ -1052,7 +1049,7 @@ export default {
             name: '去年同期实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data5,
+            data: chart_data1.data4,
             emphasis: { label: { show: true, position: 'inside' }}
           }
         ]
@@ -1063,7 +1060,7 @@ export default {
       }
     },
 
-   
+
     roadRow3Chart4(chart_data1) {
       if (this.row3.chart4.Chart != null) {
         this.row3.chart4.Chart.dispose()
@@ -1090,7 +1087,7 @@ export default {
         yAxis: [{ type: 'value', name: '', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
         series: [
           {
-            name: '今年预算',
+            name: '迄今预算',
             textStyle: {
               fontSize: 12,
               fontWeight: 'bolder',
@@ -1110,7 +1107,7 @@ export default {
             name: '去年同期实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data5,
+            data: chart_data1.data4,
             emphasis: { label: { show: true, position: 'inside' }}
           }
         ]