Merge branch 'feature/proess' of duanxiaoduan/tmr-group-admin into develop

.env.development

@@ -3,10 +3,10 @@ ENV = 'development'
 
 # base api
 # 测试线
-#VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
+#VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
 # 正式线
-VUE_APP_BASE_API = 'http://122.114.177.195:8082/'
-
+VUE_APP_BASE_API = 'http://210.16.188.161:8082/'
+
 
 #许义平本地
 # VUE_APP_BASE_API = 'http://192.168.1.96:8090/'

src/views/statisticalAnalysis/processAnalysis/index.vue

@@ -1,8 +1,8 @@
 <template>
   <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.id" :label="item.name" :value="item.id" />
+    <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.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" />
@@ -71,6 +71,7 @@
             <el-table-column sortable label="计划类型" min-width="80px" align="center" prop="lpplantype" />
             <el-table-column sortable label="描述" min-width="90px" align="center" prop="remark" />
             <el-table-column sortable label="TMR名称" min-width="80px" align="center" prop="tmrtname" />
+            <el-table-column sortable label="过程时间" min-width="80px" align="center" prop="proesstime" />
           </el-table>
         </div>
         <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
@@ -681,7 +682,7 @@ export default {
 
       TMRList:[],
       errorList:[{ value: '有误差', label: '有误差' }, { value: '无误差', label: '无误差' }],
-
+
       pastureList: JSON.parse(sessionStorage.pastureList), //牧场
       downTMR: { name: 'getDownloadedplanTmrName', offset: 0, pagecount: 0,
        parammaps: {
@@ -696,92 +697,92 @@ export default {
     this.getCixCategoryList()
     this.getList()
   },
-  methods: {
+  methods: {
     change_date(e){
       console.log(e)
       this.getDownList()
     },
 
-    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
+    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(){
-      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
+    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
-      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')
+    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 && response.data.list.length > 0) {
           this.table.list = response.data.list
@@ -1178,63 +1179,63 @@ export default {
     // 过程详情
     getList2() {
       this.table2.listLoading = false
-      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
-      }
+      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 && response.data.list.length > 0) {
@@ -1250,64 +1251,64 @@ export default {
     // 混料详情
     getList3() {
       this.table3.listLoading = false
-      // 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
-        }
+      // 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 && response.data.list.length > 0) {
@@ -1340,64 +1341,64 @@ export default {
     // 撒料详情
     getList4() {
       this.table4.listLoading = false
-      // 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
-      }
+      // 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 && response.data.list.length > 0) {
@@ -1458,64 +1459,64 @@ export default {
       }
     },
     getChart1() {
-      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
-      }
+      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.length > 0) {