准确性分析混料统计撒料统计添加导出；撒料统计配方名称及栏舍接口对接

src/views/statisticalAnalysis/errorAnalysis/index.vue

@@ -644,7 +644,8 @@
           <el-select v-model="tab2.table.getdataListParm.parammaps.pastureId" placeholder="牧场" class="filter-item" style="width: 120px;margin-right: 10px;" @change="changePasture2()">
             <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期"> </el-date-picker>
+          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions3" />
+          <!-- <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="display:inline-block;margin-top: 5px;" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="display:inline-block;margin-top: 5px;" :disabled="Nextdisabled2" @click="handleNext2" />
           <el-select clearable filterable v-model="tab2.table.getdataListParm.parammaps.tmrtname" placeholder="TMR设备" class="filter-item" style="width: 120px;">
@@ -677,7 +678,7 @@
 
           <el-button class="successBorder" style="margin-top: 5px;" @click="form_search2">查询</el-button>
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh2">重置</el-button>
-          <!-- <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport2">导出</el-button> -->
+          <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport2">导出</el-button>
         </div>
         <div class="table">
           <u-table
@@ -731,7 +732,8 @@
           <el-select v-model="tab3.table.getdataListParm.parammaps.pastureId" placeholder="牧场" class="filter-item" style="width: 120px;margin-right: 10px;" @change="changePasture3()">
             <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="margin-top: 5px;width:140px;" type="date" placeholder="选择日期"> </el-date-picker>
+          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions3" />
+          <!-- <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="margin-top: 5px;width:140px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="dispaly:inline-block;margin-top: 5px;" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="dispaly:inline-block;margin-top: 5px;" :disabled="Nextdisabled3" @click="handleNext3" />
           <el-select v-model="tab3.table.getdataListParm.parammaps.tmrtname" placeholder="TMR设备" class="filter-item" style="margin-top: 5px;width: 120px;" clearable filterable>
@@ -764,7 +766,7 @@
           <el-checkbox v-model="tab3.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
           <el-button class="successBorder" style="margin-top: 5px;" @click="form_search3">查询</el-button>
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh3">重置</el-button>
-          <!-- <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport3">导出</el-button> -->
+          <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport3">导出</el-button>
         </div>
         <div class="table">
           <u-table
@@ -786,8 +788,16 @@
             <u-table-column sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
             <u-table-column sortable label="车次" min-width="45px" align="center" prop="车次" />
             <u-table-column sortable label="班次" min-width="45px" align="center" prop="班次" />
-            <u-table-column sortable label="配方名称" min-width="45px" align="center" prop="配方名称" />
-            <u-table-column sortable label="栏舍" min-width="45px" align="center" prop="栏舍" />
+            <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
+              <template slot-scope="{row}">
+                <a @click="clickRecipeName3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
+              </template>
+            </u-table-column>
+            <u-table-column sortable label="栏舍" min-width="70px" align="center" prop="栏舍">
+              <template slot-scope="{row}">
+                <a @click="clickFence3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.栏舍 }}</a>
+              </template>
+            </u-table-column>
             <u-table-column sortable label="理论重量" min-width="55px" align="center" prop="理论重量" />
             <u-table-column sortable label="实际重量" min-width="55px" align="center" prop="实际重量" />
             <u-table-column sortable label="误差值" min-width="45px" align="center" prop="误差值" />
@@ -1018,6 +1028,7 @@
                   :cell-style="cellStyle"
                   class="elTable table-fixed"
                   :span-method="objectSpanMethod1"
+                  :max-height="450"
                 >
                   <u-table-column label="序号" width="50px" align="center" type="index" />
                   <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
@@ -1310,6 +1321,27 @@ export default {
           return time.getTime() > Date.now()
         }
       },
+      pickerOptions3:{
+        onPick: ({ maxDate, minDate }) => {
+          this.pickerMinDate = minDate.getTime()
+          if (maxDate) {
+            this.pickerMinDate = ''
+          }
+        },
+        // 限制不能选择今天之后的日期
+        disabledDate: (time) => {
+          if (this.pickerMinDate !== '') {
+            const one = 365 * 24 * 3600 * 1000
+            const minTime = this.pickerMinDate - one
+            let maxTime = this.pickerMinDate + one
+            if (maxTime > new Date()) {
+              maxTime = new Date()
+            }
+            return time.getTime() < minTime || time.getTime() > maxTime
+          }
+          return time.getTime() > Date.now()
+        },
+      },
       // 班次
       activeName: 'first',
       tab: {
@@ -3240,75 +3272,88 @@ export default {
     },
     handleBefore2() {
       this.$forceUpdate()
-      if (this.tab2.table.getdataListParm.parammaps.inputDatetime2 !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime2 !== null) {
-        var start3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime2.setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime2.getDate() - 1))
-        if (start3 > Date.now() - 8.64e7) {
-          this.Nextdisabled2 = true
-          this.Beforedisabled2 = false
+      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop3 > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
         } else {
-          this.Nextdisabled2 = false
-          this.Beforedisabled2 = false
+          this.Nextdisabled = false
+          this.Beforedisabled = false
         }
-        this.tab2.table.getdataListParm.parammaps.inputDatetime2 = start3
+        this.tab2.table.getdataListParm.parammaps.inputDatetime = []
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start3, stop3)
         this.$forceUpdate()
       }
       this.tab2.table.getdataListParm.parammaps.startTime = parseTime(start3, '{y}-{m}-{d}')
-      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(start3, '{y}-{m}-{d}')
+      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(stop3, '{y}-{m}-{d}')
       this.getTab2List()
       this.getTMRNameList2()
     },
     handleNext2() {
-      if (this.tab2.table.getdataListParm.parammaps.inputDatetime2 !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime2 !== null) {
-        var start4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime2.setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime2.getDate() + 1))
-        if (start4 > Date.now() - 8.64e7) {
-          this.Nextdisabled2 = true
-          this.Beforedisabled2 = false
+      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop4 > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
         } else {
-          this.Nextdisabled2 = false
-          this.Beforedisabled2 = false
+          this.Nextdisabled = false
+          this.Beforedisabled = false
         }
-        this.tab2.table.getdataListParm.parammaps.inputDatetime2 = start4
+        this.tab2.table.getdataListParm.parammaps.inputDatetime = []
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start4, stop4)
         this.$forceUpdate()
       }
       this.tab2.table.getdataListParm.parammaps.startTime = parseTime(start4, '{y}-{m}-{d}')
-      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(start4, '{y}-{m}-{d}')
+      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(stop4, '{y}-{m}-{d}')
       this.getTab2List()
       this.getTMRNameList2()
     },
     handleBefore3() {
       this.$forceUpdate()
-      if (this.tab3.table.getdataListParm.parammaps.inputDatetime2 !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime2 !== null) {
-      var start3 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime2.setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime2.getDate() - 1))
-        if (start3 > Date.now() - 8.64e7) {
-          this.Nextdisabled3 = true
-          this.Beforedisabled3 = false
+      this.$forceUpdate()
+      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop5 > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
         } else {
-          this.Nextdisabled3 = false
-          this.Beforedisabled3 = false
+          this.Nextdisabled = false
+          this.Beforedisabled = false
         }
-        this.tab3.table.getdataListParm.parammaps.inputDatetime2 = start3
+        this.tab3.table.getdataListParm.parammaps.inputDatetime = []
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start5, stop5)
         this.$forceUpdate()
       }
-      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(start3, '{y}-{m}-{d}')
-      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(start3, '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(start5, '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(stop5, '{y}-{m}-{d}')
       this.getTab3List()
       this.getTMRNameList3()
     },
     handleNext3() {
-      if (this.tab3.table.getdataListParm.parammaps.inputDatetime2 !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime2 !== null) {
-        var start4 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime2.setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime2.getDate() + 1))
-        if (start4 > Date.now() - 8.64e7) {
-          this.Nextdisabled3 = true
-          this.Beforedisabled3 = false
+      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop6 > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
         } else {
-          this.Nextdisabled3 = false
-          this.Beforedisabled3 = false
+          this.Nextdisabled = false
+          this.Beforedisabled = false
         }
-        this.tab3.table.getdataListParm.parammaps.inputDatetime2 = start4
+        this.tab3.table.getdataListParm.parammaps.inputDatetime = []
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start6, stop6)
         this.$forceUpdate()
       }
-      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(start4, '{y}-{m}-{d}')
-      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(start4, '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(start6, '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(stop6, '{y}-{m}-{d}')
       this.getTab3List()
       this.getTMRNameList3()
     },
@@ -4632,17 +4677,15 @@ export default {
     },
     form_search2() {
       this.tab2.table.getdataListParm.name = 'getStatisticsHL'
-      // if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
-      //   console.log(this.tab2.table.getdataListParm.parammaps.inputDatetime)
-      //   this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      //   this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      // } else {
-      //   this.tab2.table.getdataListParm.parammaps.inputDatetime = ''
-      //   this.tab2.table.getdataListParm.parammaps.startTime = ''
-      //   this.tab2.table.getdataListParm.parammaps.stopTime = ''
-      // }
-      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime2, '{y}-{m}-{d}')
-      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime2, '{y}-{m}-{d}')
+      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        console.log(this.tab2.table.getdataListParm.parammaps.inputDatetime)
+        this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      } else {
+        this.tab2.table.getdataListParm.parammaps.inputDatetime = ''
+        this.tab2.table.getdataListParm.parammaps.startTime = ''
+        this.tab2.table.getdataListParm.parammaps.stopTime = ''
+      }
       this.tab2.table.getdataListParm.offset = 1
       this.getTab2List()
       this.getTMRNameList2()
@@ -4678,21 +4721,44 @@ export default {
     },
     exportList2(){
       this.isokDisable = true
-      var url = 'authdata/GetDataByName'
-      var data = {
-        'name':"getStatisticsHL",
-        "page":1,"offset":1,"pagecount":"","returntype":"Map",
-        "parammaps":{"pastureid":Cookies.get('pastureid'),"startTime":"","stopTime":"","templetname":"","isuse":""}
+      let page = this.tab2.table.getdataListParm.offset
+      let page_size = 0
+      let url = '/api/v1/ops/accuracy/mixed_statistics' + '?page=' + page + '&page_size=' + page_size
+      let data = {
+        pasture_id:this.tab2.table.getdataListParm.parammaps.pastureId,
+        start_time:parseTime(this.exportList.inputDatetime[0],'{y}-{m}-{d}'),
+        end_time:parseTime(this.exportList.inputDatetime[1],'{y}-{m}-{d}'),
+        api_name:this.tab2.table.getdataListParm.name,
+        equipment_name:this.tab2.table.getdataListParm.parammaps.tmrtname,
+        train_number:this.tab2.table.getdataListParm.parammaps.projname,
+        formulation_name:this.tab2.table.getdataListParm.parammaps.templetname,
+        is_error:this.tab2.table.getdataListParm.parammaps.error,
+        hlwc1:this.tab2.table.getdataListParm.parammaps.hlwc1,
+        hlwc2:this.tab2.table.getdataListParm.parammaps.hlwc2,
+        hlzq1:this.tab2.table.getdataListParm.parammaps.hlzq1,
+        hlzq2:this.tab2.table.getdataListParm.parammaps.hlzq2,
+        hlzql1:this.tab2.table.getdataListParm.parammaps.hlzql1,
+        hlzql2:this.tab2.table.getdataListParm.parammaps.hlzql2,
       }
-      data.parammaps.startTime = parseTime(this.exportList.inputDatetime[0],'{y}-{m}-{d}')
-      data.parammaps.stopTime = parseTime(this.exportList.inputDatetime[1],'{y}-{m}-{d}')
-      data.parammaps.tmrtname = this.tab2.table.getdataListParm.parammaps.tmrtname
-      data.parammaps.projname = this.tab2.table.getdataListParm.parammaps.projname
-      data.parammaps.times = this.tab2.table.getdataListParm.parammaps.times
-      data.parammaps.buttontype = this.tab2.table.getdataListParm.parammaps.buttontype
-      data.parammaps.templetname = this.tab2.table.getdataListParm.parammaps.templetname
-      data.parammaps.isuse = this.tab2.table.getdataListParm.parammaps.isuse
-      postJson(url,data).then(response => {
+      if(this.tab2.table.getdataListParm.parammaps.hlwc1){
+        data.hlwc1 = this.tab2.table.getdataListParm.parammaps.hlwc1
+      }
+      if(this.tab2.table.getdataListParm.parammaps.hlwc2){
+        data.hlwc2 = this.tab2.table.getdataListParm.parammaps.hlwc2
+      }
+      if(this.tab2.table.getdataListParm.parammaps.hlzql1){
+        data.hlzql1 = this.tab2.table.getdataListParm.parammaps.hlzql1
+      }
+      if(this.tab2.table.getdataListParm.parammaps.hlzql2){
+        data.hlzql2 = this.tab2.table.getdataListParm.parammaps.hlzql2
+      }
+      if(this.tab2.table.getdataListParm.parammaps.times){
+        data.class_number =this.tab2.table.getdataListParm.parammaps.times
+      }
+      if(this.tab2.table.getdataListParm.parammaps.buttontype){
+        data.jump_type =this.tab2.table.getdataListParm.parammaps.buttontype
+      }
+      postJson(url, data).then(response => {
         var exportList = []
         if (response.data.list !== null) {
         console.log('混料统计table数据', response.data.list)
@@ -4702,8 +4768,8 @@ export default {
         }
         var excelDatasTab2 = [
           {
-            tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', ' 跳转方式', '开始重量', '结束重量', '搅拌时间'],
-            filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
+            tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '搅拌时间',' 跳转方式', '开始重量', '结束重量'],
+            filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '跳转方式','搅拌时间', '开始重量', '结束重量'],
             tableDatas: exportList,
             sheetName: '混料统计'
           }
@@ -4717,8 +4783,8 @@ export default {
     getTab3List() {
       this.tab3.table.listLoading = true
       let page = this.tab3.table.getdataListParm.offset
-      let page_size = 20
-      let url = '/api/v1/ops/accuracy/sprinkle_statistics' + '?page=' + page + '&page_size=' + page_size
+      let page_size = 0
+      let url = '/api/v1/ops/accuracy/sprinkle_statistics'
       let data = {
         pasture_id:this.tab3.table.getdataListParm.parammaps.pastureId,
         start_time:this.tab3.table.getdataListParm.parammaps.startTime,
@@ -4776,16 +4842,16 @@ export default {
     },
     form_search3() {
       this.tab3.table.getdataListParm.name = 'getStatisticsSL'
-      // if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
-      //   this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      //   this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      // } else {
-      //   this.tab3.table.getdataListParm.parammaps.inputDatetime = ''
-      //   this.tab3.table.getdataListParm.parammaps.startTime = ''
-      //   this.tab3.table.getdataListParm.parammaps.stopTime = ''
-      // }
-      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime2, '{y}-{m}-{d}')
-      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime2, '{y}-{m}-{d}')
+      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
+        this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      } else {
+        this.tab3.table.getdataListParm.parammaps.inputDatetime = ''
+        this.tab3.table.getdataListParm.parammaps.startTime = ''
+        this.tab3.table.getdataListParm.parammaps.stopTime = ''
+      }
+      // this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime2, '{y}-{m}-{d}')
+      // this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime2, '{y}-{m}-{d}')
       this.tab3.table.getdataListParm.offset = 1
       this.getTab3List()
       this.getTMRNameList3()
@@ -4809,32 +4875,47 @@ export default {
     handleExport3() {
       this.exportList.dialogFormVisible = true
       this.exportList.dialogStatus = 'exportList'
-      // var excelDatasTab3 = [
-      //   {
-      //     tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
-      //     filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
-      //     tableDatas: this.tab3.table.list,
-      //     sheetName: '撒料统计'
-      //   }
-      // ]
-      // json2excel(excelDatasTab3, '撒料统计', true, 'xlsx')
     },
     exportList3(){
       this.isokDisable = true
-      var url = 'authdata/GetDataByName'
-      var data = {
-        'name':"getStatisticsSL",
-        "page":1,"offset":1,"pagecount":"","returntype":"Map",
-        "parammaps":{"pastureid":Cookies.get('pastureid'),"startTime":"","stopTime":"","templetname":"","isuse":""}
+      let page = 1
+      let page_size = 0
+      let url = '/api/v1/ops/accuracy/sprinkle_statistics' + '?page=' + page + '&page_size=' + page_size
+      let data = {
+        pasture_id:this.tab3.table.getdataListParm.parammaps.pastureId,
+        start_time:parseTime(this.exportList.inputDatetime[0],'{y}-{m}-{d}'),
+        end_time:parseTime(this.exportList.inputDatetime[1],'{y}-{m}-{d}'),
+        api_name:this.tab3.table.getdataListParm.name,
+        equipment_name:this.tab3.table.getdataListParm.parammaps.tmrtname,
+        train_number:this.tab3.table.getdataListParm.parammaps.projname,
+        formulation_name:this.tab3.table.getdataListParm.parammaps.templetname,
+        barn_name:this.tab3.table.getdataListParm.parammaps.fname,
+        is_error:this.tab3.table.getdataListParm.parammaps.error
+      }
+      if(this.tab3.table.getdataListParm.parammaps.buttontype){
+        data.buttontype =this.tab3.table.getdataListParm.parammaps.buttontype
+      }
+      if(this.tab3.table.getdataListParm.parammaps.times){
+        data.class_number =this.tab3.table.getdataListParm.parammaps.times
+      }
+      if(this.tab3.table.getdataListParm.parammaps.slwc1){
+        data.slwc1 = this.tab3.table.getdataListParm.parammaps.slwc1
+      }
+      if(this.tab3.table.getdataListParm.parammaps.slwc2){
+        data.slwc2 = this.tab3.table.getdataListParm.parammaps.slwc2
+      }
+      if(this.tab3.table.getdataListParm.parammaps.slzq1){
+        data.slzq1 = this.tab3.table.getdataListParm.parammaps.slzq1
+      }
+      if(this.tab3.table.getdataListParm.parammaps.slzq2){
+        data.slzq2 = this.tab3.table.getdataListParm.parammaps.slzq2
+      }
+      if(this.tab3.table.getdataListParm.parammaps.slzql1){
+        data.slzql1 = this.tab3.table.getdataListParm.parammaps.slzql1
+      }
+      if(this.tab3.table.getdataListParm.parammaps.slzql2){
+        data.slzql2 = this.tab3.table.getdataListParm.parammaps.slzql2
       }
-      data.parammaps.startTime = parseTime(this.exportList.inputDatetime[0],'{y}-{m}-{d}')
-      data.parammaps.stopTime = parseTime(this.exportList.inputDatetime[1],'{y}-{m}-{d}')
-      data.parammaps.tmrtname = this.tab3.table.getdataListParm.parammaps.tmrtname
-      data.parammaps.projname = this.tab3.table.getdataListParm.parammaps.projname
-      data.parammaps.times = this.tab3.table.getdataListParm.parammaps.times
-      data.parammaps.buttontype = this.tab3.table.getdataListParm.parammaps.buttontype
-      data.parammaps.templetname = this.tab3.table.getdataListParm.parammaps.templetname
-      data.parammaps.isuse = this.tab3.table.getdataListParm.parammaps.isuse
       postJson(url,data).then(response => {
         console.log('混料统计table数据', response.data.list)
         var exportList = []
@@ -4845,8 +4926,8 @@ export default {
         }
         var excelDatasTab3 = [
           {
-            tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
-            filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
+            tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量'],
+            filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量'],
             tableDatas: exportList,
             sheetName: '撒料统计'
           }
@@ -5148,7 +5229,7 @@ export default {
         this.recipeNameTemp3.getdataListParm.parammaps.startTime = this.recipeNameTemp3.getdataListParm.parammaps.inputDatetime[0] + ' 00:00'
         this.recipeNameTemp3.getdataListParm.parammaps.stopTime = this.recipeNameTemp3.getdataListParm.parammaps.inputDatetime[1] + ' 23:59'
       }
-      const url = 'authdata/GetArrList'
+      const url = 'api/v1/ops/feed_template/history'
       const data = {
         name:'getFitHistory1',
         name1:'getFitHistory2',
@@ -5156,7 +5237,11 @@ export default {
         offset:this.recipeNameTemp3.getdataListParm.offset,
         pagecount:this.recipeNameTemp3.getdataListParm.pagecount,
         returntype:this.recipeNameTemp3.getdataListParm.returntype,
-        parammaps:this.recipeNameTemp3.getdataListParm.parammaps
+        parammaps:this.recipeNameTemp3.getdataListParm.parammaps,
+        pasture_id:this.tab3.table.getdataListParm.parammaps.pastureId,
+        ftid:this.recipeNameTemp3.getdataListParm.parammaps.ftid,
+        start_time:this.recipeNameTemp3.getdataListParm.parammaps.startdate,
+        end_time:this.recipeNameTemp3.getdataListParm.parammaps.enddate
       }
       postJson(url, data).then(response => {
         if (response.data.list !== null && response.data.list !=='' && response.data.list.length > 0) {
@@ -5209,12 +5294,13 @@ export default {
         this.fenceTemp.tab1.getdataListParm.parammaps.startDate = this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[0]+' 00:00'
         this.fenceTemp.tab1.getdataListParm.parammaps.endDate = this.fenceTemp.tab1.getdataListParm.parammaps.inputDatetime[1]+' 23:59'
       }
-      const url = 'authdata/feedp/history'
+      const url = 'api/v1/ops/barn/history'
       // const data = this.fenceTemp.tab1.getdataListParm
       const data = {
-          barname:this.fenceTemp.tab1.getdataListParm.parammaps.barname,
-          startDate:this.fenceTemp.tab1.getdataListParm.parammaps.startDate,
-          endDate:this.fenceTemp.tab1.getdataListParm.parammaps.endDate
+        pasture_id:this.tab3.table.getdataListParm.parammaps.pastureId,
+        barn_name:this.fenceTemp.tab1.getdataListParm.parammaps.barname,
+        start_time:this.fenceTemp.tab1.getdataListParm.parammaps.startDate,
+        end_time:this.fenceTemp.tab1.getdataListParm.parammaps.endDate
       }
       postJson(url, data).then(response => {
         this.fenceTemp.tab1.listLoading = false
@@ -5248,12 +5334,12 @@ export default {
         this.fenceTemp.tab2.getdataListParm.parammaps.startDate = this.fenceTemp.tab2.getdataListParm.parammaps.inputDatetime[0]+' 00:00'
         this.fenceTemp.tab2.getdataListParm.parammaps.endDate = this.fenceTemp.tab2.getdataListParm.parammaps.inputDatetime[1]+' 23:59'
       }
-      const url = 'authdata/spillageall/history'
+      const url = 'api/v1/ops/spillage_all/history'
       const data = {
-        barname:this.fenceTemp.tab2.getdataListParm.parammaps.barname,
-        pastureid:Cookies.get('pastureid'),
-        startDate:this.fenceTemp.tab2.getdataListParm.parammaps.startDate,
-        endDate:this.fenceTemp.tab2.getdataListParm.parammaps.endDate
+        pasture_id:this.tab3.table.getdataListParm.parammaps.pastureId,
+        barn_name:this.fenceTemp.tab2.getdataListParm.parammaps.barname,
+        start_time:this.fenceTemp.tab2.getdataListParm.parammaps.startDate,
+        end_time:this.fenceTemp.tab2.getdataListParm.parammaps.endDate
       }
       postJson(url, data).then(response => {
         if (response.data.data !== null) {

src/views/statisticalAnalysis/feedingEfficiency/index.vue

@@ -43,7 +43,7 @@
             <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="feed_formula_name" />
             <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="actual_number_of_cattle" />
+            <el-table-column sortable label="实际牛头数11" 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="撒料量" />
@@ -1732,11 +1732,17 @@ export default {
       }
       postJson(url, data).then(response => {
       // GetDataByName(this.tab.table.getdataListParm).then(response => {
-        console.log('汇总统计/混料table数据', response.data.list)
         if (response.data.list !== null) {
           let dataValue = Object.values(response.data.list)
-          this.tab.table.list = dataValue
-          this.tab.table.total = dataValue.length
+          let listArr = []
+          dataValue.forEach((i)=>{
+            i.forEach((j)=>{
+              listArr.push(j)
+            })
+          })
+          this.tab.table.list = listArr
+          console.log('汇总统计/混料table数据', this.tab.table.list)
+          this.tab.table.total = this.tab.table.list.length
         } else {
           this.tab.table.list = []
         }