首页接口对接

src/views/dashboard/editor/index.vue

@@ -97,7 +97,7 @@
                   维修费
                 </div>
                 <div class="small-title">
-                  单头牛实际:  集团:<span>0.62</span> 一中心:<span>0.62</span>   二中心:<span>0.62</span> 三中心:<span>0.62</span>
+                  单头牛实际:  {{row3.chart1.list}}
                 </div>
                 <el-row :gutter="5" style="height:260px;color: #fff;">
                   <el-col :span="24" style="padding:0 10px 0 10px ;">
@@ -118,7 +118,7 @@
                   水费
                 </div>
                 <div class="small-title">
-                  单头牛实际:  集团:<span>0.62</span> 一中心:<span>0.62</span>   二中心:<span>0.62</span> 三中心:<span>0.62</span>
+                  单头牛实际:  {{ row3.chart2.list}}
                 </div>
                 <el-row :gutter="5" style="height:260px;color: #fff;">
                   <el-col :span="24" style="padding:0 10px 0 10px ;">
@@ -139,7 +139,7 @@
                   电费
                 </div>
                 <div class="small-title">
-                  单头牛实际:  集团:<span>0.62</span> 一中心:<span>0.62</span>   二中心:<span>0.62</span> 三中心:<span>0.62</span>
+                  单头牛实际:  {{ row3.chart3.list}}
                 </div>
                 <el-row :gutter="5" style="height:260px;color: #fff;">
                   <el-col :span="24" style="padding:0 10px 0 10px ;">
@@ -160,7 +160,7 @@
                   燃动费
                 </div>
                 <div class="small-title">
-                  单头牛实际:  集团:<span>0.62</span> 一中心:<span>0.62</span>   二中心:<span>0.62</span> 三中心:<span>0.62</span>
+                  单头牛实际:  {{ row3.chart4.list}}
                 </div>
                 <el-row :gutter="5" style="height:260px;color: #fff;">
                   <el-col :span="24" style="padding:0 10px 0 10px;">
@@ -182,7 +182,7 @@
 </template>
 
 <script>
-import { GetReportform, GetDataByName } from '@/api/common'
+import { GetReportform, GetDataByName,getJson } from '@/api/common'
 import Cookies from 'js-cookie'
 import { parseTime } from '@/utils/index.js'
 import echarts from 'echarts'
@@ -388,8 +388,8 @@ export default {
         var geoCoordMap = chart_data1.data1[0]
         var data = chart_data1.data2
 
-        console.log('geoCoordMap', JSON.stringify(geoCoordMap) )
-        console.log('data', JSON.stringify(data))
+        // console.log('geoCoordMap', JSON.stringify(geoCoordMap) )
+        // console.log('data', JSON.stringify(data))
         var max = 480; var min = 9
         var maxSize4Pin = 100; var minSize4Pin = 20
         var convertData = function(data) {
@@ -403,9 +403,9 @@ export default {
           return res
         }
 
-        console.log('convertData', JSON.stringify(convertData))
+        // console.log('convertData', JSON.stringify(convertData))
         var conDatatest1 = convertData(data)
-        console.log('convertData Data', JSON.stringify(conDatatest1))
+        // console.log('convertData Data', JSON.stringify(conDatatest1))
         var symbolImg = 'image://' + require('@/assets/images/1.png') // 或者import引入在拼接也行
 
         var option = {
@@ -584,9 +584,15 @@ export default {
     // 牧场
     getRow2PastureList() {
       this.row2.chart1.pasture.listLoading = true
-      GetDataByName(this.row2.chart1.pasture.getdataListParm).then(response => {
+      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 = response.data.list[0]
+          this.row2.chart1.pasture.list.monthBudgets = response.data.budget
+          this.row2.chart1.pasture.list.sumPrice = response.data.actual
+          this.row2.chart1.pasture.list.donerate = response.data.complete
           console.log('牧场数据', this.row2.chart1.pasture.list)
           this.row2.chart1.isPastureList = true
         } else {
@@ -602,16 +608,44 @@ export default {
 
     // 集团分项总指标
     getRow2Chart2() {
-      GetReportform(this.row2.chart2.getdataListParm).then(response => {
+      let url = 'authdata/overall/index'
+      let data = ''
+      getJson(url,data).then(response => {
+      // GetReportform(this.row2.chart2.getdataListParm).then(response => {
         console.log('row2图2', response)
         if (response.data !== null) {
           this.row2.chart2.data = response.data
+          var data1 = ['维修','水','电','燃动']
+          var data2 = [
+            response.data.repair.budget,
+            response.data.repair.actual,
+            response.data.repair.lastActual,
+            response.data.repair.singleCow,
+          ]
+          var data3 = [
+            response.data.water.budget,
+            response.data.water.actual,
+            response.data.water.lastActual,
+            response.data.water.singleCow,
+          ]
+          var data4 = [
+            response.data.electricity.budget,
+            response.data.electricity.actual,
+            response.data.electricity.lastActual,
+            response.data.electricity.singleCow,
+          ]
+          var data5 = [
+            response.data.ignition.budget,
+            response.data.ignition.actual,
+            response.data.ignition.lastActual,
+            response.data.ignition.singleCow,
+          ]
           this.row2.chart2.data = {
-            data1:['维修','水','电','燃动'],
-            data2:[200,100,70,50],
-            data3:[190,90,60,40],
-            data4:[180,80,70,50],
-            data5:[160,80,70,50]
+            data1:data1,
+            data2:data2,
+            data3:data3,
+            data4:data4,
+            data5:data5
           }
         } else {
           this.row2.chart2.data = []
@@ -648,17 +682,31 @@ export default {
       }
     },
 
-    // 保养完成率
+    // 各中心总指标
     getRow2Chart3() {
       this.row2.chart3.listLoading = true
-      GetDataByName(this.row2.chart3.getdataListParm).then(response => {
+      let url = 'authdata/centra/index'
+      let data = ''
+      getJson(url,data).then(response => {
+      // GetReportform(this.row2.chart2.getdataListParm).then(response => {
+        console.log('row2图2', response)
         if (response.data !== null) {
           this.row2.chart3.data = response.data
+          var data1 = []
+          var data2 = []
+          var data3 = []
+          var data4 = []
+          response.data.central.forEach((i,j)=>{
+            data1.push(i.central)
+            data2.push(i.budget)
+            data3.push(i.actual)
+            data4.push(i.complete)
+          })
           this.row2.chart3.data = {
-            data1:['一中心','二中心','三中心'],
-            data2:[200,100,70],
-            data3:[190,90,60],
-            data4:[10,80,70]
+            data1:data1,
+            data2:data2,
+            data3:data3,
+            data4:data4
           }
         } else {
           this.row2.chart3.data = []
@@ -743,18 +791,94 @@ export default {
       }
     },
 
+    // 维修费
     getRow3Chart1() {
-      GetReportform(this.row3.chart1.getdataListParm).then(response => {
-        console.log('row3图1', response)
+      let url = 'authdata/expense'
+      let data = ''
+      getJson(url,data).then(response => {
+      // GetReportform(this.row3.chart1.getdataListParm).then(response => {
+        console.log('row3', response)
         if (response.data !== null) {
-          this.row3.chart1.data.data1 = response.data.data1
-          this.row3.chart1.data.data2 = response.data.data2
-          this.row3.chart1.data.data3 = response.data.data3
-          this.row3.chart1.data.data4 = response.data.data4
-          this.row3.chart1.data.data5 = response.data.data5
-          this.row3.chart1.list.data1 = response.data.data6[0]
-          this.row3.chart1.list.data2 = response.data.data7[0]
-          this.row3.chart1.list.data3 = response.data.data8[0]
+          var repair_data1 = []
+          var repair_data2 = []
+          var repair_data3 = []
+          var repair_data4 = []
+          var repair_str1 = ''
+          response.data.repair.forEach((i,j)=>{
+            repair_data1.push(i.Center)
+            repair_data2.push(i.budget)
+            repair_data3.push(i.actual)
+            repair_data4.push(i.lastActual)
+            repair_str1 +=  i.Center + ':'+ i.singleCow
+          })
+          this.row3.chart1.list = repair_str1
+          this.row3.chart1.data = {
+            data1:repair_data1,
+            data2:repair_data2,
+            data3:repair_data3,
+            data4:repair_data4
+          }
+
+          var water_data1 = []
+          var water_data2 = []
+          var water_data3 = []
+          var water_data4 = []
+          var water_str1 = ''
+          response.data.water.forEach((i,j)=>{
+            water_data1.push(i.Center)
+            water_data2.push(i.budget)
+            water_data3.push(i.actual)
+            water_data4.push(i.lastActual)
+            water_str1 +=  i.Center + ':'+ i.singleCow
+          })
+          this.row3.chart2.list = water_str1
+          this.row3.chart2.data = {
+            data1:water_data1,
+            data2:water_data2,
+            data3:water_data3,
+            data4:water_data4
+          }
+
+          var electricity_data1 = []
+          var electricity_data2 = []
+          var electricity_data3 = []
+          var electricity_data4 = []
+          var electricity_str1 = ''
+          response.data.electricity.forEach((i,j)=>{
+            electricity_data1.push(i.Center)
+            electricity_data2.push(i.budget)
+            electricity_data3.push(i.actual)
+            electricity_data4.push(i.lastActual)
+            electricity_str1 +=  i.Center + ':'+ i.singleCow
+          })
+          this.row3.chart3.list = electricity_str1
+          this.row3.chart3.data = {
+            data1:electricity_data1,
+            data2:electricity_data2,
+            data3:electricity_data3,
+            data4:electricity_data4
+          }
+
+
+          var ignition_data1 = []
+          var ignition_data2 = []
+          var ignition_data3 = []
+          var ignition_data4 = []
+          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_str1 +=  i.Center + ':'+ i.singleCow
+          })
+          this.row3.chart4.list = ignition_str1
+          this.row3.chart4.data = {
+            data1:ignition_data1,
+            data2:ignition_data2,
+            data3:ignition_data3,
+            data4:ignition_data4
+          }
           this.$forceUpdate()
         } else {
           this.row3.chart1.data = {}
@@ -762,6 +886,9 @@ export default {
         }
         this.getRow3Chart2()
         this.roadRow3Chart1(this.row3.chart1.data)
+        this.roadRow3Chart2(this.row3.chart2.data)
+        this.roadRow3Chart3(this.row3.chart3.data)
+        this.roadRow3Chart4(this.row3.chart4.data)
       })
     },
     roadRow3Chart1(chart_data1) {
@@ -821,27 +948,7 @@ export default {
       }
     },
 
-    getRow3Chart2() {
-      GetReportform(this.row3.chart2.getdataListParm).then(response => {
-        console.log('row3图2', response)
-        if (response.data !== null) {
-          this.row3.chart2.data.data1 = response.data.data1
-          this.row3.chart2.data.data2 = response.data.data2
-          this.row3.chart2.data.data3 = response.data.data3
-          this.row3.chart2.data.data4 = response.data.data4
-          this.row3.chart2.data.data5 = response.data.data5
-          this.row3.chart2.list.data1 = response.data.data6[0]
-          this.row3.chart2.list.data2 = response.data.data7[0]
-          this.row3.chart2.list.data3 = response.data.data8[0]
-          this.$forceUpdate()
-        } else {
-          this.row3.chart2.data = {}
-          this.row3.chart2.list = {}
-        }
-        this.getRow3Chart3()
-        this.roadRow3Chart2(this.row3.chart2.data)
-      })
-    },
+    
     roadRow3Chart2(chart_data1) {
       if (this.row3.chart2.Chart != null) {
         this.row3.chart2.Chart.dispose()
@@ -899,27 +1006,7 @@ export default {
       }
     },
 
-    getRow3Chart3() {
-      GetReportform(this.row3.chart3.getdataListParm).then(response => {
-        console.log('row3图3', response)
-        if (response.data !== null) {
-          this.row3.chart3.data.data1 = response.data.data1
-          this.row3.chart3.data.data2 = response.data.data2
-          this.row3.chart3.data.data3 = response.data.data3
-          this.row3.chart3.data.data4 = response.data.data4
-          this.row3.chart3.data.data5 = response.data.data5
-          this.row3.chart3.list.data1 = response.data.data6[0]
-          this.row3.chart3.list.data2 = response.data.data7[0]
-          this.row3.chart3.list.data3 = response.data.data8[0]
-          this.$forceUpdate()
-        } else {
-          this.row3.chart3.data = {}
-          this.row3.chart3.list = {}
-        }
-        this.getRow3Chart4()
-        this.roadRow3Chart3(this.row3.chart3.data)
-      })
-    },
+    
     roadRow3Chart3(chart_data1) {
       if (this.row3.chart3.Chart != null) {
         this.row3.chart3.Chart.dispose()
@@ -977,26 +1064,7 @@ export default {
       }
     },
 
-    getRow3Chart4() {
-      GetReportform(this.row3.chart4.getdataListParm).then(response => {
-        console.log('row3图4', response)
-        if (response.data !== null) {
-          this.row3.chart4.data.data1 = response.data.data1
-          this.row3.chart4.data.data2 = response.data.data2
-          this.row3.chart4.data.data3 = response.data.data3
-          this.row3.chart4.data.data4 = response.data.data4
-          this.row3.chart4.data.data5 = response.data.data5
-          this.row3.chart4.list.data1 = response.data.data6[0]
-          this.row3.chart4.list.data2 = response.data.data7[0]
-          this.row3.chart4.list.data3 = response.data.data8[0]
-          this.$forceUpdate()
-        } else {
-          this.row3.chart4.data = {}
-          this.row3.chart4.list = {}
-        }
-        this.roadRow3Chart4(this.row3.chart4.data)
-      })
-    },
+   
     roadRow3Chart4(chart_data1) {
       if (this.row3.chart4.Chart != null) {
         this.row3.chart4.Chart.dispose()