首页接口对接

src/views/dashboard/editor/index.vue

@@ -41,7 +41,7 @@
             </el-col>
           </el-row>
           <div v-if="row2.chart1.isPastureList" class="pastureNews">
-            <dv-border-box-8 :dur="-1" class="newsTitle"><b>{{ row2.chart1.pasture.pastureName }}</b></dv-border-box-8>
+            <dv-border-box-8 :dur="-1" class="newsTitle"><b>{{ pastureName }}</b></dv-border-box-8>
             <dv-border-box-8 :dur="-1" class="news2">
               <div>
                 <b>设备指标预算:</b><span>{{ row2.chart1.pasture.list.monthBudgets }}万元</span><br>
@@ -320,6 +320,7 @@ export default {
           list: {}
         }
       },
+      pastureName:'现代牧业',
       rowStyle: { maxHeight: 20 + 'px', height: 20 + 'px', background: '#003366', color: '#fff', fontSize: '8px' },
       cellStyle: { padding: 0 + 'px', background: '#003366', color: '#fff', fontSize: '8px' }
     }
@@ -329,7 +330,6 @@ export default {
     this.getRow2Chart1()
     this.getRow2Chart2()
     this.getRow2Chart3()
-    this.getRow2Chart4()
     this.getRow3Chart1()
   },
   methods: {
@@ -538,35 +538,14 @@ export default {
           if (param.value.length !== undefined) {
             console.log(param)
             that.row2.chart2.getdataListParm.parammaps.pastureName = param.name
-            that.row2.chart3.getdataListParm.name = 'homepageUkdoneRateEqclass'
-            that.row2.chart3.getdataListParm.parammaps.pastureName = param.name
             that.row2.chart3.isType = true
             that.row2.chart3.isPasture = false
-            that.row2.chart4.getdataListParm.name = 'homepageEqRunstatueListEqclass'
-            that.row2.chart4.getdataListParm.parammaps.pastureName = param.name
-            that.row2.chart4.getdataListParm.parammaps.type = '设备类别'
-            that.row2.chart1.pasture.getdataListParm.parammaps.pastureName = param.name
-            that.row3.chart1.getdataListParm.parammaps.pastureName = param.name
-            that.row3.chart2.getdataListParm.parammaps.pastureName = param.name
-            that.row3.chart3.getdataListParm.parammaps.pastureName = param.name
-            that.row3.chart4.getdataListParm.parammaps.pastureName = param.name
-            that.row2.chart1.pasture.pastureName = param.name
+            that.pastureName = param.name
             that.getRow2PastureList()
-            that.getRow2Chart2()
+            that.getRow3Chart1()
           } else {
-            that.row2.chart2.getdataListParm.parammaps.pastureName = '现代牧业'
-            that.row2.chart3.isType = false
-            that.row2.chart3.isPasture = true
-            that.row2.chart3.getdataListParm.name = 'homepageUkdoneRatePasture'
-            that.row2.chart3.getdataListParm.parammaps.pastureName = '现代牧业'
-            that.row2.chart4.getdataListParm.name = 'homepageEqRunstatueListPasture'
-            that.row2.chart4.getdataListParm.parammaps.type = '牧场'
-            that.row2.chart4.getdataListParm.parammaps.pastureName = '现代牧业'
-            that.row3.chart1.getdataListParm.parammaps.pastureName = '现代牧业'
-            that.row3.chart2.getdataListParm.parammaps.pastureName = '现代牧业'
-            that.row3.chart3.getdataListParm.parammaps.pastureName = '现代牧业'
-            that.row3.chart4.getdataListParm.parammaps.pastureName = '现代牧业'
-            that.getRow2Chart1()
+            that.pastureName = '现代牧业'
+            that.getRow3Chart1()
             that.row2.chart1.isPastureList = false
           }
         })
@@ -578,8 +557,9 @@ export default {
     // 牧场
     getRow2PastureList() {
       this.row2.chart1.pasture.listLoading = true
+      console.log(this.pastureName,'this.pastureName')
       let url = "authdata/pasture/index"
-      let data = '?pastureName=' + this.row3.chart4.getdataListParm.parammaps.pastureName
+      let data = '?pastureName=' + this.pastureName
       getJson(url,data).then(response => {
         if (response.data.list !== null) {
           this.row2.chart1.pasture.list.monthBudgets = response.data.budget
@@ -660,10 +640,10 @@ export default {
         xAxis: [{ type: 'category', name: '设备类别', data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
         yAxis: [{ type: 'value', name: '费用/百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff' }}}],
         series: [
-          { type: 'bar', barWidth: 20, data: chart_data1.data2, name:'迄今预算', emphasis: { label: { show: true, position: 'inside' }} },
-          { type: 'bar', barWidth: 20, data: chart_data1.data3, name:'今年实际', emphasis: { label: { show: true, position: 'inside' }} },
-          { type: 'bar', barWidth: 20, data: chart_data1.data4, name:'去年同期实际', emphasis: { label: { show: true, position: 'inside' }} },
-          { type: 'line', data: chart_data1.data5, name:'单头牛实际', emphasis: { label: { show: true, position: 'inside' }} }
+          { type: 'bar', barWidth: 20, data: chart_data1.data2, name:'迄今预算' },
+          { type: 'bar', barWidth: 20, data: chart_data1.data3, name:'今年实际' },
+          { type: 'bar', barWidth: 20, data: chart_data1.data4, name:'去年同期实际' },
+          { type: 'line', data: chart_data1.data5, name:'单头牛实际' }
         ]
       }
       this.row2.chart2.Chart.setOption(option)
@@ -722,12 +702,12 @@ export default {
         xAxis: [{ type: 'category', name: '', data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
         yAxis: [
           { type: 'value', name: '费用/百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff' }}},
-          { type: 'value', name: '', min: 0, max: 100, interval: 20, axisLabel: { formatter: '{value} %' },axisLine: { lineStyle: { color: '#fff' }} }
+          { type: 'value', name: '', min: 0, max: 100, interval: 20, splitLine:{show: false}, axisLabel: { formatter: '{value} %' }, axisLine: { lineStyle: { color: '#fff' }} }
         ],
         series: [
-          { type: 'bar', barWidth: 20, data: chart_data1.data2, name:'设备指标迄今预算', emphasis: { label: { show: true, position: 'inside' }} },
-          { type: 'bar', barWidth: 20, data: chart_data1.data3, name:'设备指标迄今实际', emphasis: { label: { show: true, position: 'inside' }} },
-          { type: 'line', data: chart_data1.data4, name:'完成率', emphasis: { label: { show: true, position: 'inside' }} }
+          { type: 'bar', barWidth: 20, data: chart_data1.data2, name:'设备指标迄今预算' },
+          { type: 'bar', barWidth: 20, data: chart_data1.data3, name:'设备指标迄今实际' },
+          { type: 'line', data: chart_data1.data4, name:'完成率' }
         ]
       }
       this.row2.chart3.Chart.setOption(option)
@@ -735,53 +715,11 @@ export default {
         this.row2.chart3.Chart.resize()
       }
     },
-    // 资产运转率
-    getRow2Chart4() {
-      GetReportform(this.row2.chart4.getdataListParm).then(response => {
-        console.log('row2图4', response)
-        if (response.data !== null) {
-          this.row2.chart4.data = response.data
-        } else {
-          this.row2.chart4.data = []
-        }
-        this.roadRow2Chart4(this.row2.chart4.data)
-      })
-    },
-    roadRow2Chart4(chart_data1) {
-      if (this.row2.chart4.Chart != null) {
-        this.row2.chart4.Chart.dispose()
-      }
-      this.row2.chart4.Chart = echarts.init(document.getElementById('row2Chart4'))
-      var option = {
-        title: { text: '', textStyle: { color: '#769cfc' }},
-        tooltip: { trigger: 'axis' },
-        color: ['#769cfc'],
-        grid: { left: '3%', right: '8%', top: '15%', bottom: '4%', containLabel: true },
-        xAxis: [{ type: 'category', name: chart_data1.data3[0],
-          axisLabel: {
-            interval: 0,
-            rotate: 40
-          },
-          data: chart_data1.data1, axisLine: { lineStyle: { color: '#fff' }}}],
-        yAxis: [{ type: 'value', name: '%', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff' }}}],
-        series: [
-          {
-            type: 'bar',
-            data: chart_data1.data2,
-            emphasis: { label: { show: true, position: 'inside' }}
-          }
-        ]
-      }
-      this.row2.chart4.Chart.setOption(option)
-      window.onresize = function() {
-        this.row2.chart4.Chart.resize()
-      }
-    },
 
     // 维修费
     getRow3Chart1() {
       let url = 'authdata/expense'
-      let data = ''
+      let data = '?pastureName=' + this.pastureName
       getJson(url,data).then(response => {
       // GetReportform(this.row3.chart1.getdataListParm).then(response => {
         console.log('row3', response)
@@ -899,7 +837,7 @@ export default {
         color: ['#769cfc','#19FA60','#FF9733'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
-        yAxis: [{ type: 'value', name: '', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
+        yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
         series: [
           {
             name: '迄今预算',
@@ -910,20 +848,17 @@ export default {
             },
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data2,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data2
           }, {
             name: '今年实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data3,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data3
           }, {
             name: '去年同期实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data4,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data4
           }
         ]
       }
@@ -957,7 +892,7 @@ export default {
         color: ['#769cfc','#19FA60','#FF9733'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
-        yAxis: [{ type: 'value', name: '', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
+        yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
         series: [
           {
             name: '迄今预算',
@@ -968,20 +903,17 @@ export default {
             },
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data2,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data2
           }, {
             name: '今年实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data3,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data3
           },{
             name: '去年同期实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data4,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data4
           }
         ]
       }
@@ -1015,7 +947,7 @@ export default {
         color: ['#769cfc','#19FA60','#FF9733'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
-        yAxis: [{ type: 'value', name: '', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
+        yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
         series: [
           {
             name: '迄今预算',
@@ -1026,20 +958,17 @@ export default {
             },
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data2,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data2
           }, {
             name: '今年实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data3,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data3
           }, {
             name: '去年同期实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data4,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data4
           }
         ]
       }
@@ -1073,7 +1002,7 @@ export default {
         color: ['#769cfc','#19FA60','#FF9733'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
-        yAxis: [{ type: 'value', name: '', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
+        yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }}}],
         series: [
           {
             name: '迄今预算',
@@ -1084,20 +1013,17 @@ export default {
             },
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data2,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data2
           }, {
             name: '今年实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data3,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data3
           }, {
             name: '去年同期实际',
             type: 'bar',
             barWidth: 10,
-            data: chart_data1.data4,
-            emphasis: { label: { show: true, position: 'inside' }}
+            data: chart_data1.data4
           }
         ]
       }