Merge branch 'feature/QueryRepair' into feature/merge_report

# Conflicts:
#	dist/index.html
合并水用量电用量维修页面分支

src/views/report/queryRepair/index.vue

@@ -2,8 +2,8 @@
   <div class="app-container">
     <div class="filter-container">
       <div class="block">
-        <el-date-picker v-model="yearDate" :clearable="false" type="month" placeholder="选择年" />
-        <el-select v-model="type" placeholder="类型" @change="changeType()">
+        <el-date-picker v-model="monthDate" :clearable="false" type="monthrange" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeMonth()" />
+        <el-select v-model="type" placeholder="类型" @change="changeType">
           <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
         </el-select>
       </div>
@@ -11,13 +11,13 @@
 
     <el-row v-if="isChart1" style="position: relative;">
       <p style="position: absolute;top:-12px;left:40%;color:rgb(130, 165, 252);background:rgb(230, 243, 255);border:1px solid rgb(130, 165, 252);padding:10px;border-radius:10px">
-        {{ year }}年集团维修费用：{{ total }}万升
+        集团{{costTypeName}}：{{ total }}万元
       </p>
-       <el-radio-group v-model="radio1" class="group" @change="changeGroup('1')">
-          <el-radio :label="1">集团</el-radio>
-          <el-radio :label="2">一中心</el-radio>
-          <el-radio :label="3">二中心</el-radio>
-          <el-radio :label="4">三中心</el-radio>
+       <el-radio-group v-model="radio1" class="group" @change="changeGroup">
+          <el-radio :label="'集团'">集团</el-radio>
+          <el-radio :label="'一中心'"></el-radio>
+          <el-radio :label="'二中心'"></el-radio>
+          <el-radio :label="'三中心'"></el-radio>
         </el-radio-group>
       <el-col :span="24">
         <div id="chart1" style="width: 100%;height:400px;" />
@@ -25,23 +25,13 @@
     </el-row>
 
     <el-row style="position: relative;">
-       <el-radio-group v-model="radio2" class="group" @change="changeGroup('2')">
-          <el-radio :label="1">集团</el-radio>
-          <el-radio :label="2">一中心</el-radio>
-          <el-radio :label="3">二中心</el-radio>
-          <el-radio :label="4">三中心</el-radio>
-        </el-radio-group>
       <el-col :span="24">
         <div id="chart2" style="width: 100%;height:400px;" />
       </el-col>
     </el-row>
     <el-row style="position: relative;">
       <el-col :span="12">
-        <div style="height: 50px;">
-          <el-select style="float: right;margin-right: 20px;" v-model="getChart4Parm.parammaps.pastureName" multiple :multiple-limit="5" collapse-tags placeholder="牧场" @change="changePasture('4')">
-            <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.name"> </el-option>
-          </el-select>
-        </div>
+        <div style="height: 50px;" />
         <div id="chart4" style="width: 100%;height:400px;" />
       </el-col>
       <el-col :span="12">
@@ -56,49 +46,47 @@
 
     <el-row style="position: relative;">
       <el-col :span="12">
-        <div style="height: 50px;" />
+        <div style="height: 50px;">
+          <el-select style="float: right;margin-right: 20px;" v-model="pastureName" multiple :multiple-limit="5" collapse-tags placeholder="牧场" @change="changePasture()">
+            <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.name"> </el-option>
+          </el-select>
+        </div>
         <div id="chart6" style="width: 100%;height:400px;" />
       </el-col>
       <el-col :span="12">
         <div style="height: 50px;">
-          <el-select style="float: right;margin-right: 20px;" v-model="getChart7Parm.parammaps.pastureName" multiple :multiple-limit="5" collapse-tags placeholder="牧场" @change="changePasture('7')">
-            <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.name"> </el-option>
+          <el-select style="float: right;margin-right: 20px;" v-model="getChart7Parm.parammaps.deptName" placeholder="部门" @change="changeDept('7')">
+            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.name"> </el-option>
           </el-select>
         </div>
         <div id="chart7" style="width: 100%;height:400px;" />
       </el-col>
     </el-row>
-
-    <el-row style="position: relative;">
-      <el-col :span="12">
-        <div id="chart8" style="width: 100%;height:400px;" />
-      </el-col>
-      <el-col :span="12">
-        <div id="chart9" style="width: 100%;height:400px;" />
-      </el-col>
-    </el-row>
   </div>
 
 </template>
 
 <script>
 import echarts from 'echarts'
-import { GetDataByName,GetDataByNames, GetReportform, checkButtons } from '@/api/common'
+import { GetDataByName,GetDataByNames, GetReportform, checkButtons,getJson } from '@/api/common'
 import Cookies from 'js-cookie'
 import { parseTime } from '@/utils/index.js'
 export default {
-  name: 'QueryCombustion',
+  name: 'QueryWater',
   data() {
     return {
-      yearDate: new Date(),
+      monthDate: [new Date(),new Date()],
+      costTypeName:'所有维修费',
+      type:'',
       year: new Date().getFullYear(),
       month: new Date().getMonth() < 9 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1,
-      type:0,
-      typeList:[{id:0,name:'全部费用'},{id:1,name:'制造费用'},{id:2,name:'直接费用'},{id:3,name:'管理费用'}],
       pastureList:[],
-      deptList:[],
+      deptList:[{id:0,name:'挤奶处'},{id:1,name:'犊牛处'},{id:2,name:'办公室'},{id:3,name:'饲养处'},{id:4,name:'兽医处'},{id:5,name:'品控处'},{id:6,name:'设备处'}],
+      // typeList:[{id:0,name:'全部费用'},{id:1,name:'制造费用'},{id:2,name:'直接费用'},{id:3,name:'管理费用'}],
+      typeList: [{ id: '', name: '全部费用' }, { id: '挤奶处', name: '直接费用' }, { id: '牧场办公室', name: '管理费用' }, { id: 1, name: '制造费用' }],
       total: '',
-      radio1:1,
+      radio1:'集团',
+      pastureName:'',
       isChart1: [],
       chart_data1: {},
       getChart1Parm: {
@@ -108,7 +96,6 @@ export default {
           pastureName: Cookies.get('pasturename')
         }
       },
-      radio2:1,
       isChart2: [],
       chart_data2: {},
       getChart2Parm: {
@@ -119,7 +106,6 @@ export default {
         }
       },
 
-      radio3:1,
       isChart3: [],
       chart_data3: {},
       getChart3Parm: {
@@ -137,7 +123,7 @@ export default {
         name: 'getpSumNowWater',
         parammaps: {
           receiveTime: new Date().getFullYear(),
-          pastureName: Cookies.get('pasturename')
+          pastureName: ''
         }
       },
 
@@ -167,7 +153,8 @@ export default {
         name: 'getpSumNowWater',
         parammaps: {
           receiveTime: new Date().getFullYear(),
-          pastureName: Cookies.get('pasturename')
+          pastureName: Cookies.get('pasturename'),
+          deptName:''
         }
       },
       isChart8: [],
@@ -179,27 +166,12 @@ export default {
           pastureName: Cookies.get('pasturename')
         }
       },
-      isChart9: [],
-      chart_data9: {},
-      getChart9Parm: {
-        name: 'getpSumNowWater',
-        parammaps: {
-          receiveTime: new Date().getFullYear(),
-          pastureName: Cookies.get('pasturename')
-        }
-      },
     }
   },
   created() {
     this.get_select_list()
     this.getChart1()
     this.getChart2()
-    this.getChart4()
-    this.getChart5()
-    this.getChart6()
-    this.getChart7()
-    this.getChart8()
-    this.getChart9()
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
@@ -211,33 +183,52 @@ export default {
   methods: {
     get_select_list() {
       var send_data =  [
-        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
+        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': 18 }},
       ]
+      this.pastureList = []
       GetDataByNames(send_data).then(response => {
-        this.pastureList = response.data.findAllPasture.list
+        response.data.findAllPasture.list.forEach((item)=>{
+          if(item.name !== '现代牧业'){
+            this.pastureList.push(item)
+          }
+        })
       })
     },
-    changeGroup(item){
-      if(item == 1){
-        this.getChart1()
-      }else if(item == 2){
-        this.getChart2()
+    changeType(item){
+      console.log(item)
+      if (item == '挤奶处') {
+        this.costTypeName = '直接维修费'
+      } else if (item == '牧场办公室') {
+        this.costTypeName = '管理维修费'
+      } else if (item == 1) {
+        this.costTypeName = '制造维修费'
+      } else if (item == '') {
+        this.costTypeName = '所有维修费'
+        this.type = ''
+      } else {
+        this.costTypeName = '所有维修费'
       }
+      this.getChart1()
     },
-    changePasture(item){
-      if(item == 4){
-        this.getChart4()
-      }else if(item == 7){
-        this.getChart7()
-      }
+    changeGroup(){
+      this.getChart1()
+      this.getChart2()
+      this.getChart4()
+    },
+    changeMonth(){
+      this.getChart1()
+      this.getChart2()
+    },
+    changePasture(){
+      // this.getChart4()
+      this.getChart6()
     },
     changeDept(item){
       if(item == 5){
         this.getChart5()
+      }else if(item == 7){
+        this.getChart7()
       }
-    },
-    changeType(){
-
     },
     get_auto_buttons() {
       // 图1
@@ -245,37 +236,66 @@ export default {
       const isChart1 = checkButtons(this.$store.state.user.buttons, chart1)
       this.isChart1 = isChart1
     },
-    // 各牧场年度用水量对比
+    // 各牧场维修费用对比
     getChart1() {
-      GetReportform(this.getChart1Parm).then(response => {
+      let url = '/authdata/repair/nowelectricity?'
+      let startTime = parseTime(this.monthDate[0],'{y}-{m}')
+      let endTime = parseTime(this.monthDate[1],'{y}-{m}')
+      let radio = ''
+      if(this.radio1 == '集团'){
+        radio = ''
+      }else{
+        radio = this.radio1
+      }
+      let data = 'startTime=' + startTime
+                + '&endTime=' + endTime
+                + '&center=' + radio
+                + '&departmentName=' + this.type
+      getJson(url,data).then(response => {
         console.log('图1', response)
-        // this.chart_data1 = response.data.chart_data
-        this.chart_data1 = {
-          data1:[10,20,30,40,50],
-          data2:[20,30,40,50,60],
-          xdata:["马鞍山牧场", "汶上牧场", "商河牧场", "合肥牧场", "蚌埠牧场"]
+        if(response.data){
+          this.chart_data1.data1 = response.data.nowYear
+          this.chart_data1.data2 = response.data.lastYear
+          this.chart_data1.xdata = response.data.pasture
+          this.pastureName = [response.data.pasture[0]]
+          this.total = response.data.all
+        }else{
+          this.chart_data1.data1 = []
+          this.chart_data1.data2 = []
+          this.chart_data1.xdata = []
+          this.total = 0
         }
         this.roadChart1(this.chart_data1)
-        var nowYear = response.data.chart_data.nowYear
-        var total = 0
-        if (nowYear !== null || nowYear !== undefined) {
-          nowYear.forEach(function(item, index) {
-            total = total + parseFloat(item)
-          })
-        }
-        this.total = total.toFixed(2)
+        this.getChart4()
+        this.getChart6()
       })
     },
     // 单头牛维修费用
     getChart2() {
-      GetReportform(this.getChart2Parm).then(response => {
+      let url = '/authdata/repair/singlecow?'
+      let startTime = parseTime(this.monthDate[0],'{y}-{m}')
+      let endTime = parseTime(this.monthDate[1],'{y}-{m}')
+      let radio = ''
+      if(this.radio1 == '集团'){
+        radio = ''
+      }else{
+        radio = this.radio1
+      }
+      let data = 'startTime=' + startTime
+                + '&endTime=' + endTime
+                + '&center=' + radio
+      getJson(url,data).then(response => {
         console.log('图2', response)
-        // this.chart_data2 = response.data.chart_data
-        this.chart_data2 = {
-          data1:[10,20,30,40,50],
-          data2:[20,30,40,50,60],
-          data3:[30,40,50,60,70],
-          xdata:["马鞍山牧场", "汶上牧场", "商河牧场", "合肥牧场", "蚌埠牧场"]
+        if(response.data){
+          this.chart_data2.data1 = response.data.nowYear
+          this.chart_data2.data2 = response.data.lastYear
+          this.chart_data2.xdata = response.data.pasture
+          this.chart_data2.line = response.data.line
+        }else{
+          this.chart_data2.data1 = []
+          this.chart_data2.data2 = []
+          this.chart_data2.xdata = []
+          this.chart_data2.line = 0
         }
         this.roadChart2(this.chart_data2)
       })
@@ -283,119 +303,213 @@ export default {
 
 
 
-    // XX牧场XX年每月单头牛用水量对比
+    // XX牧场每月维修费对比
     getChart4() {
-      GetReportform(this.getChart4Parm).then(response => {
+      let startTime = parseTime(this.monthDate[0],'{y}-{m}') + '-01'
+      let date = this.monthDate[1];
+      let year = date.getFullYear()
+      let month = date.getMonth() + 1
+      let lastDay = new Date(year, month, 0).getDate();
+      let endTime = parseTime(this.monthDate[1],'{y}-{m}') + '-' + lastDay
+      let data = {
+        name:"getPastureSumMonth",
+        parammaps:{
+          startTime:startTime,
+          endTime:endTime,
+          pastureName:this.pastureName.toString(),
+          departmentName:this.type
+        },
+      }
+      GetReportform(data).then(response => {
         console.log('图4', response)
-        // this.chart_data4 = response.data.chart_data
-        this.chart_data4 = {
-          data1:[
-            {data:[10,20,30,40,50]},
-            {data:[20,30,40,50,60]},
-            {data:[30,40,50,60,70]},
-          ],
-          data_name:["马鞍山牧场", "汶上牧场", "商河牧场"],
-          xdata:["2023-01", "2023-02", "2023-03", "2023-04", "2023-05"]
+        if(response.data){
+          this.chart_data4 = {
+            data1:response.data.chart_data.lastYear,
+            data2:response.data.chart_data.nowYear,
+            data3:response.data.chart_data.monthBudgetList,
+            xdata:response.data.chart_data.months,
+            data_name:['去年同期用量','今年用量','预算']
+          }
+        }else{
+          this.chart_data4 = {
+            data1:[],
+            data2:[],
+            data3:[],
+            xdata:[],
+            data_name:['去年同期用量','今年用量','预算']
+          }
+        }
+        if(response.data.chart_data.months){
+          this.getChart5Parm.parammaps.date = response.data.chart_data.months[0]
+        }else{
+          this.getChart5Parm.parammaps.date = ''
         }
+        this.getChart5Parm.parammaps.deptName = this.deptList[0].name
         this.roadChart4(this.chart_data4)
+        this.getChart5()
       })
     },
-
     // XX月部门统计
     getChart5() {
-      GetReportform(this.getChart5Parm).then(response => {
+      let startTime = parseTime(this.getChart5Parm.parammaps.date,'{y}-{m}') + '-01'
+      let date =  new Date(this.getChart5Parm.parammaps.date);
+      let year = date.getFullYear()
+      let month = date.getMonth() + 1
+      let lastDay = new Date(year, month, 0).getDate();
+      let endTime = parseTime(this.getChart5Parm.parammaps.date,'{y}-{m}') + '-' + lastDay
+      let data = {
+        name:"geteqclassSumMonth",
+        parammaps:{
+          startTime:startTime,
+          endTime:endTime,
+          pastureName:this.pastureName.toString(),
+          deptName:this.getChart5Parm.parammaps.deptName,
+        },
+      }
+      GetReportform(data).then(response => {
         console.log('图5', response)
-        // this.chart_data5 = response.data.chart_data
-        this.chart_data5 = {
-          data1:[10,20,30,40,50],
-          data2:[20,30,40,50,60],
-          xdata:["马鞍山牧场挤奶处", "和林牧场挤奶处", "蚌埠牧场挤奶处", "塞一牧场挤奶处", "塞二牧场挤奶处"]
+        if(response.data.chart_data){
+          this.chart_data5 = {
+            data1:response.data.chart_data.eqCost,
+            xdata:response.data.chart_data.typeName
+          }
+        }else{
+          this.chart_data5 = {
+            data1:[],
+            xdata:[]
+          }
         }
         this.roadChart5(this.chart_data5)
       })
     },
-    // XX牧场XX年每月用水量对比
+    // XX牧场XX年每月用电量对比
     getChart6() {
-      GetReportform(this.getChart6Parm).then(response => {
-        console.log('图6', response)
-        // this.chart_data6 = response.data.chart_data
-        this.chart_data6 = {
-          data1:[10,20,30,40,50],
-          data2:[20,30,40,50,60],
-          data3:[30,40,50,60,70],
-          xdata:["2023-01", "2023-02", "2023-03", "2023-04", "2023-05"]
+      let url = '/authdata/repair/perhead?'
+      let startTime = parseTime(this.monthDate[0],'{y}-{m}')
+      let endTime = parseTime(this.monthDate[1],'{y}-{m}')
+      let radio = ''
+      if(this.radio1 == '集团'){
+        radio = ''
+      }else{
+        radio = this.radio1
+      }
+      let pastureId = []
+      this.pastureList.forEach((item)=>{
+        if(this.pastureName){
+          this.pastureName.forEach((item1)=>{
+            if(item.name == item1){
+              pastureId.push(item.id)
+            }
+          })
+        }
+      })
+      let data = 'startTime=' + startTime
+                + '&endTime=' + endTime
+                + '&center=' + radio
+                + '&pastureId=' + pastureId.toString()
+      getJson(url,data).then(response => {
+        console.log('图4', response)
+        if(response.data){
+          this.chart_data6.data1 = response.data.data3
+          this.chart_data6.data_name = ['去年同期','今年用量','预算']
+          this.chart_data6.xdata = response.data.data2
+        }else{
+          this.chart_data6.data1 = []
+          this.chart_data6.data_name = ['去年同期','今年用量','预算']
+          this.chart_data6.xdata = []
+          this.chart_data6.line =0
+        }
+        if(response.data.data1 == null){
+          this.chart_data6.data_name = []
+        }
+        if(response.data.data2 == null ){
+          this.chart_data6.xdata = []
+          this.getChart7Parm.parammaps.date = ''
+        }else{
+          this.getChart7Parm.parammaps.date = response.data.data2[0]
         }
+        if(response.data.data3 == null){
+          this.chart_data6.data1 = []
+        }
+
+        console.log(this.chart_data6,'chart_data6')
         this.roadChart6(this.chart_data6)
+        this.getChart7Parm.parammaps.deptName = this.deptList[0].name
+        this.getChart7()
       })
     },
-    // XX月每日用水量
+    // XX月部门统计
     getChart7() {
-      GetReportform(this.getChart7Parm).then(response => {
+      let startTime = parseTime(this.getChart7Parm.parammaps.date,'{y}-{m}') + '-01'
+      let date =  new Date(this.getChart7Parm.parammaps.date);
+      let year = date.getFullYear()
+      let month = date.getMonth() + 1
+      let lastDay = new Date(year, month, 0).getDate();
+      let endTime = parseTime(this.getChart7Parm.parammaps.date,'{y}-{m}') + '-' + lastDay
+      let data = {
+        name:"getdeptSumMonth",
+        parammaps:{
+          startTime:startTime,
+          endTime:endTime,
+          pastureName:this.pastureName.toString(),
+          departmentName:this.getChart7Parm.parammaps.deptName
+        },
+      }
+      GetDataByName(data).then(response => {
         console.log('图7', response)
         // this.chart_data7 = response.data.chart_data
-        this.chart_data7 = {
-          data1:[
-            {data:[10,20,30,40,50]},
-            {data:[20,30,40,50,60]},
-            {data:[30,40,50,60,70]},
-          ],
-          data_name:["马鞍山牧场", "汶上牧场", "商河牧场"],
-          xdata:["2023-01", "2023-02", "2023-03", "2023-04", "2023-05"]
+        if(response.data){
+          var data1 = []
+          var data2 = []
+          var xdata = []
+          response.data.list.forEach((item)=>{
+            data1.push(item.value)
+            data2.push(item.monthBudget)
+            xdata.push(item.name)
+          })
+          this.chart_data7 = {
+            data1:data1,
+            data2:data2,
+            xdata:xdata
+          }
+        }else{
+          this.chart_data7 = {
+            data1:[],
+            data2:[],
+            xdata:[]
+          }
         }
         this.roadChart7(this.chart_data7)
       })
     },
-    // XX月部门统计
-    getChart8() {
-      GetReportform(this.getChart8Parm).then(response => {
-        console.log('图8', response)
-        this.chart_data8 = {
-          data1:[10,20,30,40,50],
-          data2:[20,30,40,50,60],
-          xdata:["马鞍山牧场挤奶处", "和林牧场挤奶处", "蚌埠牧场挤奶处", "塞一牧场挤奶处", "塞二牧场挤奶处"]
-        }
-        this.roadChart8(this.chart_data8)
-      })
-    },
-    // XX部门用X统计
-    getChart9() {
-      GetReportform(this.getChart9Parm).then(response => {
-        console.log('图9', response)
-        this.chart_data9 = {
-          data1:[10,20,30,40,50],
-          data2:[20,30,40,50,60],
-          xdata:["马鞍山牧场挤奶处", "和林牧场挤奶处", "蚌埠牧场挤奶处", "塞一牧场挤奶处", "塞二牧场挤奶处"]
-        }
-        this.roadChart9(this.chart_data9)
-      })
-    },
-    // 各牧场年度柴油量对比
+
+    // 各牧场维修费用对比
     roadChart1(chart_data) {
       if (this.chart1 != null) {
         this.chart1.dispose()
       }
       this.chart1 = echarts.init(document.getElementById('chart1'))
       var option = {
-        title: { text: '各牧场年度柴油量对比', textStyle: { color: '#769cfc' }},
+        title: { text: '各牧场维修费用对比', textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['今年用量', '去年同期'],
+          data: ['实际费用', '预算'],
           right: 40
         },
-        color: ['#2dc0e8', '#769cfc'],
+        color: ['#61A5E8', '#9933FF'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category',  name: '牧场',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value', name: '升', axisLabel: { formatter: '{value}万' }}],
+        yAxis: [{ type: 'value', name: '费用(元)', axisLabel: { formatter: '{value}万' }}],
         series: [
           {
-            name: '今年用量',
+            name: '实际费用',
             type: 'bar',
             data: chart_data.data1,
             barMaxWidth:20,
             emphasis: { label: { show: true, position: 'inside' }}
           },
           {
-            name: '去年同期',
+            name: '预算',
             type: 'bar',
             barMaxWidth:20,
             data: chart_data.data2,
@@ -409,8 +523,11 @@ export default {
         this.chart1.resize()
       }
       var that = this
-      this.chart1.on('click', function(param, i) {
-        console.log(param)
+      that.chart1.on('click', function(param, i) {
+        console.log(param,'=====param')
+        that.pastureName = [param.name]
+        that.getChart4()
+        that.getChart6()
       })
     },
     // 单头牛维修费用
@@ -423,13 +540,13 @@ export default {
         title: { text: '单头牛维修费用', left:'center',textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['实际费用','预算', '去年同期'],
+          data: ['实际费用', '预算'],
           right: 40
         },
-        color: ['#2dc0e8', '#769cfc', '#FFB800'],
+        color:  ['#61A5E8', '#9933FF','#FFB800'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category',  name: '牧场',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value', name: '价格(元)'}],
+        yAxis: [{ type: 'value', name: '费用(元)'}],
         series: [
           {
             name: '实际费用',
@@ -437,7 +554,12 @@ export default {
             data: chart_data.data1,
             emphasis: { label: { show: true, position: 'inside' }},
             barMaxWidth:20,
-            markLine:{ data:[ {yAxis:20} ] }
+            markLine:{
+              data:[ {yAxis:chart_data.line} ],
+              lineStyle: {
+                  color: '#FFB800'
+              }
+            }
           },
           {
             name: '预算',
@@ -445,13 +567,6 @@ export default {
             data: chart_data.data2,
             emphasis: { label: { show: true, position: 'inside' }},
             barMaxWidth:20
-          },
-          {
-            name: '去年同期',
-            type: 'bar',
-            data: chart_data.data3,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
           }
 
         ]
@@ -465,13 +580,14 @@ export default {
         console.log(param)
       })
     },
-    // 各牧场XX年每月单头牛用水量对比
+    // XX牧场每月维修费对比
     roadChart4(chart_data) {
+      console.log(chart_data,'666')
       if (this.chart4 != null) {
         this.chart4.dispose()
       }
       this.chart4 = echarts.init(document.getElementById('chart4'))
-      var text = '各牧场' + parseTime(this.yearDate, '{y}') + '年每月单头牛用水量对比'
+      var text = this.pastureName +'每月维修费对比'
       var option = {
         title: { text: text, left:'left',textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
@@ -480,24 +596,24 @@ export default {
           left: 40,
           bottom:0
         },
-        color: ['#2dc0e8', '#769cfc', '#FFB800'],
+        color: ['#2dc0e8', '#7ECF51', '#FFB800'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category',  name: '月份',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value', name: 'm³'}],
-        series: (function() {
-          var serie = []
-          if(chart_data.data1 !== null){
-            for (var i = 0; i < chart_data.data1.length; i++) {
-              var item = {
-                name: chart_data.data_name[i],
-                type: 'line',
-                data: chart_data.data1[i].data
-              }
-              serie.push(item)
-            }
-          }
-          return serie
-        }())
+        yAxis: [{ type: 'value', name: '费用(元)'}],
+        series: [{
+          name: '去年同期用量',
+          type: 'line',
+          data: chart_data.data1[0]
+        },
+        {
+          name: '今年用量',
+          type: 'line',
+          data: chart_data.data2[0]
+        },{
+          name: '预算',
+          type: 'line',
+          data: chart_data.data3[0]
+        }]
       }
       this.chart4.setOption(option)
       window.onresize = function() {
@@ -506,43 +622,35 @@ export default {
       var that = this
       that.chart4.on('click', function(param, i) {
         console.log(param)
+        that.getChart5Parm.parammaps.date = param.name
         that.getChart5()
       })
     },
-    // XX月部门统计
+    // XX牧场xx部门维修费用
     roadChart5(chart_data) {
       if (this.chart5 != null) {
         this.chart5.dispose()
       }
       this.chart5 = echarts.init(document.getElementById('chart5'))
-      var text = parseTime(new Date(), '{m}') + '月部门统计'
+      var text = this.pastureName + this.getChart5Parm.parammaps.deptName + '维修费用'
       var option = {
         title: { text: text, left:'center',textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['实际', '预算'],
           right: 40,
           bottom:0
         },
         color: ['#2dc0e8', '#769cfc'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
-        xAxis: [{ type: 'category',  name: '部门',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value',name: '吨', axisLabel: { formatter:'{value} 万'}}],
+        xAxis: [{ type: 'category',  name: '设备',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
+        yAxis: [{ type: 'value',name: '费用(元)', axisLabel: { formatter:'{value} 万'}}],
         series: [
           {
-            name: '实际',
             type: 'bar',
             data: chart_data.data1,
             emphasis: { label: { show: true, position: 'inside' }},
             barMaxWidth:20
           },
-          {
-            name: '预算',
-            type: 'bar',
-            data: chart_data.data2,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
-          }
         ]
       }
       this.chart5.setOption(option)
@@ -554,76 +662,25 @@ export default {
         console.log(param)
       })
     },
-    // XX牧场XX年每月用水量对比
+    // 牧场每月单头牛维修费对比
     roadChart6(chart_data) {
       if (this.chart6 != null) {
         this.chart6.dispose()
       }
       this.chart6 = echarts.init(document.getElementById('chart6'))
+      var text = '牧场每月单头牛维修费对比'
       var option = {
-        title: { text: 'XX牧场XX年每月用水量对比', left:'center',textStyle: { color: '#769cfc' }},
+        title: { text: text, left:'center',textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['去年同期用量', '今年用量','预算'],
+          data: chart_data.data_name,
           right: 40,
           bottom:0
         },
         color: ['#2dc0e8', '#769cfc', '#FFB800'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category',  name: '月份',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value',name: '水量(m³)'}],
-        series: [
-          {
-            name: '去年同期用量',
-            type: 'line',
-            data: chart_data.data1,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
-          },
-          {
-            name: '今年用量',
-            type: 'line',
-            data: chart_data.data2,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
-          },
-          {
-            name: '预算',
-            type: 'line',
-            data: chart_data.data3,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
-          }
-        ]
-      }
-      this.chart6.setOption(option)
-      window.onresize = function() {
-        this.chart6.resize()
-      }
-      var that = this
-      this.chart6.on('click', function(param, i) {
-        console.log(param)
-      })
-    },
-    // XX月每日用水量
-    roadChart7(chart_data) {
-      if (this.chart7 != null) {
-        this.chart7.dispose()
-      }
-      this.chart7 = echarts.init(document.getElementById('chart7'))
-      var text = parseTime(new Date(), '{m}') + '月每日用水量'
-      var option = {
-        title: { text: text, left:'left',textStyle: { color: '#769cfc' }},
-        tooltip: { trigger: 'axis' },
-        legend: {
-          data: chart_data.data_name,
-          left: 40,
-          bottom:0
-        },
-        color: ['#2dc0e8', '#769cfc', '#FFB800'],
-        grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
-        xAxis: [{ type: 'category',  name: '日',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value', name: '水量(m³)'}],
+        yAxis: [{ type: 'value',name: '费用(元)'}],
         series: (function() {
           var serie = []
           if(chart_data.data1 !== null){
@@ -631,7 +688,7 @@ export default {
               var item = {
                 name: chart_data.data_name[i],
                 type: 'line',
-                data: chart_data.data1[i].data
+                data: chart_data.data1[i]
               }
               serie.push(item)
             }
@@ -639,79 +696,37 @@ export default {
           return serie
         }())
       }
-      this.chart7.setOption(option)
+      this.chart6.setOption(option)
       window.onresize = function() {
-        this.chart7.resize()
+        this.chart6.resize()
       }
       var that = this
-      this.chart7.on('click', function(param, i) {
+      this.chart6.on('click', function(param, i) {
         console.log(param)
+        that.getChart7Parm.parammaps.date = param.name
+        that.getChart7()
       })
     },
     // XX月部门统计
-    roadChart8(chart_data) {
-      if (this.chart8 != null) {
-        this.chart8.dispose()
-      }
-      this.chart8 = echarts.init(document.getElementById('chart8'))
-      var text = parseTime(new Date(), '{m}') + '月部门统计'
-      var option = {
-        title: { text: text, left:'center',textStyle: { color: '#769cfc' }},
-        tooltip: { trigger: 'axis' },
-        legend: {
-          data: ['实际', '预算'],
-          right: 40,
-          bottom:0
-        },
-        color: ['#2dc0e8', '#769cfc'],
-        grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
-        xAxis: [{ type: 'category',  name: '部门',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value',name: '', axisLabel: { formatter:'{value} 万'}}],
-        series: [
-          {
-            name: '实际',
-            type: 'bar',
-            data: chart_data.data1,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
-          },
-          {
-            name: '预算',
-            type: 'bar',
-            data: chart_data.data2,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
-          }
-        ]
-      }
-      this.chart8.setOption(option)
-      window.onresize = function() {
-        this.chart8.resize()
-      }
-      var that = this
-      this.chart8.on('click', function(param, i) {
-        console.log(param)
-      })
-    },
-    // XX部门用X量
-    roadChart9(chart_data) {
-      if (this.chart9 != null) {
-        this.chart9.dispose()
+    roadChart7(chart_data) {
+      console.log(chart_data,'chart_data')
+      if (this.chart7 != null) {
+        this.chart7.dispose()
       }
-      this.chart9 = echarts.init(document.getElementById('chart9'))
-      var text = 'XX部门用X量'
+      this.chart7 = echarts.init(document.getElementById('chart7'))
+      var text = this.getChart7Parm.parammaps.date + '月部门统计'
       var option = {
-        title: { text: text, left:'center',textStyle: { color: '#769cfc' }},
+        title: { text: text, left:'left',textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['实际', '预算'],
-          right: 40,
+          data: ['实际','预算'],
+          left: 40,
           bottom:0
         },
-        color: ['#2dc0e8', '#769cfc'],
+        // color: ['#2dc0e8', '#769cfc', '#FFB800'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category',  name: '部门',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value',name: '吨', axisLabel: { formatter:'{value} 万'}}],
+        yAxis: [{ type: 'value', name: '费用(元)'}],
         series: [
           {
             name: '实际',
@@ -729,12 +744,12 @@ export default {
           }
         ]
       }
-      this.chart9.setOption(option)
+      this.chart7.setOption(option)
       window.onresize = function() {
-        this.chart9.resize()
+        this.chart7.resize()
       }
       var that = this
-      this.chart9.on('click', function(param, i) {
+      this.chart7.on('click', function(param, i) {
         console.log(param)
       })
     },

src/views/report/queryWater/index.vue

@@ -579,7 +579,7 @@ export default {
             markLine:{
               data:[ {yAxis:chart_data.line} ],
               lineStyle: {
-                  color: '#FFB800'
+                color: '#FFB800'
               }
             }
           },