更新

src/views/dashboard/index.vue

@@ -6,13 +6,13 @@
           <div class="accuracy_t">
             <div class="accuracy_t_l">
               <h4><span class="title"></span>准确性分析</h4>
-              <el-select v-model="accuracy.value1" style="width:100px;margin-right: 5px;" class="filter-item" @change="changecattle('1')">
+              <el-select v-model="accuracy.value1" style="width:150px;margin-right: 5px;" class="filter-item" @change="changecattle('1')">
                 <el-option v-for="item in accuracy.cattleTpyeList" :key="item.value" :label="item.label"
                   :value="item.value"> </el-option>
-              </el-select>
-              <el-select v-model="accuracy.value2" style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('1')">
-                <el-option v-for="item in accuracy.formulaList" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
+              </el-select>
+              <el-select v-model="accuracy.value2" style="width:150px;margin-right: 5px;" class="filter-item" @change="changeformula('1')">
+                <el-option v-for="item in accuracy.formulaList" :key="item.value" :label="item.label"
+                  :value="item.value"> </el-option>
               </el-select>
               <el-date-picker v-model="accuracy.inputDatetime" :clearable="false" class="inputDatetime filter-item"
                 type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
@@ -59,11 +59,12 @@
             <div v-else>
               <el-table style="width: 100%" :max-height="320" :row-style="rowStyle" :cell-style="cellStyle" border
                 :data="accuracy.chart1.tableDataList1">
-                <template v-for="item in accuracy.chart1.tableTitleList1">
+                <template v-for="(item,key) in accuracy.chart1.tableTitleList1">
                   <template>
                     <el-table-column min-width="30" :key="item.value" :label="item.value" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row[item.name] }}</span>
+                      <template slot-scope="scope">
+                        <span v-if="key == 0">{{ scope.row[item.name] }}</span>
+                        <span v-else>{{ scope.row[item.name] }}%</span>
                       </template>
                     </el-table-column>
                   </template>
@@ -78,11 +79,11 @@
           <div class="time_t">
             <div class="time_t_l">
               <h4><span class="title"></span>执行时间</h4>
-              <el-select v-model="time.value1" style="width:100px;margin-right: 5px;" class="filter-item" @change="changecattle('2')">
+              <el-select v-model="time.value1" style="width:150px;margin-right: 5px;" class="filter-item" @change="changecattle('2')">
                 <el-option v-for="item in time.cattleTpyeList" :key="item.value" :label="item.label"
                   :value="item.value"> </el-option>
               </el-select>
-              <el-select v-model="time.value2" style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('2')">
+              <el-select v-model="time.value2" style="width:150px;margin-right: 5px;" class="filter-item" @change="changeformula('2')">
                 <el-option v-for="item in time.formulaList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -104,21 +105,21 @@
               <el-table-column label="类型" min-width="80px" align="center">
                 <el-table-column label="牧场" min-width="80px" align="center" prop="title" />
               </el-table-column>
-              <el-table-column label="加料时间" min-width="80px" align="center">
+              <el-table-column label="加料时间(分钟)" min-width="80px" align="center">
                 <el-table-column label="最大值" min-width="80px" align="center" prop="add_feed_time_max_value" />
                 <el-table-column label="上四分位数" min-width="80px" align="center" prop="add_feed_time_up_middle_value" />
                 <el-table-column label="中位数" min-width="80px" align="center" prop="add_feed_time_middle_value" />
                 <el-table-column label="下四分位数" min-width="80px" align="center" prop="add_feed_time_down_middle_value" />
                 <el-table-column label="最小值" min-width="80px" align="center" prop="add_feed_time_min_value" />
               </el-table-column>
-              <el-table-column label="搅拌延时" min-width="80px" align="center">
+              <el-table-column label="搅拌延时(分钟)" min-width="80px" align="center">
                 <el-table-column label="最大值" min-width="80px" align="center" prop="stir_time_max_value" />
                 <el-table-column label="上四分位数" min-width="80px" align="center" prop="stir_time_up_middle_value" />
                 <el-table-column label="中位数" min-width="80px" align="center" prop="stir_time_middle_value" />
                 <el-table-column label="下四分位数" min-width="80px" align="center" prop="stir_time_down_middle_value" />
                 <el-table-column label="最小值" min-width="80px" align="center" prop="stir_time_min_value" />
               </el-table-column>
-              <el-table-column label="撒料时间" min-width="80px" align="center">
+              <el-table-column label="撒料时间(分钟)" min-width="80px" align="center">
                 <el-table-column label="最大值" min-width="80px" align="center" prop="sprinkle_time_max_value" />
                 <el-table-column label="上四分位数" min-width="80px" align="center" prop="sprinkle_time_up_middle_value" />
                 <el-table-column label="中位数" min-width="80px" align="center" prop="sprinkle_time_middle_value" />
@@ -139,16 +140,15 @@
                 <span class="title"></span>
                 撒料时间统计分析
                 <el-tooltip class="item" effect="dark" placement="top-start">
-                  <div slot="content">
-                    按时间段统计各牧场配方的每个班次之间<br />
-                    的撒料间隔时间波动，切换图表可查看各<br />
-                    班次撒料时间，在波动时间外的异常撒料<br />
-                    时间数据标红显示
+                  <div slot="content">
+                    按时间段统计各牧场配方的撒料正常次数和异常次数，<br />
+                    切换图表可查看详细数据
+
                   </div>
                   <span class="el-icon-question"></span>
                 </el-tooltip>
               </h4>
-              <el-select v-model="abnormal.value2" style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('3')">
+              <el-select v-model="abnormal.value2" style="width:150px;margin-right: 5px;" class="filter-item" @change="changeformula('3')">
                 <el-option v-for="item in abnormal.formulaList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -165,15 +165,15 @@
             <div id="chartLine3" v-loading="abnormal.chart1.listLoading" style="height:420px;" />
           </div>
           <div v-else style="margin: 10px 10px;">
-            <el-select v-model="abnormal.value3" style="width:100px;margin-right: 5px;margin-bottom:10px;" class="filter-item" @change="changepasture('3')">
+            <el-select v-model="abnormal.value3" style="width:150px;margin-right: 5px;margin-bottom:10px;" class="filter-item" @change="changepasture('3')">
               <el-option v-for="item in abnormal.pastureList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
-            <el-select v-model="abnormal.value4" style="width:100px;margin-right: 5px;margin-bottom:10px;" class="filter-item" @change="changestate('3')">
+            <el-select v-model="abnormal.value4" style="width:150px;margin-right: 5px;margin-bottom:10px;" class="filter-item" @change="changestate('3')">
               <el-option v-for="item in abnormal.stateList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
             <span style="float: right;">共{{abnormal.chart1.tableDataList1.length}}次</span>
-            <el-table :data="abnormal.chart1.tableDataList1" border style="width: 100%;" :max-height="410"
+            <el-table :data="abnormal.chart1.tableDataList1" border style="width: 100%;" :max-height="310"
               :row-style="rowStyle" :cell-style="cellStyle" class="elTable">
               <el-table-column label="牧场" min-width="130px" align="center" prop="pasture_name" />
               <el-table-column label="栏舍" min-width="130px" align="center" prop="barn_name" />
@@ -213,7 +213,7 @@
             element-loading-text="给我一点时间" :data="accuracy.seeRanking.list" border fit highlight-current-row
             style="width: 100%;" :row-style="rowStyle" :cell-style="cellStyle" class="elTable">
             <el-table-column type="selection" align="center" width="50" />
-            <el-table-column label="排名" min-width="130px" align="center" prop="rank" />
+            <el-table-column label="排名" min-width="130px" align="center"  type="index"/>
             <el-table-column label="牧场名称" min-width="130px" align="center" prop="pasture_name" />
             <el-table-column label="准确率" min-width="130px" align="center" prop="ratio" />
           </el-table>
@@ -222,7 +222,7 @@
           <el-button v-if="accuracy.dialogStatus == 'more'" class="cancelClose cancelClose"
             @click="accuracy.dialogFormVisible = false; ">关闭</el-button>
           <el-button v-else class="cancelClose1"
-            @click="accuracy.dialogFormVisible = false;getFormulaList(); ">关闭</el-button>
+            @click="accuracy.dialogFormVisible = false; ">关闭</el-button>
           <el-button class="save" :disabled="isokDisable" v-if="accuracy.dialogStatus == 'more'"
             @click="createData()">确认</el-button>
         </div>
@@ -332,7 +332,7 @@
           cattleTpyeList: JSON.parse(sessionStorage.downlist).cattle_parent_category,
           formulaList: JSON.parse(sessionStorage.downlist).formula_list,
           pastureList:JSON.parse(sessionStorage.pastureList), //牧场
-          stateList:[{name:'数据状态',id:0},{name:'正常撒料',id:1},{name:'异常撒料',id:2}],
+          stateList:[{label:'数据状态',value:0},{label:'正常撒料',value:1},{label:'异常撒料',value:2}],
           chart1: {
             isChart: true,
             listLoading: false,
@@ -359,60 +359,60 @@
     created() {
       // accuracy.inputDatetime
       this.abnormal.pastureList.unshift({id:0,name:'所有牧场'})
-      this.getTimeFn()
-    },
-    mounted() {
       this.accuracy.value1 = this.accuracy.cattleTpyeList[0].value
       this.time.value1 = this.time.cattleTpyeList[0].value
       this.abnormal.value1 = this.abnormal.cattleTpyeList[0].value
       this.accuracy.value2 = this.accuracy.formulaList[0].value
       this.time.value2 = this.time.formulaList[0].value
-      this.abnormal.value2 = this.abnormal.formulaList[0].value
+      this.abnormal.value2 = this.abnormal.formulaList[0].value
+      this.getTimeFn()
     },
     methods: {
       getTimeFn() {
         const that = this
         const start1 = new Date()
         const end1 = new Date()
-        start1.setTime(start1.getTime() - 3600 * 1000 * 24 * 7)
+        start1.setTime(start1.getTime() - 3600 * 1000 * 24 * 6)
         end1.setTime(end1.getTime() - 3600 * 1000 * 24 * 0)
         that.accuracy.inputDatetime = [start1, end1]
 
-        
+
         const start3 = new Date()
         const end3 = new Date()
-        start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 7)
+        start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 6)
         end3.setTime(end3.getTime() - 3600 * 1000 * 24 * 0)
         that.time.inputDatetime = [start3, end3]
 
         const start2 = new Date()
         const end2 = new Date()
-        start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 31)
-        end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
+        start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 6)
+        end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 0)
         that.abnormal.inputDatetime = [start2, end2]
-        that.getFormulaList()
+        that.getChart1List()
+        that.getChart2List()
+        that.getChart3List()
       },
-      getFormulaList() {
-        let page = 1
-        let page_size = 0
-        let url = '/api/v1/ops/feed_formula/list' + '?page=' + page + '&page_size=' + page_size
-        let data = {}
-        postJson(url, data).then(response => {
-          if (response.code == 200) {
-            this.accuracy.formulaList = response.data.list
-            this.time.formulaList = response.data.list
-            this.abnormal.formulaList = response.data.list
+      // getFormulaList() {
+      //   let page = 1
+      //   let page_size = 0
+      //   let url = '/api/v1/ops/feed_formula/list' + '?page=' + page + '&page_size=' + page_size
+      //   let data = {}
+      //   postJson(url, data).then(response => {
+      //     if (response.code == 200) {
+      //       this.accuracy.formulaList = response.data.list
+      //       this.time.formulaList = response.data.list
+      //       this.abnormal.formulaList = response.data.list
 
-          } else {
-            this.accuracy.formulaList = []
-            this.time.formulaList = []
-            this.abnormal.formulaList = []
-          }
-          this.getChart1List()
-          this.getChart2List()
-          this.getChart3List()
-        })
-      },
+      //     } else {
+      //       this.accuracy.formulaList = []
+      //       this.time.formulaList = []
+      //       this.abnormal.formulaList = []
+      //     }
+      //     this.getChart1List()
+      //     this.getChart2List()
+      //     this.getChart3List()
+      //   })
+      // },
       getChart1List() {
         let url = '/api/v1/ops/dashboard/accuracy'
         let pasture_ids = []
@@ -689,6 +689,7 @@
           'pasture_ids': pasture_ids,
           'feed_formula_id':this.abnormal.value2
         }
+        data.state = this.abnormal.value4
         console.log(this.abnormal.value2,'====000')
         if (this.abnormal.value2 == '') {
           data.feed_formula_id = 0

src/views/statisticalAnalysis/errorAnalysis/index.vue

@@ -1199,7 +1199,8 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+// import echarts from 'echarts'
+import * as echarts from 'echarts'
 import See from './see.vue'
 require('echarts/theme/macarons')
 import { GetDataByName, GetReportform, whichWeek, postJson } from '@/api/common'
@@ -3374,6 +3375,7 @@ export default {
       if (this.tab.chart1.chartLine != null) {
         this.tab.chart1.chartLine.dispose()
       }
+      console.log(echarts.init(document.getElementById('chartLine1')),'=====')
       this.tab.chart1.chartLine = echarts.init(document.getElementById('chartLine1'))
       var option = {
         title: {

src/views/statisticalAnalysis/feedingEfficiency/index.vue

@@ -40,26 +40,26 @@
             :max-height="myHeight"
           >
             <el-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
-            <el-table-column v-if="tab.isHouseName" sortable label="栏舍" min-width="70px" align="center" prop="栏舍" />
+            <el-table-column v-if="tab.isHouseName" sortable label="栏舍" min-width="70px" align="center" prop="bar_name" />
             <el-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isLivestockType" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
-            <el-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
-            <el-table-column sortable label="应混料量（kg）" min-width="60px" align="center" prop="应混料量" />
+            <el-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="actual_number_of_cattle" />
+            <el-table-column sortable label="应混料量（kg）" min-width="60px" align="center" prop="amount_to_be_mixed" />
             <el-table-column sortable label="实际混料量（kg）" min-width="70px" align="center" prop="实际混料量" />
             <el-table-column sortable label="撒料量（kg）" min-width="60px" align="center" prop="撒料量" />
-            <el-table-column sortable label="平均混料时间" min-width="70px" align="center" prop="混料时间" />
-            <el-table-column sortable label="转投剩料量（kg）" min-width="70px" align="center" prop="转投剩料量" />
-            <el-table-column sortable label="今日剩料量（kg）" min-width="70px" align="center" prop="今日剩料量" />
-            <el-table-column sortable label="剩料率（%）" min-width="60px" align="center" prop="剩料率" />
-            <el-table-column sortable label="TMR干物质（%）" min-width="65px" align="center" prop="TMR干物质" />
-            <el-table-column sortable label="配方干物质采食量（kg/头）" min-width="80px" align="center" prop="配方干物质采食量" />
-            <el-table-column sortable label="实际干物质采食量（kg/头）" min-width="80px" align="center" prop="实际干物质采食量" />
-            <el-table-column sortable label="采食率（%）" min-width="60px" align="center" prop="采食率" />
-            <el-table-column sortable label="配方成本(元/头)" min-width="65px" align="center" prop="配方成本" />
-            <el-table-column sortable label="实际成本(元/头)" min-width="65px" align="center" prop="实际成本" />
-            <el-table-column sortable label="产奶量（kg/头）" min-width="65px" align="center" prop="产奶量" />
-            <el-table-column sortable label="饲料转化率(%)" min-width="60px" align="center" prop="饲料转化率" />
-            <el-table-column sortable label="公斤奶饲料成本" min-width="60px" align="center" prop="公斤奶饲料成本" />
+            <el-table-column sortable label="平均混料时间" min-width="70px" align="center" prop="mixing_time" />
+            <el-table-column sortable label="转投剩料量（kg）" min-width="70px" align="center" prop="leftover_material" />
+            <el-table-column sortable label="今日剩料量（kg）" min-width="70px" align="center" prop="today_leftovers" />
+            <el-table-column sortable label="剩料率（%）" min-width="60px" align="center" prop="leftover_rate" />
+            <el-table-column sortable label="TMR干物质（%）" min-width="65px" align="center" prop="tmr_dry_matter" />
+            <el-table-column sortable label="配方干物质采食量（kg/头）" min-width="80px" align="center" prop="formulated_dry_matter_intake" />
+            <el-table-column sortable label="实际干物质采食量（kg/头）" min-width="80px" align="center" prop="actual_dry_matter_intake" />
+            <el-table-column sortable label="采食率（%）" min-width="60px" align="center" prop="food_intake_rate" />
+            <el-table-column sortable label="配方成本(元/头)" min-width="65px" align="center" prop="cost_of_formulation" />
+            <el-table-column sortable label="实际成本(元/头)" min-width="65px" align="center" prop="actual_cost" />
+            <el-table-column sortable label="产奶量（kg/头）" min-width="65px" align="center" prop="milk_yield" />
+            <el-table-column sortable label="饲料转化率(%)" min-width="60px" align="center" prop="feed_conversion_ratio" />
+            <el-table-column sortable label="公斤奶饲料成本" min-width="60px" align="center" prop="feed_costs" />
           </el-table>
           <span v-if="tab.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab.table.total }}条</span>
         </div>

src/views/statisticalAnalysis/processAnalysis/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="search">
       <el-select v-model="table.getdataListParm.parammaps.pastureid" placeholder="牧场" class="filter-item" style="width: 120px;">
-        <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
+        <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
       <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
@@ -514,7 +514,7 @@
 import echarts from 'echarts'
 
 require('echarts/theme/macarons')
-import { GetDataByName,GetDataByNames, GetReportform, formatNum,processAnalysist } from '@/api/common'
+import { GetDataByName,GetDataByNames, GetReportform, formatNum,processAnalysist,postJson } from '@/api/common'
 import Cookies from 'js-cookie'
 import { parseTime } from '@/utils/index.js'
 export default {
@@ -570,7 +570,7 @@ export default {
       },
       cixCategoryParm:{
         name: 'getFeedclassList', offset: 0, pagecount: 0,
-        parammaps: { 'pastureid': Cookies.get('pastureid') }
+        parammaps: { 'pastureid': parseInt(Cookies.get('pastureId'))}
       },
       planTypeList: [{ lable: '预混计划', value: '4' }, { lable: '撒料计划', value: '0' }, { lable: '剩料计划', value: '3' }, { lable: '撒料计划-混料', value: '1' }, { lable: '撒料计划-撒料', value: '2' }, { lable: '预称重计划', value: '5' }], // 计划类型
       workingConditionList: [{ id: '0', name: '进行中' }, { id: '1', name: '已完成' }], // 工作状态
@@ -585,7 +585,7 @@ export default {
           pagecount: '',
           returntype: 'Map',
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
+            pastureid: parseInt(Cookies.get('pastureId')),
             startTime: parseTime(new Date(), '{y}-{m}-{d}'),
             stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
             inputDatetime: [new Date(), new Date()],
@@ -610,7 +610,7 @@ export default {
           pagecount: 1,
           returntype: 'Map',
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
+            pastureid: parseInt(Cookies.get('pastureId')),
             id: ''
           }
         },
@@ -628,7 +628,7 @@ export default {
           pagecount: '',
           returntype: 'Map',
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
+            pastureid: parseInt(Cookies.get('pastureId')),
             id: ''
           }
         },
@@ -646,7 +646,7 @@ export default {
           pagecount: '',
           returntype: 'Map',
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
+            pastureid: parseInt(Cookies.get('pastureId')),
             id: ''
           }
         },
@@ -663,7 +663,7 @@ export default {
           pagecount: '',
           returntype: 'Map',
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
+            pastureid: parseInt(Cookies.get('pastureId')),
             id: ''
           }
         },
@@ -681,13 +681,11 @@ export default {
 
       TMRList:[],
       errorList:[{ value: '有误差', label: '有误差' }, { value: '无误差', label: '无误差' }],
-      requestParams: [
-        { name: 'getPastureListJT', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid'), pasturename: '' }}
-      ],
-      pastureList: [], // 牧场
+
+      pastureList: JSON.parse(sessionStorage.pastureList), //牧场
       downTMR: { name: 'getDownloadedplanTmrName', offset: 0, pagecount: 0,
        parammaps: {
-            pastureid: Cookies.get('pastureid'),
+            pastureid: parseInt(Cookies.get('pastureId')),
             startdate: '',
             enddate: '',
           }
@@ -696,44 +694,95 @@ export default {
   },
   created() {
     this.getCixCategoryList()
-    this.getList()
-    this.getDownLists()
+    this.getList()
   },
   methods: {
-    getDownLists() {
-      GetDataByNames(this.requestParams).then(response => {
-        this.pastureList = response.data.getPastureListJT.list
-        this.table.getdataListParm.parammaps.pastureid = response.data.getPastureListJT.list[0].pastureid
-        this.getList()
-      })
-    },
     change_date(e){
       console.log(e)
       this.getDownList()
     },
 
-    getDownList() {
-      this.downTMR.parammaps.startdate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.downTMR.parammaps.enddate = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      GetDataByName(this.downTMR).then(response => {
-        console.log(response.data.list)
-         this.TMRList = response.data.list
+    getDownList() {
+      let page = 0
+      let page_size = 0
+      let url = '/api/v1/ops/statistics/mixed_category_tmr_name'
+      let data = {
+        'pasture_id':this.table.getdataListParm.parammaps.pastureid,
+        'api_name':this.downTMR.name,
+        'start_time':parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}'),
+        'end_time':parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      }
+      postJson(url, data).then(response => {
+        this.TMRList = response.data.list
       })
     },
-    getCixCategoryList(){
-      GetDataByName(this.cixCategoryParm).then(response => {
-        if(response.data.list !== null){
-          this.cixCategoryList = response.data.list
-        }else{
-          this.cixCategoryList = []
-        }
+    getCixCategoryList(){
+      let page = 0
+      let page_size = 0
+      let url = '/api/v1/ops/statistics/mixed_category_tmr_name'
+      let data = {
+        'pasture_id':this.table.getdataListParm.parammaps.pastureid,
+        'api_name':this.cixCategoryParm.name,
+        'start_time':parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}'),
+        'end_time':parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      }
+      postJson(url, data).then(response => {
+        this.cixCategoryList = response.data.list
       })
     },
     // TMR设备列表
-    getList() {
-      this.table.listLoading = true
-      processAnalysist(this.table.getdataListParm).then(response => {
-        // console.log('TMR设备列表table数据', response.data.list)
+    getList() {
+      this.table.listLoading = true
+      let page = 0
+      let page_size = 0
+      let url = '/api/v1/ops/process/analysis' + '?page=' + page + '&page_size=' + page_size
+      let data = {
+        'pasture_id':this.table.getdataListParm.parammaps.pastureid,
+        'api_name':this.table.getdataListParm.name,
+        'start_time':this.table.getdataListParm.parammaps.startTime,
+        'end_time':this.table.getdataListParm.parammaps.stopTime
+      }
+      if(this.table.getdataListParm.parammaps.tmr_name){
+        data.tmr_name = this.table.getdataListParm.parammaps.tmrtname
+      }
+      if(this.table.getdataListParm.parammaps.error_range){
+        data.error_range = this.table.getdataListParm.parammaps.error_range
+      }
+      if(this.table.getdataListParm.parammaps.work_status){
+        data.work_status = this.table.getdataListParm.parammaps.work_status
+      }
+      if(this.table.getdataListParm.parammaps.mix_feed_type){
+        data.mix_feed_type = this.table.getdataListParm.parammaps.mix_feed_type
+      }
+      if(this.table.getdataListParm.parammaps.plan_type){
+        data.plan_type = this.table.getdataListParm.parammaps.plan_type
+      }
+      if(this.table.getdataListParm.parammaps.slwc1){
+        data.slwc1 = this.table.getdataListParm.parammaps.slwc1
+      }
+      if(this.table.getdataListParm.parammaps.slwc2){
+        data.slwc2 = this.table.getdataListParm.parammaps.slwc2
+      }
+      if(this.table.getdataListParm.parammaps.slzq1){
+        data.slzq1 = this.table.getdataListParm.parammaps.slzq1
+      }
+      if(this.table.getdataListParm.parammaps.slzq2){
+        data.slzq2 = this.table.getdataListParm.parammaps.slzq2
+      }
+      if(this.table.getdataListParm.parammaps.hlwc1){
+        data.hlwc1 = this.table.getdataListParm.parammaps.hlwc1
+      }
+      if(this.table.getdataListParm.parammaps.hlwc2){
+        data.hlwc2 = this.table.getdataListParm.parammaps.hlwc2
+      }
+      if(this.table.getdataListParm.parammaps.hlzq1){
+        data.hlzq1 = this.table.getdataListParm.parammaps.hlzq1
+      }
+      if(this.table.getdataListParm.parammaps.hlzq2){
+        data.hlzq2 = this.table.getdataListParm.parammaps.hlzq2
+      }
+      console.log(data,'===999')
+      postJson(url, data).then(response => {
         if (response.data.list !== null) {
           this.table.list = response.data.list
           this.table.total = response.data.total
@@ -744,9 +793,9 @@ export default {
             this.isSpreadingPlanSH = false
             this.isSpreadingPlanSS = false
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
-            this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.table3.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.getList2()
@@ -761,11 +810,11 @@ export default {
             this.table3.getdataListParm.name = 'getprocessAnalysisHLSH'
             this.table4.getdataListParm.name = 'getprocessAnalysisSLSH'
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
-            this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.table3.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.getList2()
@@ -779,18 +828,18 @@ export default {
             this.isSpreadingPlanSH = true
             this.isSpreadingPlanSS = false
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
-            this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.table3.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.getList2()
             this.getList3()
             this.getList4()
             this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.getChart1()
           } else if (response.data.list[0].lpplantype == '撒料计划-撒料') {
             // 撒料计划-撒料
@@ -800,18 +849,18 @@ export default {
             this.isSpreadingPlanSH = false
             this.isSpreadingPlanSS = true
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
-            this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.table3.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.getList2()
             this.getList3()
             this.getList4()
             this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.getChart1()
           } else if (response.data.list[0].lpplantype == '预称重计划') {
             // 撒料计划-混料
@@ -821,18 +870,18 @@ export default {
             this.isSpreadingPlanSH = true
             this.isSpreadingPlanSS = false
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
-            this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.table3.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.getList2()
             this.getList3()
             this.getList4()
             this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.getChart1()
           } else {
             // 撒料
@@ -842,18 +891,18 @@ export default {
             this.isSpreadingPlanSH = false
             this.isSpreadingPlanSS = false
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
-            this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.table3.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
             this.getList2()
             this.getList3()
             this.getList4()
             this.chart1.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.chart1.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
+            this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
             this.getChart1()
           }
           this.title = response.data.list[0].lpplantype
@@ -1034,8 +1083,8 @@ export default {
         this.isSpreadingPlanSS = false
         this.table2.getdataListParm.name = 'getprocessAnalysisStr'
         this.table3.getdataListParm.name = 'getprocessAnalysisHL'
-        this.table2.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table3.getdataListParm.parammaps.pastureid = row.pastureid
+        this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
         this.getList2()
         this.getList3()
       } else if (row.lpplantype == '剩料计划') {
@@ -1048,9 +1097,9 @@ export default {
         this.table2.getdataListParm.name = 'getprocessAnalysisStrSH'
         this.table3.getdataListParm.name = 'getprocessAnalysisHLSH'
         this.table4.getdataListParm.name = 'getprocessAnalysisSLSH'
-        this.table2.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table3.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table4.getdataListParm.parammaps.pastureid = row.pastureid
+        this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
         this.getList2()
         this.getList3()
         this.getList4()
@@ -1063,10 +1112,10 @@ export default {
         this.table2.getdataListParm.name = 'getprocessAnalysisStr'
         this.table3.getdataListParm.name = 'getprocessAnalysisHL'
         this.table4.getdataListParm.name = 'getprocessAnalysisSL'
-        this.table2.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table3.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table4.getdataListParm.parammaps.pastureid = row.pastureid
-        this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
+        this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
         this.getList2()
         this.getList3()
         this.getList4()
@@ -1080,10 +1129,10 @@ export default {
         this.table2.getdataListParm.name = 'getprocessAnalysisStr'
         this.table3.getdataListParm.name = 'getprocessAnalysisHL'
         this.table4.getdataListParm.name = 'getprocessAnalysisSL'
-        this.table2.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table3.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table4.getdataListParm.parammaps.pastureid = row.pastureid
-        this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
+        this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
         this.getList2()
         this.getList3()
         this.getList4()
@@ -1097,10 +1146,10 @@ export default {
         this.table2.getdataListParm.name = 'getprocessAnalysisStr'
         this.table3.getdataListParm.name = 'getprocessAnalysisHL'
         this.table4.getdataListParm.name = 'getprocessAnalysisSL'
-        this.table2.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table3.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table4.getdataListParm.parammaps.pastureid = row.pastureid
-        this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
+        this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
         this.getList2()
         this.getList3()
         this.getList4()
@@ -1115,10 +1164,10 @@ export default {
         this.table2.getdataListParm.name = 'getprocessAnalysisStr'
         this.table3.getdataListParm.name = 'getprocessAnalysisHL'
         this.table4.getdataListParm.name = 'getprocessAnalysisSL'
-        this.table2.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table3.getdataListParm.parammaps.pastureid = row.pastureid
-        this.table4.getdataListParm.parammaps.pastureid = row.pastureid
-        this.chart1.getdataListParm.parammaps.pastureid = row.pastureid
+        this.table2.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table3.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.table4.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
+        this.chart1.getdataListParm.parammaps.pastureid = this.table.getdataListParm.parammaps.pastureid
         this.getList2()
         this.getList3()
         this.getList4()
@@ -1129,7 +1178,64 @@ export default {
     // 过程详情
     getList2() {
       this.table2.listLoading = false
-      GetDataByName(this.table2.getdataListParm).then(response => {
+      let page = 0
+      let page_size = 0
+      let url = '/api/v1/ops/process/analysis/mixed_sprinkle_detail' + '?page=' + page + '&page_size=' + page_size
+      let data = {
+        'pasture_id':this.table2.getdataListParm.parammaps.pastureid,
+        'api_name':this.table2.getdataListParm.name,
+        'start_time':this.table.getdataListParm.parammaps.startTime,
+        'end_time':this.table.getdataListParm.parammaps.stopTime
+      }
+      if(this.table2.getdataListParm.parammaps.pid){
+        data.pid = this.table2.getdataListParm.parammaps.pid
+      }
+      if(this.table2.getdataListParm.parammaps.fclassid){
+        data.fclass_id = this.table2.getdataListParm.parammaps.fclassid
+      }
+      if(this.table2.getdataListParm.parammaps.id){
+        data.id = this.table2.getdataListParm.parammaps.id
+      }
+      if(this.table2.getdataListParm.parammaps.tmr_name){
+        data.tmr_name = this.table2.getdataListParm.parammaps.tmrtname
+      }
+      if(this.table2.getdataListParm.parammaps.error_range){
+        data.error_range = this.table2.getdataListParm.parammaps.error_range
+      }
+      if(this.table2.getdataListParm.parammaps.work_status){
+        data.work_status = this.table2.getdataListParm.parammaps.work_status
+      }
+      if(this.table2.getdataListParm.parammaps.mix_feed_type){
+        data.mix_feed_type = this.table2.getdataListParm.parammaps.mix_feed_type
+      }
+      if(this.table2.getdataListParm.parammaps.plan_type){
+        data.plan_type = this.table2.getdataListParm.parammaps.plan_type
+      }
+      if(this.table2.getdataListParm.parammaps.slwc1){
+        data.slwc1 = this.table2.getdataListParm.parammaps.slwc1
+      }
+      if(this.table2.getdataListParm.parammaps.slwc2){
+        data.slwc2 = this.table2.getdataListParm.parammaps.slwc2
+      }
+      if(this.table2.getdataListParm.parammaps.slzq1){
+        data.slzq1 = this.table2.getdataListParm.parammaps.slzq1
+      }
+      if(this.table2.getdataListParm.parammaps.slzq2){
+        data.slzq2 = this.table2.getdataListParm.parammaps.slzq2
+      }
+      if(this.table2.getdataListParm.parammaps.hlwc1){
+        data.hlwc1 = this.table2.getdataListParm.parammaps.hlwc1
+      }
+      if(this.table2.getdataListParm.parammaps.hlwc2){
+        data.hlwc2 = this.table2.getdataListParm.parammaps.hlwc2
+      }
+      if(this.table2.getdataListParm.parammaps.hlzq1){
+        data.hlzq1 = this.table2.getdataListParm.parammaps.hlzq1
+      }
+      if(this.table2.getdataListParm.parammaps.hlzq2){
+        data.hlzq2 = this.table2.getdataListParm.parammaps.hlzq2
+      }
+      postJson(url, data).then(response => {
         console.log('过程详情table数据', response.data.list)
         if (response.data.list !== null) {
           this.table2.list = response.data.list
@@ -1144,7 +1250,65 @@ export default {
     // 混料详情
     getList3() {
       this.table3.listLoading = false
-      GetDataByName(this.table3.getdataListParm).then(response => {
+      // GetDataByName(this.table3.getdataListParm).then(response => {
+        let page = 0
+        let page_size = 0
+        let url = '/api/v1/ops/process/analysis/mixed_sprinkle_detail' + '?page=' + page + '&page_size=' + page_size
+        let data = {
+          'pasture_id':this.table3.getdataListParm.parammaps.pastureid,
+          'api_name':this.table3.getdataListParm.name,
+          'start_time':this.table.getdataListParm.parammaps.startTime,
+          'end_time':this.table.getdataListParm.parammaps.stopTime
+        }
+        if(this.table3.getdataListParm.parammaps.pid){
+          data.pid = this.table3.getdataListParm.parammaps.pid
+        }
+        if(this.table3.getdataListParm.parammaps.fclassid){
+          data.fclass_id = this.table3.getdataListParm.parammaps.fclassid
+        }
+        if(this.table3.getdataListParm.parammaps.id){
+          data.id = this.table3.getdataListParm.parammaps.id
+        }
+        if(this.table3.getdataListParm.parammaps.tmr_name){
+          data.tmr_name = this.table3.getdataListParm.parammaps.tmrtname
+        }
+        if(this.table3.getdataListParm.parammaps.error_range){
+          data.error_range = this.table3.getdataListParm.parammaps.error_range
+        }
+        if(this.table3.getdataListParm.parammaps.work_status){
+          data.work_status = this.table3.getdataListParm.parammaps.work_status
+        }
+        if(this.table3.getdataListParm.parammaps.mix_feed_type){
+          data.mix_feed_type = this.table3.getdataListParm.parammaps.mix_feed_type
+        }
+        if(this.table3.getdataListParm.parammaps.plan_type){
+          data.plan_type = this.table3.getdataListParm.parammaps.plan_type
+        }
+        if(this.table3.getdataListParm.parammaps.slwc1){
+          data.slwc1 = this.table3.getdataListParm.parammaps.slwc1
+        }
+        if(this.table3.getdataListParm.parammaps.slwc2){
+          data.slwc2 = this.table3.getdataListParm.parammaps.slwc2
+        }
+        if(this.table3.getdataListParm.parammaps.slzq1){
+          data.slzq1 = this.table3.getdataListParm.parammaps.slzq1
+        }
+        if(this.table3.getdataListParm.parammaps.slzq2){
+          data.slzq2 = this.table3.getdataListParm.parammaps.slzq2
+        }
+        if(this.table3.getdataListParm.parammaps.hlwc1){
+          data.hlwc1 = this.table3.getdataListParm.parammaps.hlwc1
+        }
+        if(this.table3.getdataListParm.parammaps.hlwc2){
+          data.hlwc2 = this.table3.getdataListParm.parammaps.hlwc2
+        }
+        if(this.table3.getdataListParm.parammaps.hlzq1){
+          data.hlzq1 = this.table3.getdataListParm.parammaps.hlzq1
+        }
+        if(this.table3.getdataListParm.parammaps.hlzq2){
+          data.hlzq2 = this.table3.getdataListParm.parammaps.hlzq2
+        }
+        postJson(url, data).then(response => {
         console.log('混料详情table数据', response.data.list)
         if (response.data.list !== null) {
           this.table3.list = response.data.list
@@ -1176,7 +1340,65 @@ export default {
     // 撒料详情
     getList4() {
       this.table4.listLoading = false
-      GetDataByName(this.table4.getdataListParm).then(response => {
+      // GetDataByName(this.table4.getdataListParm).then(response => {
+      let page = 0
+      let page_size = 0
+      let url = '/api/v1/ops/process/analysis/mixed_sprinkle_detail' + '?page=' + page + '&page_size=' + page_size
+      let data = {
+        'pasture_id':this.table4.getdataListParm.parammaps.pastureid,
+        'api_name':this.table4.getdataListParm.name,
+        'start_time':this.table.getdataListParm.parammaps.startTime,
+        'end_time':this.table.getdataListParm.parammaps.stopTime
+      }
+      if(this.table4.getdataListParm.parammaps.pid){
+        data.pid = this.table4.getdataListParm.parammaps.pid
+      }
+      if(this.table4.getdataListParm.parammaps.fclassid){
+        data.fclass_id = this.table4.getdataListParm.parammaps.fclassid
+      }
+      if(this.table4.getdataListParm.parammaps.id){
+        data.id = this.table4.getdataListParm.parammaps.id
+      }
+      if(this.table4.getdataListParm.parammaps.tmr_name){
+        data.tmr_name = this.table4.getdataListParm.parammaps.tmrtname
+      }
+      if(this.table4.getdataListParm.parammaps.error_range){
+        data.error_range = this.table4.getdataListParm.parammaps.error_range
+      }
+      if(this.table4.getdataListParm.parammaps.work_status){
+        data.work_status = this.table4.getdataListParm.parammaps.work_status
+      }
+      if(this.table4.getdataListParm.parammaps.mix_feed_type){
+        data.mix_feed_type = this.table4.getdataListParm.parammaps.mix_feed_type
+      }
+      if(this.table4.getdataListParm.parammaps.plan_type){
+        data.plan_type = this.table4.getdataListParm.parammaps.plan_type
+      }
+      if(this.table4.getdataListParm.parammaps.slwc1){
+        data.slwc1 = this.table4.getdataListParm.parammaps.slwc1
+      }
+      if(this.table4.getdataListParm.parammaps.slwc2){
+        data.slwc2 = this.table4.getdataListParm.parammaps.slwc2
+      }
+      if(this.table4.getdataListParm.parammaps.slzq1){
+        data.slzq1 = this.table4.getdataListParm.parammaps.slzq1
+      }
+      if(this.table4.getdataListParm.parammaps.slzq2){
+        data.slzq2 = this.table4.getdataListParm.parammaps.slzq2
+      }
+      if(this.table4.getdataListParm.parammaps.hlwc1){
+        data.hlwc1 = this.table4.getdataListParm.parammaps.hlwc1
+      }
+      if(this.table4.getdataListParm.parammaps.hlwc2){
+        data.hlwc2 = this.table4.getdataListParm.parammaps.hlwc2
+      }
+      if(this.table4.getdataListParm.parammaps.hlzq1){
+        data.hlzq1 = this.table4.getdataListParm.parammaps.hlzq1
+      }
+      if(this.table4.getdataListParm.parammaps.hlzq2){
+        data.hlzq2 = this.table4.getdataListParm.parammaps.hlzq2
+      }
+      postJson(url, data).then(response => {
         console.log('撒料详情table数据', response.data.list)
         if (response.data.list !== null) {
           this.table4.list = response.data.list
@@ -1236,36 +1458,67 @@ export default {
       }
     },
     getChart1() {
-      this.chart1.listLoading = true
-      GetReportform(this.chart1.getdataListParm).then(response => {
+      this.chart1.listLoading = true
+      let page = 0
+      let page_size = 0
+      let url = '/api/v1/ops/process/analysis/mixed_sprinkle_detail' + '?page=' + page + '&page_size=' + page_size
+      let data = {
+        'pasture_id':this.chart1.getdataListParm.parammaps.pastureid,
+        'api_name':this.chart1.getdataListParm.name,
+        'start_time':this.table.getdataListParm.parammaps.startTime,
+        'end_time':this.table.getdataListParm.parammaps.stopTime
+      }
+      if(this.chart1.getdataListParm.parammaps.pid){
+        data.pid = this.chart1.getdataListParm.parammaps.pid
+      }
+      if(this.chart1.getdataListParm.parammaps.fclassid){
+        data.fclass_id = this.chart1.getdataListParm.parammaps.fclassid
+      }
+      if(this.chart1.getdataListParm.parammaps.id){
+        data.id = this.chart1.getdataListParm.parammaps.id
+      }
+      if(this.chart1.getdataListParm.parammaps.tmr_name){
+        data.tmr_name = this.chart1.getdataListParm.parammaps.tmrtname
+      }
+      if(this.chart1.getdataListParm.parammaps.error_range){
+        data.error_range = this.chart1.getdataListParm.parammaps.error_range
+      }
+      if(this.chart1.getdataListParm.parammaps.work_status){
+        data.work_status = this.chart1.getdataListParm.parammaps.work_status
+      }
+      if(this.chart1.getdataListParm.parammaps.mix_feed_type){
+        data.mix_feed_type = this.chart1.getdataListParm.parammaps.mix_feed_type
+      }
+      if(this.chart1.getdataListParm.parammaps.plan_type){
+        data.plan_type = this.chart1.getdataListParm.parammaps.plan_type
+      }
+      if(this.chart1.getdataListParm.parammaps.slwc1){
+        data.slwc1 = this.chart1.getdataListParm.parammaps.slwc1
+      }
+      if(this.chart1.getdataListParm.parammaps.slwc2){
+        data.slwc2 = this.chart1.getdataListParm.parammaps.slwc2
+      }
+      if(this.chart1.getdataListParm.parammaps.slzq1){
+        data.slzq1 = this.chart1.getdataListParm.parammaps.slzq1
+      }
+      if(this.chart1.getdataListParm.parammaps.slzq2){
+        data.slzq2 = this.chart1.getdataListParm.parammaps.slzq2
+      }
+      if(this.chart1.getdataListParm.parammaps.hlwc1){
+        data.hlwc1 = this.chart1.getdataListParm.parammaps.hlwc1
+      }
+      if(this.chart1.getdataListParm.parammaps.hlwc2){
+        data.hlwc2 = this.chart1.getdataListParm.parammaps.hlwc2
+      }
+      if(this.chart1.getdataListParm.parammaps.hlzq1){
+        data.hlzq1 = this.chart1.getdataListParm.parammaps.hlzq1
+      }
+      if(this.chart1.getdataListParm.parammaps.hlzq2){
+        data.hlzq2 = this.chart1.getdataListParm.parammaps.hlzq2
+      }
+      postJson(url, data).then(response => {
+      // GetReportform(this.chart1.getdataListParm).then(response => {
         if (response.data.list !== null) {
-          // response.data.list = {
-          //   // 'data1': ['09:34:32', '09:34:46', '09:34:46', '09:34:50'],
-          //   'data2': [
-          //     ['09:34:32', '1724.11'],
-          //     ['09:34:46', '1724.12'],
-          //     ['09:34:46', '-50.13'],
-          //     ['09:34:50', '-51.14']
-          //   ],
-          //   'data3': [
-          //     ['09:34:32', '0'],
-          //     ['09:34:46', '1725.15'],
-          //     ['09:34:46', '1726.16'],
-          //     ['09:34:50', '1.17']
-          //   ],
-          //   'data4': [
-          //     ['09:34:32', '0.18'],
-          //     ['09:34:46', '1725.19'],
-          //     ['09:34:46', '1335.20'],
-          //     ['09:34:50', '1.21']
-          //   ],
-          //   'data5': [
-          //     ['09:34:32', '0.22', '栏舍', '303东1'],
-          //     ['09:34:46', '1726.23',  '饲料', '国产燕麦2'],
-          //     ['09:34:46', '1335.24', '栏舍', '303东3'],
-          //     ['09:34:50', '1.25', '饲料', '国产燕麦4']
-          //   ]
-          // }
           this.chart1.list = response.data.data
           console.log('实时监控', response.data.list)
           this.chart1.chartLine_data = response.data.list