更新

.env.development

@@ -5,22 +5,22 @@ ENV = 'development'
 # 测试线
 # VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 
-
+
 # VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
-
-# VUE_APP_BASE_API = 'http://tmrwatch.cn/'
-
 
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn/'
+
+# 测试线
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
 
+VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
 
 # VUE_APP_BASE_API = 'http://lhpc81.kptyun.com/'
 
 
-# 陈文强
-# VUE_APP_BASE_API = 'http://192.168.1.87:8081/'
+ 
 # 白少杰
-# VUE_APP_BASE_API = 'http://192.168.1.89:8081/'
+# VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

.env.production

@@ -7,7 +7,10 @@ ENV = 'production'
 VUE_APP_BASE_API = '/'
 # 测试线
 # VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
-#洋洋本地
+# 洋洋本地
 # VUE_APP_BASE_API = 'http://192.168.1.104:8081/'
 #本地
 # VUE_APP_BASE_API = 'http://192.168.1.55:8084/'
+
+
+ 

package.json

@@ -21,7 +21,7 @@
     "core-js": "^3.6.4",
     "driver.js": "^0.9.6",
     "echarts": "^4.6.0",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.10",
     "file-saver": "^2.0.5",
     "fuse.js": "3.4.4",
     "js-cookie": "^2.2.0",

src/api/common.js

@@ -18,6 +18,14 @@ export function GetDataByName(data) {
   })
 }
 
+export function SyncSCJH(data) {
+  return request({
+    url: '/authdata/syncSCJH',
+    method: 'post',
+    data
+  })
+}
+
 
 export function processAnalysist(data) {
   return request({
@@ -109,16 +117,16 @@ export function GetAccount(data) {
 export function postJson(url,data) {
   return request({
     url: process.env.VUE_APP_BASE_API + url,
-    method: 'post',
+    method: 'post',
     timeout: 600000,
     data
   })
-}
-
+}
+
 export function postJson2(url,data) {
   return request({
     url: url,
-    method: 'post',
+    method: 'post',
     timeout: 600000,
     data
   })
@@ -129,13 +137,13 @@ export function getJson(url,data) {
     url: process.env.VUE_APP_BASE_API + url + data,
     method: 'get'
   })
-}
-
+}
+
 export function getData(url,data) {
   return request({
     url: url,
-    method: 'post',
-    timeout: 600000,
+    method: 'post',
+    timeout: 600000,
     data
   })
 }
@@ -270,26 +278,26 @@ export function DownloadExcel(data, filename) {
     navigator.msSaveBlob(blob, fileName)
   }
 }
-// 取小数
+// 取小数
 // export function formatNum(f, digit) {
 //   var m = Math.pow(10, digit);
-//   return parseInt(f * m, 10) / m;
+//   return parseInt(f * m, 10) / m;
 // }
-export function formatNum(value, n) {
-  console.log(value, n,'====')
-  var f = Math.round(value*Math.pow(10,n))/Math.pow(10,n);
-  var s = f.toString();
-  var rs = s.indexOf('.');
-  if(rs < 0) {
-    if(n==0){
-      s = s
-    }else{
-      s += '.';
-    }
-  }
-  for(var i = s.length - s.indexOf('.'); i <= n; i++){
-    s += "0";
-  }
+export function formatNum(value, n) {
+  console.log(value, n,'====')
+  var f = Math.round(value*Math.pow(10,n))/Math.pow(10,n);
+  var s = f.toString();
+  var rs = s.indexOf('.');
+  if(rs < 0) {
+    if(n==0){
+      s = s
+    }else{
+      s += '.';
+    }
+  }
+  for(var i = s.length - s.indexOf('.'); i <= n; i++){
+    s += "0";
+  }
   return s;
 }
 
@@ -438,4 +446,4 @@ export function whichWeek(year) {
         arr[arr.length - 1].last = yearDay(+new Date(year + 1, 0, 1) / 1000 - 86400)
       }
       return arr
-    }
+    }

src/components/ChartTable.vue

@@ -118,7 +118,7 @@ export default {
       })
     },
 
-    handleSearch() {
+    form_search() {
       if (this.table.getdataListParm.parammaps.operatetime == '' || this.table.getdataListParm.parammaps.operatetime == null ) {
         this.table.getdataListParm.parammaps.operatetime = ''
       } else {

src/components/index.vue

@@ -12,7 +12,7 @@
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
           <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
@@ -64,7 +64,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="10" class="dashboard-editor-container">
-            <el-col :span="12">
+            <el-col :span="12">
               <div class="grid-content">
                 <h4 style="text-align:center;">泌乳牛干物质采食量</h4>
                 <div v-if="tab.chart1.isChart" class="button">
@@ -99,10 +99,10 @@
                 </div>
               </div>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12">
               <div class="grid-content">
                 <h4 style="text-align:center;">牛栏剩料率</h4>
-                <div v-if="tab.chart2.isChart" class="button">
+                <div v-if="tab.chart2.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart2.getdataListParm.parammaps.statisticsList" :option="tab.chart2.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart2" />
                   <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
                   <div class="exportTable" @click="handleExport('chart2')">导出</div>
@@ -139,7 +139,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="10" class="dashboard-editor-container">
-            <el-col :span="12">
+            <el-col :span="12">
               <div class="grid-content">
                 <h4 style="text-align:center;">混料时间统计</h4>
                 <div v-if="tab.chart3.isChart" class="button">
@@ -170,15 +170,15 @@
                     <el-table-column label="日期" min-width="110px" align="center" prop="日期" />
                     <el-table-column label="混料时间（分钟）" min-width="110px" align="center" prop="field1" />
                   </el-table>
-                </div>
+                </div>
               </div>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12">
               <div class="grid-content">
                 <h4 style="text-align:center;">转化率</h4>
-                <div v-if="tab.chart4.isChart" class="button">
-                  <!-- <span>{{ tab.chart4.statisticsList }}</span> -->
-                  <my-select ref="tenantselect" :model="tab.chart4.getdataListParm.parammaps.statisticsList" :option="tab.chart4.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart4" />
+                <div v-if="tab.chart4.isChart" class="button">
+                  <!-- <span>{{ tab.chart4.statisticsList }}</span> -->
+                  <my-select ref="tenantselect" :model="tab.chart4.getdataListParm.parammaps.statisticsList" :option="tab.chart4.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart4" />
                   <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart4')" />
                   <div class="exportTable" @click="handleExport('chart4')">导出</div>
                   <div class="exportTable" @click="handleTable('chart4')">切换表格</div>
@@ -207,16 +207,16 @@
                     <el-table-column label="配方名称" min-width="110px" align="center" prop="名称" />
                     <el-table-column label="饲料转化率" min-width="110px" align="center" prop="准确率" />
                   </el-table>
-                </div>
+                </div>
               </div>
             </el-col>
           </el-row>
 
           <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
-            <el-col :span="24">
+            <el-col :span="24">
               <div class="grid-content">
                 <h4 style="text-align:center;">成本分析</h4>
-                <div v-if="tab.chart5.isChart" class="button">
+                <div v-if="tab.chart5.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart5.getdataListParm.parammaps.statisticsList" :option="tab.chart5.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart5" />
                   <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
                   <div class="exportTable" @click="handleExport('chart5')">导出</div>
@@ -246,7 +246,7 @@
                     <el-table-column label="牲畜类别" min-width="110px" align="center" prop="名称" />
                     <el-table-column label="公斤奶饲料成本（元）" min-width="110px" align="center" prop="准确率" />
                   </el-table>
-                </div>
+                </div>
               </div>
             </el-col>
 
@@ -394,7 +394,7 @@ import Cookies from 'js-cookie'
 import { parseTime } from '@/utils/index.js'
 import Pagination from '@/components/Pagination'
 import { json2excel } from '@/utils/index.js'
-import { MessageBox } from 'element-ui'
+import { MessageBox } from 'element-ui'
 import mySelect from '@/components/mySelect'
 export default {
   name: 'PastureFeedingEfficiency',
@@ -805,7 +805,7 @@ export default {
         this.tab.table.getdataListParm.parammaps.cowclass = ''
         this.tab.table.getdataListParm.name = 'getFeedEfficiencyFT'
         this.getTabList()
-        // this.tab.chart5.statisticsList = []
+        // this.tab.chart5.statisticsList = []
         this.$set(this.tab.chart5, 'statisticsList', [])
         this.tab.chart5.getdataListParm.name = 'getFeedEffCBFT'
         this.getChart5()
@@ -823,11 +823,11 @@ export default {
         this.tab.table.getdataListParm.parammaps.cowclass = ''
         this.tab.table.getdataListParm.name = 'getFeedEfficiencyLS'
         this.getTabList()
-        // this.tab.chart5.statisticsList = []
+        // this.tab.chart5.statisticsList = []
         this.$set(this.tab.chart5, 'statisticsList', [])
         this.tab.chart5.getdataListParm.name = 'getFeedEffCBLS'
-        this.getChart5()
-        this.$set(this.tab.chart4, 'statisticsList', [])
+        this.getChart5()
+        this.$set(this.tab.chart4, 'statisticsList', [])
         // this.tab.chart4.statisticsList = []
         this.tab.chart4.getdataListParm.name = 'getFeedEffZHLS'
         this.getChart4()
@@ -844,7 +844,7 @@ export default {
         this.getTabList()
         this.$set(this.tab.chart5, 'statisticsList', [])
         this.tab.chart5.getdataListParm.name = 'getFeedEffCB'
-        this.getChart5()
+        this.getChart5()
         this.$set(this.tab.chart4, 'statisticsList', [])
         this.tab.chart4.getdataListParm.name = 'getFeedEffZHSC'
         this.getChart4()
@@ -868,7 +868,7 @@ export default {
       })
     },
     // 查询
-    handleSearch() {
+    form_search() {
       if (this.tab.radio == '1') {
         console.log('配方名称/查询')
         this.tab.isFormulaName = true
@@ -894,7 +894,7 @@ export default {
     },
     // 快速跳转到图表
     handleQuickJumpChart() {
-      var myHeight = document.getElementById('table').offsetHeight + 120
+      var myHeight = document.getElementById('table').offsetHeight + 120
       window.scrollTo(myHeight, myHeight)
     },
     // 快速回到顶部
@@ -937,14 +937,14 @@ export default {
       this.tab.chart1.listLoading = true
       GetReportform(this.tab.chart1.getdataListParm).then(response => {
         console.log('泌乳牛干物质采食量图表数据', response.data.list)
-        if (response.data.list !== null) {
-          for (let i = 0; i < response.data.data.length; i++) {
-            if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
-              response.data.data[i].field1 = parseFloat(response.data.data[i].field1)
-            }
-            if (response.data.data[i].field2 !== '' && response.data.data[i].field2 !== undefined) {
-              response.data.data[i].field2 = parseFloat(response.data.data[i].field2)
-            }
+        if (response.data.list !== null) {
+          for (let i = 0; i < response.data.data.length; i++) {
+            if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
+              response.data.data[i].field1 = parseFloat(response.data.data[i].field1)
+            }
+            if (response.data.data[i].field2 !== '' && response.data.data[i].field2 !== undefined) {
+              response.data.data[i].field2 = parseFloat(response.data.data[i].field2)
+            }
           }
           this.tab.chart1.table.list = response.data.data
           this.tab.chart1.chartLine_data = response.data.list
@@ -1026,13 +1026,13 @@ export default {
     },
 
     // 牛栏剩料率
-    changeStatisticChart2(arr) {
-      var arr1 = []
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i] !== 'all') {
-          arr1.push(arr[i])
-        }
-      }
+    changeStatisticChart2(arr) {
+      var arr1 = []
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i] !== 'all') {
+          arr1.push(arr[i])
+        }
+      }
       this.tab.chart2.getdataListParm.parammaps.statisticsList = arr1
       var arrData3 = []
       for (let i = 0; i < this.tab.chart2.getdataListParm.parammaps.statisticsList.length; i++) {
@@ -1052,17 +1052,17 @@ export default {
       this.tab.chart2.listLoading = true
       GetReportform(this.tab.chart2.getdataListParm).then(response => {
         console.log('转化率图表数据', response.data.list)
-        if (response.data.list !== null) {
-          for (let i = 0; i < response.data.data.length; i++) {
-            if (response.data.data[i].剩料量 !== '' && response.data.data[i].剩料量 !== undefined) {
-              response.data.data[i].剩料量 = parseFloat(response.data.data[i].剩料量)
-            }
-            if (response.data.data[i].撒料量 !== '' && response.data.data[i].撒料量 !== undefined) {
-              response.data.data[i].撒料量 = parseFloat(response.data.data[i].撒料量)
-            }
-            if (response.data.data[i].准确率 !== '' && response.data.data[i].准确率 !== undefined) {
-              response.data.data[i].准确率 = parseFloat(response.data.data[i].准确率)
-            }
+        if (response.data.list !== null) {
+          for (let i = 0; i < response.data.data.length; i++) {
+            if (response.data.data[i].剩料量 !== '' && response.data.data[i].剩料量 !== undefined) {
+              response.data.data[i].剩料量 = parseFloat(response.data.data[i].剩料量)
+            }
+            if (response.data.data[i].撒料量 !== '' && response.data.data[i].撒料量 !== undefined) {
+              response.data.data[i].撒料量 = parseFloat(response.data.data[i].撒料量)
+            }
+            if (response.data.data[i].准确率 !== '' && response.data.data[i].准确率 !== undefined) {
+              response.data.data[i].准确率 = parseFloat(response.data.data[i].准确率)
+            }
           }
           this.tab.chart2.table.list = response.data.data
           this.tab.chart2.chartLine_data = response.data.list
@@ -1221,22 +1221,22 @@ export default {
     },
 
     // 转化率
-    changeStatisticChart4(arr) {
-      var arr1 = []
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i] !== 'all') {
-          arr1.push(arr[i])
-        }
-      }
-      this.tab.chart4.getdataListParm.parammaps.statisticsList = arr1
-      var arrData3 = []
-      for (let i = 0; i < this.tab.chart4.getdataListParm.parammaps.statisticsList.length; i++) {
-        const myId = this.tab.chart4.statisticsList.find(obj => obj.name == this.tab.chart4.getdataListParm.parammaps.statisticsList[i]).id
-        for (let j = 0; j < this.tab.chart4.chart4Data3.length; j++) {
-          if (j == myId) {
-            arrData3.push(this.tab.chart4.chart4Data3[j])
-          }
-        }
+    changeStatisticChart4(arr) {
+      var arr1 = []
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i] !== 'all') {
+          arr1.push(arr[i])
+        }
+      }
+      this.tab.chart4.getdataListParm.parammaps.statisticsList = arr1
+      var arrData3 = []
+      for (let i = 0; i < this.tab.chart4.getdataListParm.parammaps.statisticsList.length; i++) {
+        const myId = this.tab.chart4.statisticsList.find(obj => obj.name == this.tab.chart4.getdataListParm.parammaps.statisticsList[i]).id
+        for (let j = 0; j < this.tab.chart4.chart4Data3.length; j++) {
+          if (j == myId) {
+            arrData3.push(this.tab.chart4.chart4Data3[j])
+          }
+        }
       }
       this.tab.chart4.chartLine_data.data3 = arrData3
       this.tab.chart4.chartLine_data.data1 = this.tab.chart4.getdataListParm.parammaps.statisticsList
@@ -1249,8 +1249,8 @@ export default {
         if (response.data.list !== null) {
           this.tab.chart4.table.list = response.data.data
           this.tab.chart4.chartLine_data = response.data.list
-          this.tab.chart4.total = response.data.total
-          this.$set(this.tab.chart4, 'statisticsList', [])
+          this.tab.chart4.total = response.data.total
+          this.$set(this.tab.chart4, 'statisticsList', [])
           this.$set(this.tab.chart4.getdataListParm.parammaps, 'statisticsList', [])
 
           for (let i = 0; i < response.data.list.data1.length; i++) {
@@ -1261,10 +1261,10 @@ export default {
             obj.id = i
             obj.name = response.data.list.data1[i]
             this.tab.chart4.statisticsList.push(obj)
-          }
+          }
           this.tab.chart4.chart4Data3 = response.data.list.data3
           this.tab.chart4.total = response.data.total
-          console.log('转化率图数据-下拉数据', this.tab.chart4.statisticsList)
+          console.log('转化率图数据-下拉数据', this.tab.chart4.statisticsList)
           console.log('转化率图数据-下拉数据', this.tab.chart4.getdataListParm.parammaps.statisticsList)
           console.log('转化率图数据', this.tab.chart4.chartLine_data)
           console.log('转化率表数据', this.tab.chart4.table.list)
@@ -1277,7 +1277,7 @@ export default {
               }
             }
           }
-          console.log(arrData3, 'woyaokankan2')
+          console.log(arrData3, 'woyaokankan2')
           // this.tab.chart4.statisticsList
           this.tab.chart4.chartLine_data.data3 = arrData3
           this.tab.chart4.chartLine_data.data1 = this.tab.chart4.getdataListParm.parammaps.statisticsList
@@ -1341,13 +1341,13 @@ export default {
     },
 
     // 成本分析
-    changeStatisticChart5(arr) {
-      var arr1 = []
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i] !== 'all') {
-          arr1.push(arr[i])
-        }
-      }
+    changeStatisticChart5(arr) {
+      var arr1 = []
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i] !== 'all') {
+          arr1.push(arr[i])
+        }
+      }
       this.tab.chart5.getdataListParm.parammaps.statisticsList = arr1
       var arrData3 = []
       for (let i = 0; i < this.tab.chart5.getdataListParm.parammaps.statisticsList.length; i++) {
@@ -1709,18 +1709,18 @@ export default {
 
   }
 }
-</script>
-<style lang="scss" scoped>
-  .button{
-    height: 50px;
-    .exportTable{float: right;margin-right: 5px;}
-  }
-  .app-container1{padding-left: 10px;background-color: #F4F4F4;}
-  .dashboard-editor-container {
-    background-color: #F4F4F4;
-    .grid-content{
-      background-color:#fff;padding: 0 10px;
-      h4{text-align: center;line-height: 50px;}
-    }
-  }
+</script>
+<style lang="scss" scoped>
+  .button{
+    height: 50px;
+    .exportTable{float: right;margin-right: 5px;}
+  }
+  .app-container1{padding-left: 10px;background-color: #F4F4F4;}
+  .dashboard-editor-container {
+    background-color: #F4F4F4;
+    .grid-content{
+      background-color:#fff;padding: 0 10px;
+      h4{text-align: center;line-height: 50px;}
+    }
+  }
 </style>

src/views/basicData/driver/index.vue

@@ -6,12 +6,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-    </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    </div>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
 
     <div class="table">
@@ -57,15 +57,15 @@
           <template slot-scope="{row}">
             <!-- 新增 -->
             <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-            <span v-if="row.isCreate" class="centerSpan">|</span>
+            <span v-if="row.isCreate" class="centerSpan">|</span>
             <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
             <!-- 编辑 -->
             <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
             <!-- 编辑保存 -->
             <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
             <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
           </template>
         </el-table-column>
@@ -118,7 +118,7 @@ export default {
     }
   },
 
-  created() {
+  created() {
     // console.log(VUE_APP_BASE_pageCount)
     console.log(this.VUE_APP_BASE_pageCount, 'this.VUE_APP_BASE_pageCount')
     this.getList()
@@ -148,7 +148,7 @@ export default {
           this.table.pageSize = response.data.pageSize
         } else {
           this.table.list = []
-        }
+        }
         this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
@@ -159,7 +159,7 @@ export default {
       console.log('点击了是否启用')
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -203,7 +203,7 @@ export default {
       }
       this.isokDisable = true
       setTimeout(() => {
-        this.isokDisable = false
+        this.isokDisable = false
       }, 1000)
       this.requestParam.name = 'insertDriver'
       this.requestParam.parammaps = this.table.temp
@@ -318,7 +318,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择驾驶员信息', duration: 2000 })

src/views/basicData/equipmentTMR/index.vue

@@ -8,12 +8,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -228,7 +228,7 @@ export default {
           this.table.pageSize = response.data.pageSize
         } else {
           this.table.list = []
-        }
+        }
         this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
@@ -238,7 +238,7 @@ export default {
     handleEnableChange() {
       console.log('点击了是否启用')
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -560,7 +560,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择TMR设备信息', duration: 2000 })

src/views/basicData/feedClassification/index.vue

@@ -9,12 +9,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -178,7 +178,7 @@ export default {
       console.log('点击了是否启用')
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -388,7 +388,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择饲料分类信息', duration: 2000 })

src/views/basicData/feedTable/index.vue

@@ -27,18 +27,18 @@
           <li>
             <div style="float: right;">
               <el-button class="downminCancel" @click="arrowUp=false;arrowDown=true;">取消</el-button>
-              <el-button class="miniPrimary" @click="handleSearch">搜索</el-button>
+              <el-button class="miniPrimary" @click="form_search">搜索</el-button>
             </div>
           </li>
         </ul>
       </div>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation" ref="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleGetSapCode">获取SAP编码</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
       <el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">饲料库</el-button>
       <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" class="success" @click="handleChangeOrder">更改顺序</el-button>
        <div v-else style="display: inline-block;">
@@ -72,19 +72,19 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         row-key="id"
-        @selection-change="handleSelectionChange"
-        :max-height="myHeight"
-        use-virtual
-        @table-body-scroll="tableScroll"
+        @selection-change="handleSelectionChange"
+        :max-height="myHeight"
+        use-virtual
+        @table-body-scroll="tableScroll"
         :row-height="rowHeight"
       >
         <u-table-column type="selection" align="center" width="50" fixed="left" />
         <u-table-column label="序号" type="index" align="center" width="50" fixed="left"/>
         <u-table-column label="饲料名称" min-width="80px" align="center" prop="fname" fixed="left"/>
-        <u-table-column label="饲料分类" min-width="80px" align="center" prop="fclass" fixed="left"/>
-        <u-table-column label="物料类型" min-width="90px" align="center" prop="materialtyp" />
+        <u-table-column label="饲料分类" min-width="80px" align="center" prop="fclass" fixed="left"/>
+        <u-table-column label="物料类型" min-width="90px" align="center" prop="materialtyp" />
         <!-- <u-table-column label="SAP货位" min-width="90px" align="center" prop="goods" /> -->
-        <u-table-column label="唯一编码" min-width="80px" align="center" prop="feedcode" />
+        <u-table-column label="唯一编码" min-width="80px" align="center" prop="feedcode" />
         <!-- <u-table-column label="SAP编码" min-width="90px" align="center" prop="sapcode" /> -->
         <u-table-column label="饲料来源" min-width="80px" align="center" prop="source" />
         <u-table-column label="计划类型" min-width="80px" align="center" prop="printgroup" />
@@ -101,7 +101,7 @@
             <span v-if="scope.row.jmp == 0">否</span>
             <span v-else>是</span>
           </template>
-        </u-table-column>
+        </u-table-column>
         <u-table-column label="备用字段01" min-width="90px" align="center" prop="backup1" />
         <u-table-column label="备用字段02" min-width="90px" align="center" prop="backup2" />
         <u-table-column label="备用字段03" min-width="90px" align="center" prop="backup3" />
@@ -191,29 +191,29 @@
                 <el-input ref="uprice" v-model="create.temp.uprice"  class="filter-item" placeholder="最多俩位小数" type="number" step="0.01" style="width: 100%;" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="物料类型：" prop="materialtype">
-                <el-select v-model="create.temp.materialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in materialtypeList" :key="item.id" :label="item.mixname" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="SAP货位：" prop="goods">
-                <el-select v-model="create.temp.goods" filterable placeholder="SAP货位" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in sapGoodsList" :key="item.id" :label="item.mixname" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="SAP编码：" prop="sapcode">
-                <el-select v-model="create.temp.sapcode" filterable placeholder="SAP编码" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in sapCodeList" :key="item.id" :label="item.mixname" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="物料类型：" prop="materialtype">
+                <el-select v-model="create.temp.materialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
+                  <el-option v-for="item in materialtypeList" :key="item.id" :label="item.mixname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="SAP货位：" prop="goods">
+                <el-select v-model="create.temp.goods" filterable placeholder="SAP货位" class="filter-item" style="width: 100%;">
+                  <el-option v-for="item in sapGoodsList" :key="item.id" :label="item.mixname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="SAP编码：" prop="sapcode">
+                <el-select v-model="create.temp.sapcode" filterable placeholder="SAP编码" class="filter-item" style="width: 100%;">
+                  <el-option v-for="item in sapCodeList" :key="item.id" :label="item.mixname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -656,60 +656,60 @@
         </div>
       </div>
     </el-dialog>
-    <!-- 获取SAP编码 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="sapCode.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[sapCode.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
-      <div class="app-add">
-        <div class="search" ref="search">
-          <el-input v-model="sapCode.table.getdataListParm.parammaps.MAKTX" placeholder="原料名称" style="width: 130px;" class="filter-item" clearable />
-          <el-button class="successBorder" @click="handleSapCodeSearch">查询</el-button>
-        </div>
-        <div class="table">
-          <u-table
-            id="saptable"
-            ref="saptable"
-            :key="sapCode.table.tableKey"
-            v-loading="sapCode.table.listLoading"
-            element-loading-text="给我一点时间"
-            border
-            fit
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
-            row-key="id"
-            @selection-change="handleSapCodeSelectionChange"
-            :max-height="myHeight"
-            use-virtual
-            @table-body-scroll="tableScroll"
-            :row-height="rowHeight"
-          >
-            <u-table-column type="selection" align="center" width="50"/>
-            <u-table-column label="物料号" min-width="80px" align="center" prop="MATNR"/>
-            <u-table-column label="物料类型" min-width="90px" align="center" prop="MTART" />
-            <u-table-column label="物料组" min-width="80px" align="center" prop="MATKL"/>
-            <u-table-column label="物料描述" min-width="90px" align="center" prop="MAKTX" />
-            <u-table-column label="最后修改日期" min-width="80px" align="center" prop="LAEDA" />
-          </u-table>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="sapCode.dialogFormVisible = false;getList()">关闭</el-button>
-          <el-button v-if="sapCode.dialogStatus==='sapCode' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData()">确认</el-button>
-        </div>
-      </div>
-    </el-dialog>
+    <!-- 获取SAP编码 -->
+    <el-dialog :fullscreen="dialogFull" :visible.sync="sapCode.dialogFormVisible" :close-on-click-modal="false" width="90%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[sapCode.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="app-add">
+        <div class="search" ref="search">
+          <el-input v-model="sapCode.table.getdataListParm.parammaps.MAKTX" placeholder="原料名称" style="width: 130px;" class="filter-item" clearable />
+          <el-button class="successBorder" @click="handleSapCodeSearch">查询</el-button>
+        </div>
+        <div class="table">
+          <u-table
+            id="saptable"
+            ref="saptable"
+            :key="sapCode.table.tableKey"
+            v-loading="sapCode.table.listLoading"
+            element-loading-text="给我一点时间"
+            border
+            fit
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable table-fixed"
+            row-key="id"
+            @selection-change="handleSapCodeSelectionChange"
+            :max-height="myHeight"
+            use-virtual
+            @table-body-scroll="tableScroll"
+            :row-height="rowHeight"
+          >
+            <u-table-column type="selection" align="center" width="50"/>
+            <u-table-column label="物料号" min-width="80px" align="center" prop="MATNR"/>
+            <u-table-column label="物料类型" min-width="90px" align="center" prop="MTART" />
+            <u-table-column label="物料组" min-width="80px" align="center" prop="MATKL"/>
+            <u-table-column label="物料描述" min-width="90px" align="center" prop="MAKTX" />
+            <u-table-column label="最后修改日期" min-width="80px" align="center" prop="LAEDA" />
+          </u-table>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="cancelClose" @click="sapCode.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button v-if="sapCode.dialogStatus==='sapCode' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData()">确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 
 </template>
@@ -748,7 +748,7 @@ export default {
     }
   },
   data() {
-    return {
+    return {
       rowHeight: 30,
       dialogFull: false,
       isInforvalue: false,
@@ -791,9 +791,9 @@ export default {
       feedTypeList: [], // 饲料分类
       planTypeList: [], // 计划类型
       smallMaterialList: [], // 小料秤
-      jmpList: [{ id: '0', name: '否' }, { id: '1', name: '是' }], // 无上域
-      materialtypeList:[],//物料类型
-      sapGoodsList:[],//sap货位
+      jmpList: [{ id: '0', name: '否' }, { id: '1', name: '是' }], // 无上域
+      materialtypeList:[],//物料类型
+      sapGoodsList:[],//sap货位
       sapCodeList:[],//sap编码
       table: {
         tableKey: 0,
@@ -888,27 +888,27 @@ export default {
         temp: {},
         rules: {}
       },
-
-      sapCode:{
-        dialogFormVisible: false,
-        dialogStatus: '',
-        selectList:[],
-        table: {
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: false,
-          getdataListParm: {
-            name: 'getFeedSap',
-            page: 1,
-            offset: 1,
-            pagecount: '',
-            returntype: 'Map',
-            parammaps: {
-              MAKTX:''
-            }
-          }
-        }
+
+      sapCode:{
+        dialogFormVisible: false,
+        dialogStatus: '',
+        selectList:[],
+        table: {
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: false,
+          getdataListParm: {
+            name: 'getFeedSap',
+            page: 1,
+            offset: 1,
+            pagecount: '',
+            returntype: 'Map',
+            parammaps: {
+              MAKTX:''
+            }
+          }
+        }
       },
       textMap: {
         create: '新增',
@@ -1153,7 +1153,7 @@ export default {
       this.table.listLoading = true
       GetDataByName(this.table.getdataListParm).then(response => {
         console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
+        if (response.data.list !== null) {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
@@ -1166,12 +1166,12 @@ export default {
           this.table.listLoading = false
         }, 100)
       })
-    },
-    tableScroll ({scrollTop, scrollLeft, table, judgeFlse}) {
-      // {scrollTop， scrollLeft, table, judgeFlse: 这个参数返回一个boolean值，为true则代表表格滚动到了底部了，false没有滚动到底部，必须开起大数据渲染模式才能有值哦}, event
-      console.log(scrollTop, scrollLeft, table, judgeFlse)
     },
-    handleSearch() {
+    tableScroll ({scrollTop, scrollLeft, table, judgeFlse}) {
+      // {scrollTop， scrollLeft, table, judgeFlse: 这个参数返回一个boolean值，为true则代表表格滚动到了底部了，false没有滚动到底部，必须开起大数据渲染模式才能有值哦}, event
+      console.log(scrollTop, scrollLeft, table, judgeFlse)
+    },
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -1714,7 +1714,7 @@ export default {
       this.selectList = val
     },
     // 多项删除
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择饲料表信息', duration: 2000 })
@@ -1812,34 +1812,34 @@ export default {
         }
       })
     },
-    handleGetSapCode(){
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择一条信息', duration: 2000 })
-      } else {
-        this.dialogFull = false
-        this.sapCode.dialogStatus = 'sapCode'
-        this.sapCode.dialogFormVisible = true
-        this.sapCode.table.getdataListParm.parammaps.MAKTX = this.selectList[0].sapcode
-        this.getsapCodeList()
-      }
-    },
-    getsapCodeList(){
-      GetDataByName(this.sapCode.table.getdataListParm).then(response => {
-        if (response.data.list !== null) {
-          this.sapCode.table.list = response.data.list
-        } else {
-          this.sapCode.table.list = []
-        }
-         this.$refs.saptable.reloadData(this.sapCode.table.list)
-      })
-    },
+    handleGetSapCode(){
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择一条信息', duration: 2000 })
+      } else {
+        this.dialogFull = false
+        this.sapCode.dialogStatus = 'sapCode'
+        this.sapCode.dialogFormVisible = true
+        this.sapCode.table.getdataListParm.parammaps.MAKTX = this.selectList[0].sapcode
+        this.getsapCodeList()
+      }
+    },
+    getsapCodeList(){
+      GetDataByName(this.sapCode.table.getdataListParm).then(response => {
+        if (response.data.list !== null) {
+          this.sapCode.table.list = response.data.list
+        } else {
+          this.sapCode.table.list = []
+        }
+         this.$refs.saptable.reloadData(this.sapCode.table.list)
+      })
+    },
     handleSapCodeSearch(){},
-    sapCodeData(){
-
-    },
-    handleSapCodeSelectionChange(val){
-      this.sapCode.selectList = val
-      console.log(this.sapCode.selectList,'this.sapCode.selectList')
+    sapCodeData(){
+
+    },
+    handleSapCodeSelectionChange(val){
+      this.sapCode.selectList = val
+      console.log(this.sapCode.selectList,'this.sapCode.selectList')
     }
   }
 }

src/views/basicData/forkliftManagement/index.vue

@@ -6,12 +6,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-form ref="form" :rules="table.rules" :model="table">
@@ -200,7 +200,7 @@ export default {
       this.table.temp.tclassname = this.equipmentTypeList.find(obj => obj.id == item).name
       console.log(this.table.temp)
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -440,7 +440,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择设备信息', duration: 2000 })

src/views/basicData/groupColumn/index.vue

@@ -22,17 +22,17 @@
           <li>
             <div style="float: right;">
               <el-button class="downminCancel" @click="arrowUp=false;arrowDown=true;">取消</el-button>
-              <el-button class="miniPrimary" @click="handleSearch">搜索</el-button>
+              <el-button class="miniPrimary" @click="form_search">搜索</el-button>
             </div>
           </li>
         </ul>
       </div>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" style="float:left;" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" style="float:left;" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" style="float:left;" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
       <el-button v-if="isOrder && isRoleEdit" style="float:left;" icon="el-icon-sort" class="success" @click="handleChangeOrder">更改顺序</el-button>
        <div v-else style="float:left;margin-left: 10px;">
         <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存</el-button>
@@ -141,12 +141,12 @@ export default {
     return {
       isRoleEdit: [],
       requestParams: [
-        { name: 'getDictByName', offset: 0, pagecount: 0, params: ['跳转延时'] },
-        { name: 'getBarClass', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} },
+        { name: 'getDictByName', offset: 0, pagecount: 0, params: ['跳转延时'] },
+        { name: 'getBarClass', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} },
         { name: 'getScopeherd', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} }
       ],
       enableList: [{ id: '1', name: '是' }, { id: '0', name: '否' }],
-      jumpDelayList: [],
+      jumpDelayList: [],
       barClassList:[],
       scopeherdList:[],
 
@@ -212,8 +212,8 @@ export default {
     },
     getDownList() {
       GetDataByNames(this.requestParams).then(response => {
-        this.jumpDelayList = response.data.getDictByName.list
-        this.barClassList = response.data.getBarClass.list
+        this.jumpDelayList = response.data.getDictByName.list
+        this.barClassList = response.data.getBarClass.list
         this.scopeherdList = response.data.getScopeherd.list
       })
     },
@@ -247,7 +247,7 @@ export default {
     handleConfirmStartChange() {
       console.log('点击了确认开始')
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -300,15 +300,15 @@ export default {
       this.table.temp.isstart = row.isstart
       this.table.temp.enable = row.enable
       // 检验用户名称/角色是否为空
-      if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: '栏舍名称/栏舍编号/牛舍类型/牛群不能为空', duration: 2000 })
-        return false
-      }else if (this.table.temp.bname == '') {
-        this.$message({ type: 'error', message: '栏舍名称不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
-        return false
+      if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
+        this.$message({ type: 'error', message: '栏舍名称/栏舍编号/牛舍类型/牛群不能为空', duration: 2000 })
+        return false
+      }else if (this.table.temp.bname == '') {
+        this.$message({ type: 'error', message: '栏舍名称不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.bcode == '') {
+        this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
+        return false
       }
       
       // if (this.table.temp.bcode.length > 8) {
@@ -408,16 +408,16 @@ export default {
       this.table.temp.isstart = row.isstart
       this.table.temp.enable = row.enable
       this.table.temp.id = row.id
-      // 检验用户名称/角色是否为空
-      if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: '栏舍名称/栏舍编号不能为空', duration: 2000 })
-        return false
-      }else if (this.table.temp.bname == '') {
-        this.$message({ type: 'error', message: '栏舍名称不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
-        return false
+      // 检验用户名称/角色是否为空
+      if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
+        this.$message({ type: 'error', message: '栏舍名称/栏舍编号不能为空', duration: 2000 })
+        return false
+      }else if (this.table.temp.bname == '') {
+        this.$message({ type: 'error', message: '栏舍名称不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.bcode == '') {
+        this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
+        return false
       }
       if (this.table.temp.allowratio !== '') {
         console.log(this.table.temp.allowratio)
@@ -514,7 +514,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择舍组栏信息', duration: 2000 })

src/views/basicData/livestockCategory/index.vue

@@ -8,12 +8,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-form ref="form" :rules="table.rules" :model="table">
@@ -180,7 +180,7 @@ export default {
     handleEnableChange(val) {
       console.log('点击了是否启用', val)
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -397,7 +397,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择牲畜类别信息', duration: 2000 })

src/views/basicData/managementGPS/index.vue

@@ -6,12 +6,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-form ref="form" :rules="table.rules" :model="table">
@@ -191,7 +191,7 @@ export default {
     handleEnableChange() {
       console.log('点击了是否启用')
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -377,7 +377,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择信息', duration: 2000 })

src/views/basicData/supplier/index.vue

@@ -6,12 +6,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -174,7 +174,7 @@ export default {
       console.log('点击了是否启用')
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -377,7 +377,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择供应商信息', duration: 2000 })

src/views/console/apisql/index.vue

@@ -96,9 +96,9 @@
           <el-table-column label="操作" header-align="center" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
               <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-              <span class="centerSpan">|</span>
-              <el-button v-if="row.status!='已删'" class="miniDanger" icon="el-icon-delete" @click="handleDelete(row)" />
-              <span class="centerSpan">|</span>
+              <span class="centerSpan">|</span>
+              <el-button v-if="row.status!='已删'" class="miniDanger" icon="el-icon-delete" @click="form_delete(row)" />
+              <span class="centerSpan">|</span>
               <el-button icon="el-icon-copy-document" class="miniSuccess" @click="handleCopy(row)" />
             </template>
           </el-table-column>
@@ -585,7 +585,7 @@ export default {
         })
       })
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('sql名称：' + row.sqlname, '确认删除？', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',

src/views/console/dept/index.vue

@@ -69,7 +69,7 @@
             <el-button type="primary" size="mini" @click="handleUpdate(row)">
               编辑
             </el-button>
-            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">
+            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">
               删除
             </el-button>
           </template>
@@ -416,7 +416,7 @@ export default {
         })
       })
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('部门名称：' + row.deptname, '确认删除？', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',

src/views/console/dict/index.vue

@@ -83,7 +83,7 @@
           <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
               <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-              <el-button v-if="row.status!='已删'" class="miniDanger" icon="el-icon-delete" @click="handleDelete(row)" />
+              <el-button v-if="row.status!='已删'" class="miniDanger" icon="el-icon-delete" @click="form_delete(row)" />
             </template>
           </el-table-column>
         </el-table>
@@ -375,7 +375,7 @@ export default {
         })
       })
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称：' + row.label, '确认删除？', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',

src/views/console/menu/index.vue

@@ -70,8 +70,8 @@
         <el-table-column label="操作" header-align="center" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span class="centerSpan">|</span>
-            <el-button v-if="row.status!='已删'" class="miniDanger" icon="el-icon-delete" @click="handleDelete(row)" />
+            <span class="centerSpan">|</span>
+            <el-button v-if="row.status!='已删'" class="miniDanger" icon="el-icon-delete" @click="form_delete(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -446,7 +446,7 @@ export default {
         })
       })
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('菜单名称：' + row.name, '确认删除？', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',

src/views/console/role/index.vue

@@ -52,7 +52,7 @@
             <el-button type="warning" size="mini" @click="handleMenu(row)">菜单</el-button>
             <el-button type="warning" size="mini" style="width:70px" @click="handleDataRole(row)">数据权限</el-button>
             <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
-            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -394,7 +394,7 @@ export default {
         })
       })
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称：' + row.name, '确认删除？', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',

src/views/console/user/index.vue

@@ -56,7 +56,7 @@
           <template slot-scope="{row}">
             <el-button type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
             <el-button type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
-            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -416,7 +416,7 @@ export default {
         })
       })
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除？', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',

src/views/customboard/addboard/dashboardItem.vue

@@ -54,7 +54,7 @@
             </div>
             <div>
               <i v-show="mode === 'edit' || mode === 'create' " class="el-icon-edit" @click="handleEdit(getChartItem(item.i))" />
-              <i v-show="mode === 'edit' || mode === 'create' " class="el-icon-delete" @click="handleDelete(getChartItem(item.i))" />
+              <i v-show="mode === 'edit' || mode === 'create' " class="el-icon-delete" @click="form_delete(getChartItem(item.i))" />
               <el-tooltip :content="getChartItem(item.i).desc" class="item" effect="dark" placement="top-end">
                 <i class="el-icon-info" style="color:#009C69;cursor:pointer;" />
               </el-tooltip>
@@ -469,7 +469,7 @@ export default {
       localStorage.setItem('ChartPanelIsEditId', chart.chart_id)
     },
 
-    // handleDelete(chart) {
+    // form_delete(chart) {
     //   this.$confirm(this.$t('dashboard.removeChartConfirm'), this.$t('common.confirm'), {
     //     type: 'warning'
     //   }).then(() => {
@@ -491,7 +491,7 @@ export default {
     //     })
     //   })
     // },
-    handleDelete(chart) {
+    form_delete(chart) {
       this.$confirm(this.$t('dashboard.removeChartConfirm'), this.$t('common.confirm'), {
         type: 'warning'
       }).then(() => {

src/views/formulationPlan/dailyExecutionPlan/typePage/premixedPlan.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="operation">
       <el-button class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增车次</el-button>
-      <el-button class="danger" icon="el-icon-delete" style="float: left;" @click="handleDelete">减少车次</el-button>
+      <el-button class="danger" icon="el-icon-delete" style="float: left;" @click="form_delete">减少车次</el-button>
     </div>
     <div class="search" />
 
@@ -551,7 +551,7 @@ export default {
       })
     },
     // 减少车次
-    handleDelete() {
+    form_delete() {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {

src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue

@@ -3,7 +3,7 @@
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增车次
       </el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleDelete">减少车次
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="form_delete">减少车次
       </el-button>
       <el-button v-if="isRoleEdit" class="success" style="float: left;" @click="handleCheck">校验</el-button>
       <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success"
@@ -1362,7 +1362,7 @@ export default {
       })
     },
     // 减少车次
-    handleDelete() {
+    form_delete() {
       if (this.selectList.length == 0) {
         this.$message({
           type: 'error',

src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -53,7 +53,7 @@
           <el-select v-model="samplingSelection.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in samplingSelection.frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
         </div>
         <div class="table" style="margin-top: 10px;">
           <el-table
@@ -317,7 +317,7 @@ export default {
         this.getListSamplingSelection()
       })
     },
-    handleSearch() {
+    form_search() {
       this.getListSamplingSelection()
     },
     handleSelectionChange(item) {

src/views/formulationPlan/dhedFormula/index.vue

@@ -12,7 +12,7 @@
           <el-option v-for="(item,index) in tnameList" :key="index" :label="item.tname" :value="item.tname" />
         </el-select>
         <!-- <el-input v-model="table.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
-        <el-button class="successBorder" @click="handleSearch">查询</el-button>
+        <el-button class="successBorder" @click="form_search">查询</el-button>
         <el-button v-if="isRoleEdit" class="successBorder" @click="handleDryMatterRegulation">干物质调节</el-button>
         <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
           <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
@@ -1314,7 +1314,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       this.getList()
     },
     renderHeader(h, { column, $index }) { // h即为cerateElement的简写，具体可看vue官方文档

src/views/formulationPlan/dhedFormula/index备.vue

@@ -12,7 +12,7 @@
           <el-option v-for="(item,index) in tnameList" :key="index" :label="item.tname" :value="item.tname" />
         </el-select>
         <!-- <el-input v-model="table.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
-        <el-button class="successBorder" @click="handleSearch">查询</el-button>
+        <el-button class="successBorder" @click="form_search">查询</el-button>
         <el-button v-if="isRoleEdit" class="successBorder" @click="handleDryMatterRegulation">干物质调节</el-button>
         <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
           <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
@@ -1314,7 +1314,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       this.getList()
     },
     renderHeader(h, { column, $index }) { // h即为cerateElement的简写，具体可看vue官方文档

src/views/formulationPlan/formulaDistribution/index.vue

@@ -11,7 +11,7 @@
       <el-select v-model="table.getdataListParm.parammaps.fttype" placeholder="配方类型" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in formulaTypeList" :key="item.value" :label="item.label" :value="item.label" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="table">
@@ -47,7 +47,7 @@
 
         <el-table-column label="操作" :show-overflow-tooltip="true" align="center" class-name="small-padding fixed-width" width="50" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="form_see(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -112,13 +112,13 @@
     <!-- 查看 -->
     <el-dialog :title="textMap[see.dialogStatus]" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="70%">
       <div class="app-see">
-        <el-tabs v-model="see.activeName" @tab-click="handleSeeTabClick">
+        <el-tabs v-model="see.activeName" @tab-click="form_seeTabClick">
           <el-tab-pane label="下发记录" name="first">
             <div class="search">
               <el-select v-model="see.tab1.table.getdataListParm.parammaps.pasturename" placeholder="牧场" class="filter-item" style="width: 120px;" clearable>
                 <el-option v-for="item in formulaDistribution.pasture.list" :key="item.id" :label="item.pasturename" :value="item.pasturename" />
               </el-select>
-              <el-button class="successBorder" @click="handleSeeTab1Search">查询</el-button>
+              <el-button class="successBorder" @click="form_seeTab1Search">查询</el-button>
             </div>
             <div class="table">
               <el-table
@@ -133,7 +133,7 @@
                 :row-style="rowStyle"
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
-                @row-click="handleSeeTab1RowClick"
+                @row-click="form_seeTab1RowClick"
               >
                 <el-table-column label="序号" align="center" type="index" width="50px">
                   <template slot-scope="scope">
@@ -153,7 +153,7 @@
                   <span>{{ item.date }}</span>
                 </template>
               </el-autocomplete>
-              <el-button class="successBorder" @click="handleSeeTab2Search">查询</el-button>
+              <el-button class="successBorder" @click="form_seeTab2Search">查询</el-button>
             </div>
             <div class="table">
               <el-table
@@ -383,7 +383,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       this.table.getdataListParm.offset = 1
       this.getList()
     },
@@ -520,7 +520,7 @@ export default {
     },
 
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.see.dialogStatus = 'see'
       this.see.dialogFormVisible = true
       this.see.temp = Object.assign({}, row)
@@ -551,7 +551,7 @@ export default {
         }, 100)
       })
     },
-    handleSeeTab1Search() {
+    form_seeTab1Search() {
       this.getSeeTab1List()
     },
     getSeeTab2List() {
@@ -593,7 +593,7 @@ export default {
         }, 100)
       })
     },
-    handleSeeTab2Search() {
+    form_seeTab2Search() {
       if (this.see.tab2.table.getdataListParm.parammaps.date == '') {
         this.see.tab2.table.getdataListParm.parammaps.date = this.see.tab2.date.list[0].date
       }
@@ -626,7 +626,7 @@ export default {
     handleSelectDate(item) {
       this.see.tab2.table.getdataListParm.parammaps.date = item.date
     },
-    handleSeeTabClick() {
+    form_seeTabClick() {
       if (this.see.activeName == 'first') {
         this.getSeeTab1List()
       } else {
@@ -634,7 +634,7 @@ export default {
         this.getSeeTab2List()
       }
     },
-    handleSeeTab1RowClick(row) {
+    form_seeTab1RowClick(row) {
       console.log(row)
       this.see.activeName = 'second'
       this.see.tab2.table.getdataListParm.parammaps.date = row.date

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -170,7 +170,7 @@
     </el-dialog>
 
     <!-- 新增、编辑 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="create.dialogFormVisible" :before-close="close" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="create.dialogFormVisible" v-if='create.dialogFormVisible' :before-close="close" :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -328,7 +328,7 @@
                         <input
                           ref="weight"
                           v-model="element.weight"
-                          :autofocus="element.focusState"
+                          
                           type="number"
                           placeholder="重量"
                           step="0.01"
@@ -337,7 +337,8 @@
                           @keyup.enter="$event.target.blur"
                           @focus="focusWeight"
                           @blur="blurWeight(element)"
-                        >
+                          />
+                        <!-- <el-input ref="wagonnumber" v-model="create.createTemp.wagonnumber" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="送货单编号" type="text" /> -->
                       </el-tooltip>
                     </div>
                   </div>
@@ -880,7 +881,10 @@ export default {
       this.isDropState = true
     },
     blurWeight(item) {
+      console.log("item.weight", item)
+      console.log("监听Blur======================")
       this.isDropState = false
+    
       if (parseFloat(item.weight) <= 0) {
         this.$message({ type: 'error', message: '重量不可输入小于0的数据', duration: 2000 })
         return false
@@ -932,6 +936,8 @@ export default {
           // this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
         }
         this.getCreateList1()
+
+        
       })
     },
     handleFLDelete(ele) {
@@ -1169,6 +1175,7 @@ export default {
       this.create.checkBarList = []
       console.log(this.create.temp,'this.create.temp')
       this.getCreateList1()
+
     },
     updateData() {
       this.$refs['temp'].validate(valid => {
@@ -1218,6 +1225,8 @@ export default {
             this.dialogFull = false
             this.create.dialogFormVisible = false
             this.getList()
+            //window.location.reload()
+    
           }
         })
       } else {
@@ -1238,6 +1247,8 @@ export default {
             this.dialogFull = false
             this.create.dialogFormVisible = false
             this.getList()
+            // window.location.reload()
+       
           } else {
             this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
           }
@@ -1288,6 +1299,7 @@ export default {
       console.log('move1===>originalEvent', originalEvent)
     },
     changeLog1(evt){
+      console.log("evt========",evt)
       // 按组拖拽
       const url = 'authdata/lpplandtl/edit/sort'
       const data = {}

src/views/formulationPlan/materialIssuancePlan/index1.vue

@@ -0,0 +1,1890 @@
+<template>
+  <div class="app-container">
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float:left;" @click="handleCreate">新增车次
+      </el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float:left;" @click="handleReduceTrains">减少车次</el-button>
+      <el-button v-if="isRoleEdit" class="success" style="float: left;" @click="handleCheck">校验</el-button>
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-download" style="float:left;" @click="handleAutomaticGeneration">自动生成</el-button>
+      <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success" @click="handleChangeOrder">更改顺序</el-button>
+      <div v-else style="float: left;margin-left: 10px;">
+        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存 </el-button>
+        <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
+      </div>
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect"> 生效</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable"> 禁用</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleAllEmpty"> 清空已分配栏舍</el-button>
+      <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;float: left;margin-left: 10px;" @change="changeFrequency">
+        <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-button class="export" icon="el-icon-time" style="float:right;" @click="handleHistoryRecord">历史记录 </el-button>
+    </div>
+    <!-- <div class="search">
+      <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" @change="changeFrequency">
+        <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+    </div> -->
+    <div class="table">
+      <el-table
+        id="table"
+        :key="table.tableKey"
+        ref="table"
+        v-loading="table.listLoading"
+        element-loading-text="给我一点时间"
+        :data="table.list"
+        border
+        highlight-current-row
+        style="width: 100%;"
+        :height="height"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        class="elTable"
+        row-key="id"
+        @selection-change="handleSelect"
+      >
+        <el-table-column type="selection" width="50" />
+        <el-table-column label="车次" width="50px" align="center" class-name="small-padding fixed-width" fixed="">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="TMR编号" width="110px" align="center" class-name="small-padding fixed-width" fixed="left">
+          <template slot-scope="scope">
+            <span>{{ scope.row.tmrname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="描述" width="110px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.display }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="生效" width="70px" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.sel" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+          </template>
+        </el-table-column>
+        <el-table-column label="班次" width="65px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.timesstr }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="时间" width="55px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.begintime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最大重量" width="75px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.maxweight }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="合计重量" width="80px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sumweight }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="模板配方" width="90px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ftname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-show="isInforvalue" label="是否提前小料拆分" width="70px" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.issplit" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+          </template>
+        </el-table-column>
+        <el-table-column label="撒料" min-width="250px" align="left" header-align="center">
+          <template slot-scope="scope">
+            <div v-for="element in scope.row.arrList" :key="element.name" class="list">
+              <el-tooltip placement="top" :open-delay="1000">
+                <div slot="content">
+                  <div> 栏舍全称：{{ element.barname }} </div>
+                  <div> 饲料重量：{{ element.weight }} </div>
+                  <div> 撒料车：{{ element.tmrname }} </div>
+                </div>
+                <div :style="{'background':element.background}" class="tmrname">{{ element.barname }}</div>
+              </el-tooltip>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="{row}">
+            <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+    </div>
+
+    <!-- 自动生成 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="automaticGeneration.dialogFormVisible" :close-on-click-modal="false" width="30%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[automaticGeneration.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="app-automaticGeneration" style="margin: 0 auto;">
+        <div style="width: 210px;margin:60px auto 120px;font-weight: 16px;">
+          请选择自动生成方式：<br>
+          清空计划并生成新计划；<br>
+          当前计划基础上继续生成计划；<br>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button style="right:240px;" class="cancelClose" @click="automaticGeneration.dialogFormVisible = false;">关闭</el-button>
+          <el-button style="right:130px;" class="save" :disabled="isokDisable" @click="continueData(0)">继续生成 </el-button>
+          <el-button style="right:20px;" class="save" :disabled="isokDisable" @click="continueData(1)">重新生成 </el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 历史记录 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="historyRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[historyRecord.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="historyRecord">
+        <keep-alive>
+          <component :is="historyRecord.myComponent" ref="historyRecord" />
+        </keep-alive>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 新增、编辑 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="create.dialogFormVisible" :before-close="close" :close-on-click-modal="false" width="90%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[create.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="create">
+        <el-form ref="temp" :rules="create.rules" :model="create.temp" label-position="right" label-width="135px" style="width: 100%;margin:0 auto 10px;">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="生效:" prop="sel">
+                <el-switch v-model="create.temp.sel" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="TMR编号:" prop="tmrid2">
+                <el-select v-model="create.temp.tmrid2" style="width: 100%;" placeholder="TMR编号" @change="changeTMRNumber">
+                  <!-- <el-option v-for="item in equipmentList" :key="item.id" :label="`${item.tclassname}/${item.eqcode}`" :value="item.id" /> -->
+                    <el-option v-for="item in TMRNumberList" :key="item.id" :label="`${item.tclassname}/${item.eqcode}`" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="班次:" prop="times">
+                <el-select v-model="create.temp.times" :disabled="create.list2.length>0" placeholder="班次" style="width:100%;" @change="changeTimes">
+                  <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="提前小料拆分:" prop="issplit">
+                <el-switch v-model="create.temp.issplit" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="时间:" prop="begintime">
+                <el-time-picker v-model="create.temp.begintime" style="width: 100%;" :clearable="false" type="datetime" placeholder="时间" format="HH:mm" value-format="HH:mm" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="模板配方:" prop="ftid">
+                <el-select v-model="create.temp.ftid" :disabled="create.list2.length>0" placeholder="模板配方" style="width:100%;" @change="changeTemplateFormulation">
+                  <el-option v-for="item in templateFormulationList" :key="item.id" :label="item.tname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="描述:" prop="display">
+                <el-input v-model="create.temp.display" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" placeholder="描述" maxlength="255" style="width: 100%;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div v-if="create.dialogStatus !=='update' && !isDispaly" slot="footer" class="dialog-footer">
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="distributionAndSpreading()">分配撒料</el-button>
+        </div>
+        <!-- 栏舍 -->
+        <div v-if="create.dialogStatus =='update' || isDispaly" class="bottom" style="border-top: 1px solid #009C69;">
+          <el-row>
+            <el-col :span="20">
+              <div class="fenceHouse">
+                <ul v-loading="create.listLoadingTimes" class="fenceHouseList">
+                  <li v-for="element in create.list1" :key="element.arrid">
+                    <span v-if="element.isShowTitle" class="fenceHouseTitle">{{ element.ftname }}:</span>
+                    <div v-for="item in element.arrList" :key="item.id" class="colorBlock">
+                      <div style="position: relative;">
+                        <el-tooltip placement="top" style="height: 18px;line-height: 18px;" :style="{'background':item.background}">
+                          <div slot="content">{{ item.barname }}</div>
+                          <div class="barname">
+                            <span style="float: left;width: 70px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{ item.barname }}</span>
+                            <button style="background: red;float: right;color: #fff;width: 18px;font-size: 18px;border: none;text-align: center;" :disabled="isokDisable" @click="clickBar(item)">√</button>
+                          </div>
+                        </el-tooltip>
+                        <div class="barWeight" :style="{ background: 'rgba('+item.background2+ ',0.1)' }"> {{ item.weight }} </div>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="4">
+              <div style="text-align: center;height: 100px;margin-top: 40px;">
+                <div class="maxweight" style="line-height:20px;"><b>最大重量:</b>{{ create.temp.maxweight }} (KG)</div>
+                <div class="sumweight" style="line-height:20px;margin-top: 10px;"><b>合计重量:</b>{{ create.temp.sumweight }} (KG) </div>
+              </div>
+            </el-col>
+          </el-row>
+          <!-- 撒料 -->
+          <div class="spreadingMaterial">
+            <div>撒料:<el-button type="danger" @click="handleEmpty">清空</el-button></div>
+            <div class="spreadingMaterialList">
+              <!-- force-fallback="true" -->
+              <draggable
+                :disabled="isDropState"
+                id="1"
+                data-source="juju"
+                :list="create.list2"
+                class="list-group1"
+                draggable=".item"
+                group="a"
+                animation="500"
+                :move="move1"
+                @change="changeLog1"
+                @start="start1"
+                @end="end1(create.temp)"
+              >
+                <div v-for="element in create.list2" :key="element.name" class="list-group-item2 item">
+                  <div class="arr-l" :style="{'background':element.tbackground}">
+                    <div class="arr-l-t">
+                      <div class="arr-l-t-t" />
+                      <el-select
+                        v-model="element.tmrid"
+                        placeholder="撒料设备"
+                        class="arr-l-t-b el-icon-arrow-down"
+                        @change="(value)=> {changeEquipment(value, element.fttype,element.id)}"
+                      >
+                        <el-option
+                          v-for="item in equipmentList"
+                          :key="item.id"
+                          :label="item.tname"
+                          :value="item.id"
+                        />
+                      </el-select>
+                    </div>
+                    <div class="arr-l-b">
+                      <el-tooltip placement="top" class="list-group-item1 item" style="height: 18px;line-height: 18px;">
+                        <div slot="content">{{ element.tmrname }}</div>
+                        <div class="tmrname">{{ element.tmrname }}</div>
+                      </el-tooltip>
+                    </div>
+                    <div v-if="element.fttype==0" style="background: #009C69;position:absolute;bottom: 0;left: 0;">补</div>
+                  </div>
+                  <div class="arr-r">
+                    <div class="arr-r-l">
+                      <el-tooltip placement="top">
+                        <div slot="content">{{ element.barname }}</div>
+                        <div class="barname">{{ element.barname }}</div>
+                      </el-tooltip>
+                    </div>
+                    <div class="arr-r-c">-</div>
+                    <div class="arr-r-r">
+                      <el-tooltip placement="top">
+                        <div slot="content">{{ element.weight }}</div>
+                        <input
+                          ref="weight"
+                          v-model="element.weight"
+                          :autofocus="element.focusState"
+                          type="number"
+                          placeholder="重量"
+                          step="0.01"
+                          class="filter-item2"
+                          style="display: inline-block;height:25px;padding:4px 4px 4px 0;text-align:right;font-size:12px;width: 95%;border: 1px solid #e6e6e6;"
+                          @keyup.enter="$event.target.blur"
+                          @focus="focusWeight"
+                          @blur="blurWeight(element)"
+                        >
+                      </el-tooltip>
+                    </div>
+                  </div>
+                  <div class="arr-t" :style="{'background':element.background}">
+                    <i class="el-icon-close" style="position: absolute;right: 0;" @click="handleFLDelete(element)" />
+                  </div>
+                </div>
+              </draggable>
+            </div>
+          </div>
+          <div slot="footer" class="dialog-footer" style="height: 55px;">
+            <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">关闭</el-button>
+            <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">确认</el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 校验 -->
+    <el-dialog :title="textMap[check.dialogStatus]" :destroy-on-close="true" :visible.sync="check.dialogFormVisible" :close-on-click-modal="false" width="30%">
+      <div class="check">
+        <p v-if="check.temp.isDistribution == 0">当前有未分配栏舍，未分配栏舍如下：</p>
+        <p v-else>已分配完：当前栏舍已分配完善</p>
+        <div v-for="(item,index) in check.temp.ftlist" :key="index">
+          <b v-if="item.arrList !== null && item.arrList !== undefined && item.arrList.length>0">{{item.ftname}}:</b>
+          <span v-if="item.arrList !== null && item.arrList !== undefined && item.arrList.length>0">
+            <span v-for="(item2,index2) in item.arrList" :key="index2">
+              {{item2.barname}}
+            </span>
+          </span>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 更改TMR编号 -->
+    <el-dialog :title="textMap[tmrNumber.dialogStatus]" :destroy-on-close="true" :visible.sync="tmrNumber.dialogFormVisible" :close-on-click-modal="false" width="30%">
+        <h3 style="text-align: center;">是否要改变TMR设备？</h3>
+      <div class="tmrNumber" style="padding: 10px 30px;">
+        <p>注：更换TMR撒料设备，变更后的装载重量不同，请选择处理方式</p>
+        <el-radio v-model="tmrNumber.radio" label="0">1、多出的饲料平均从已分配的各栏舍中扣减。</el-radio><br/><br/>
+        <el-radio v-model="tmrNumber.radio" label="1">2、多出的饲料从最后一个栏舍依次往前扣减。</el-radio><br/><br/>
+        <el-radio v-model="tmrNumber.radio" label="2">3、清空已分配的撒料车。</el-radio>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="cancelClose" :disabled="isokDisable" @click="closeTmrNumber">否</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="tmrNumberData()">是</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 清空已分配的栏舍 -->
+    <el-dialog :title="textMap[allEmpty.dialogStatus]" :destroy-on-close="true" :visible.sync="allEmpty.dialogFormVisible" :close-on-click-modal="false" width="50%">
+      <div class="allEmptyData">
+        <el-table
+          id="table"
+          :key="allEmpty.table.tableKey"
+          ref="allEmptyTable"
+          v-loading="allEmpty.table.listLoading"
+          element-loading-text="给我一点时间"
+          :data="allEmpty.table.list"
+          border
+          highlight-current-row
+          style="width: 100%;"
+          :height="height"
+          :row-style="rowStyle"
+          :cell-style="cellStyle"
+          class="elTable"
+          row-key="id"
+          @selection-change="handleAllEmptySelect"
+          height="300"
+        >
+          <el-table-column type="selection" width="50" />
+          <el-table-column label="序号" width="50px" align="center" type="index" />
+          <el-table-column label="栏舍名称" min-width="110px" align="center" prop="bname"/>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import draggable from 'vuedraggable'
+import Sortable from 'sortablejs'
+import { checkButtons, ExecDataByConfig, postJson } from '@/api/common'
+import { MessageBox } from 'element-ui'
+export default {
+  components: {
+    draggable
+  },
+  data() {
+    return {
+      isRoleEdit: [],
+      rowStyle: { maxHeight: 25 + 'px', height: 25 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
+      height: document.body.clientHeight - 220, // table高度
+      table: {
+        getdataListParm: {
+          page: 1,
+          offset: 1,
+          pagecount: 0,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            times: 1,
+            refresh: 1
+          }
+        },
+        tableKey: 0,
+        list: [],
+        total: 0,
+        listLoading: false
+      },
+      frequencyList: [], // 班次
+      maxTime: {
+        getMaxTimesParm: {
+          name: 'getSysoptEnable',
+          page: 1,
+          offset: 1,
+          pagecount: 1,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            inforname: 'times'
+          }
+        }
+      },
+      // 是否显示小料拆分
+      isInforvalue: false,
+      selectList: [],
+      historyRecord: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        myComponent: null
+      },
+      // 自动生成
+      automaticGeneration: {
+        dialogFormVisible: false,
+        dialogStatus: ''
+      },
+      textMap: {
+        automaticGeneration: '提示',
+        historyRecord: '历史记录',
+        create: '新增',
+        update: '编辑',
+        check: '提示',
+        tmrNumber:'',
+        allEmpty:'清空已分配的栏舍'
+      },
+      check: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: {
+          ftlist:[],
+          isDistribution: ''
+        }
+      },
+      dialogFull: false,
+      isOrder: true,
+      requestParam: {},
+      isokDisable: false,
+      create: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: { sel: 1, tmrid: '', tmrid2: '', maxweight: '', issplit: 1, begintime: '', sumweight: 0, display: '', times: 1, ftid: '', ftname: '', tmrname: '', maxweight: '' },
+        rules: {
+          tmrid2: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          times: [{ type: 'number', required: true, message: '必填', trigger: 'blur' }],
+          ftid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        },
+        listLoadingTimes: false,
+        list1: [],
+        list2: [],
+        checkBarList: []
+      },
+      TMRNumberList: [], // TMR编号
+      equipmentList: [], // 撒料设备
+      templateFormulationList: [], // 模板配方
+      isDispaly: false,
+      dropState: false,
+      isDropState:false,
+      tmrNumber:{
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp:{},
+        radio:'0'
+      },
+      allEmpty:{
+        dialogFormVisible: false,
+        dialogStatus: '',
+        table: {
+          getdataListParm: {
+            name:'getBarList',
+            page: 1,
+            offset: 1,
+            pagecount: '',
+            returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid'),
+              times: 1,
+              refresh: 1
+            }
+          },
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: false,
+        }
+      },
+      allEmptySelect:[]
+    }
+  },
+  created() {
+    this.getButtons()
+    this.getIsDisplay()
+    this.getList()
+  },
+  methods: {
+    getButtons() {
+      const Edit = 'MaterialIssuancePlan'
+      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      this.isRoleEdit = isRoleEdit
+    },
+    // 下拉列表
+    getDownList() {
+      const url = 'authdata/GetDataByName'
+      const data1 = {
+        name: 'getTMRListEnableType',
+        offset: 0,
+        parammaps: {
+          pastureid: Cookies.get('pastureid'),
+          eqtype: '1'
+        }
+      }
+      postJson(url, data1).then(response => {
+        if (response.data !== null) {
+          this.TMRNumberList = response.data.list
+        } else {
+          this.TMRNumberList = []
+        }
+      })
+      const url2 = 'authdata/tmrListEnableTypeAll'
+      const data2 = {
+        parammaps: {
+          pastureid: Cookies.get('pastureid')
+        }
+      }
+      postJson(url2, data2).then(response => {
+        if (response.data !== null) {
+          this.equipmentList = response.data
+          if(this.create.dialogStatus == 'update'){
+            if(this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid) !== undefined){
+              this.create.temp.tclassname = this.equipmentList.find(obj => obj.id ==  this.create.temp.tmrid).tclassname
+            }else{
+              this.create.temp.tclassname = '固定式'
+            }
+          }
+        } else {
+          this.equipmentList = []
+        }
+      })
+      const data3 = {
+        name: 'getFTSWList',
+        offset: 0,
+        parammaps: {
+          pastureid: Cookies.get('pastureid')
+        }
+      }
+      postJson(url, data3).then(response => {
+        if (response.data !== null) {
+          this.templateFormulationList = response.data.list
+        } else {
+          this.templateFormulationList = []
+        }
+      })
+      const data4 = {
+        name: 'getSysoptEnable',
+        offset: 0,
+        parammaps: {
+          pastureid: Cookies.get('pastureid'),
+          inforname: 'isSmallMaterial'
+        }
+      }
+      postJson(url, data4).then(response => {
+        if (response.data !== null) {
+          if (response.data.list[0].inforvalue == 0) {
+            this.isInforvalue = false
+          } else {
+            this.isInforvalue = true
+          }
+        } else {
+          this.isInforvalue = false
+        }
+      })
+    },
+    getIsDisplay() {
+      const url = 'authdata/GetDataByName'
+      const data = this.maxTime.getMaxTimesParm
+      postJson(url, data).then(response => {
+        console.log(response.data.list[0].inforvalue)
+        if (response.data.list[0].inforvalue == 1) {
+          this.frequencyList = [{ id: 1, name: '第一班' }]
+        } else if (response.data.list[0].inforvalue == 2) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' },
+            { id: 2, name: '第二班' }
+          ]
+        } else if (response.data.list[0].inforvalue == 3) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' },
+            { id: 2, name: '第二班' },
+            { id: 3, name: '第三班' }
+          ]
+        } else if (response.data.list[0].inforvalue == 4) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' },
+            { id: 2, name: '第二班' },
+            { id: 3, name: '第三班' },
+            { id: 4, name: '第四班' }
+          ]
+        }
+      })
+    },
+
+    getList() {
+      this.table.listLoading = true
+      const url = 'authdata/spillage'
+      const data = this.table.getdataListParm
+      postJson(url, data).then(response => {
+        if (response.data.list !== undefined) {
+          if (response.data.list !== null) {
+            console.log('table数据', response.data.list)
+            for (let i = 0; i < response.data.list.length; i++) {
+              if (response.data.list[i].arrList == null) {
+                this.$set(response.data.list[i], 'arrList', [])
+              }
+            }
+            this.table.list = response.data.list
+            this.table.total = response.data.list.length
+            setTimeout(() => {
+              this.$refs.table.doLayout()
+            }, 100)
+          } else {
+            this.table.list = []
+          }
+        }
+        this.table.listLoading = false
+      })
+    },
+    changeFrequency(val) {
+      console.log('选择了班次', val)
+      this.getList()
+    },
+    // 行内删除
+    handleRowDelete(row) {
+      console.log(row, '点击了行删除')
+      if (row.arrList.length == 0) {
+        MessageBox.confirm('是否确认删除此信息?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+          this.selectList = []
+          this.requestParam = {}
+          this.requestParam.name = 'deleteLpp'
+          this.requestParam.parammaps = {}
+          this.requestParam.parammaps.pastureid = row.pastureid
+          this.requestParam.parammaps.id = row.id
+          const url = 'authdata/PostDataByName'
+          const data = this.requestParam
+          postJson(url, data).then(response => {
+            if (response.msg === 'fail') {
+              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+              this.table.getdataListParm.parammaps.refresh = 1
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.$message({ type: 'info', message: '已取消删除' })
+        })
+      } else {
+        this.$message({ type: 'error', message: '本车次已添加栏舍不可删除', duration: 2000 })
+        return false
+      }
+    },
+    handleSelect(val) {
+      console.log('勾选数据', val)
+      this.selectList = val
+    },
+    changeTemplateFormulation(item) {
+      this.create.temp.ftname = this.templateFormulationList.find(obj => obj.id === item).tname
+      this.getCreateList1()
+    },
+    changeTimes(item) {
+      this.getCreateList1()
+    },
+    // TMR编号
+    changeTMRNumber(item) {
+      if (this.create.list2.length > 0) {
+        // 备份
+        // MessageBox.confirm('更换TMR撒料设备,会清空撒料车,是否更换?', {
+        //   confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
+        // }).then(() => {
+        //   this.create.temp.tmrid = this.create.temp.tmrid2
+        //   this.create.temp.tmrname = this.TMRNumberList.find(obj => obj.id === item).eqcode
+        //   this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === item).maxstirfeed
+        //   this.create.temp.tclassname = this.TMRNumberList.find(obj => obj.id === item).tclassname
+        //   this.create.temp.mytmrid = this.create.temp.tmrid
+        //   this.create.temp.mytmrname = this.create.temp.tmrname
+        //   console.log('tmrname==>', this.create.temp)
+        //   if (this.isDispaly || this.create.dialogStatus == 'update') {
+        //     this.getClearList()
+        //   }
+        // }).catch(() => {
+        //   if(this.create.temp.tclassname == '固定式'){
+        //     console.log( this.create.temp,'====')
+        //     this.create.temp.tmrid = this.create.temp.mytmrid
+        //   }
+        //   this.create.temp.tmrid2 = this.create.temp.tmrid
+        //   this.create.temp.tmrname = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).eqcode
+        //   this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
+        //   this.create.temp.tclassname = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).tclassname
+        //   this.create.temp.mytmrid = this.create.temp.tmrid2
+        //   this.create.temp.mytmrname = this.create.temp.tmrname
+        //   console.log(this.create.temp)
+        //   this.$message({ type: 'info', message: '已取消' })
+        // })
+        // 备份
+        this.tmrNumber.dialogFormVisible = true
+        this.tmrNumber.dialogStatus = 'tmrNumber'
+        this.tmrNumber.radio = '0'
+      } else {
+        this.create.temp.tmrid = this.create.temp.tmrid2
+        this.create.temp.tmrname = this.TMRNumberList.find(obj => obj.id === item).eqcode
+        this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === item).maxstirfeed
+        this.create.temp.tclassname = this.TMRNumberList.find(obj => obj.id === item).tclassname
+        this.create.temp.mytmrid = this.create.temp.tmrid
+        this.create.temp.mytmrname = this.create.temp.tmrname
+        if (this.isDispaly || this.create.dialogStatus == 'update') {
+          this.getClearList()
+        }
+      }
+    },
+    tmrNumberData(){
+      if(this.tmrNumber.radio == '0'){
+        console.log('1、多出的饲料平均从已分配的各栏舍中扣减。')
+      }else if(this.tmrNumber.radio == '1'){
+        console.log('2、多出的饲料从最后一个栏舍依次往前扣减。')
+      }else if(this.tmrNumber.radio == '2'){
+        console.log('3、清空已分配的撒料车。')
+      }
+      const url = 'authdata/materialtmr/edit'
+      const data = {
+        tmrid:this.create.temp.tmrid2,
+        tmrtype: this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).tclassid,
+        lppid:this.create.temp.id,
+        times:this.create.temp.times,
+        pastureid:Cookies.get('pastureid'),
+        status:this.tmrNumber.radio
+      }
+      postJson(url, data).then(response => {
+        if (response.msg === 'fail') {
+          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
+          this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
+          this.create.temp.tclassname = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).tclassname
+          this.tmrNumber.dialogFormVisible = false
+          this.getCreateList1()
+        }
+      })
+    },
+    closeTmrNumber(){
+      if(this.create.temp.tclassname == '固定式'){
+        console.log( this.create.temp,'====')
+        this.create.temp.tmrid = this.create.temp.mytmrid
+      }
+      this.create.temp.tmrid2 = this.create.temp.tmrid
+      this.create.temp.tmrname = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).eqcode
+      this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
+      this.create.temp.tclassname = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).tclassname
+      this.create.temp.mytmrid = this.create.temp.tmrid2
+      this.create.temp.mytmrname = this.create.temp.tmrname
+      this.tmrNumber.dialogFormVisible = false
+    },
+    getClearList() {
+      const url = 'authdata/lpplandtl/del'
+      const data = []
+      this.create.list2.forEach((item, i) => {
+        const obj = {}
+        obj.pastureid = item.pastureid
+        obj.lpplandtlid = item.id
+        obj.fttype = item.fttype
+        obj.lweight = item.lweight
+        obj.fpdid = item.fpdid
+        data.push(obj)
+      })
+      postJson(url, data).then(response => {
+        if (response.msg === 'fail') {
+          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
+          this.getCreateList1()
+        }
+      })
+    },
+    colorRgb(sColor) {
+      sColor = sColor.toLowerCase()
+      var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+      // 如果是16进制颜色
+      if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+          var sColorNew = '#'
+          for (var i = 1; i < 4; i += 1) {
+            sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+          }
+          sColor = sColorNew
+        }
+        // 处理六位的颜色值
+        var sColorChange = []
+        for (var i = 1; i < 7; i += 2) {
+          sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
+        }
+        return sColorChange.join(',')
+      }
+      return 'rgba(' + sColorChange.join(',') + ')'
+    },
+    dbclickWeight(item) {
+      console.log('item==>', item)
+      console.log('isRoleEdit==>', this.isRoleEdit)
+      this.$set(item, 'isWeight', true)
+      this.$set(item, 'focusState', true)
+    },
+    focusWeight(){
+      this.isDropState = true
+    },
+    blurWeight(item) {
+      console.log("监听失效===")
+      this.isDropState = false
+      if (parseFloat(item.weight) <= 0) {
+        this.$message({ type: 'error', message: '重量不可输入小于0的数据', duration: 2000 })
+        return false
+      }
+      if (item.weight == '') {
+        item.weight = 0
+      }
+      const lweight = String(parseFloat(item.weight) - parseFloat(item.lweight))
+      let sum = 0
+      this.create.list2.forEach((item, i) => {
+        console.log('item==>', item)
+        sum += parseFloat(item.weight)
+      })
+      if (sum > this.create.temp.maxweight) {
+        this.$message({ type: 'error', message: '撒料车总重量大于最大重量', duration: 2000 })
+        return false
+      }
+      this.requestParam = {}
+      this.requestParam.common = { 'returnmap': '0' }
+      this.requestParam.data = []
+      this.requestParam.data[0] = {
+        'name': 'checkFPdLeftW', 'type': 'v',
+        'parammaps': {
+          pastureid: item.pastureid, fpdid: item.fpdid, fttype: item.fttype,
+          lweight: lweight
+        }
+      }
+      this.requestParam.data[1] = {
+        'name': 'updateLppd', 'type': 'e',
+        'parammaps': {
+          pastureid: this.create.temp.pastureid, lppid: this.create.temp.id, barid: item.barid,
+          barname: item.barname, fpdid: item.fpdid, fttype: item.fttype,
+          lweight: item.weight, sort: item.sort, tmrid: item.tmrid,
+          tmrname: item.tmrname, background: item.background, id: item.id
+        }
+      }
+      this.requestParam.data[2] = {
+        'name': 'updateFpdetailUse', 'type': 'e',
+        'parammaps': {
+          pastureid: item.pastureid, id: item.fpdid,
+          fttype: item.fttype, lweight: lweight
+        }
+      }
+      ExecDataByConfig(this.requestParam).then(response => {
+        if (response.msg === 'fail') {
+          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          // this.isDropState = false
+          // this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+        }
+        this.getCreateList1()
+      })
+    },
+    handleFLDelete(ele) {
+      console.log(ele, '点击了撒料删除')
+      this.requestParam = {}
+      this.requestParam.common = { 'returnmap': '0' }
+      this.requestParam.data = []
+      this.requestParam.data[0] = {
+        'name': 'deleteLppd', 'type': 'e',
+        'parammaps': { pastureid: ele.pastureid, id: ele.id }
+      }
+      this.requestParam.data[1] = {
+        'name': 'updateFpdetailUse', 'type': 'e',
+        'parammaps': { pastureid: ele.pastureid, id: ele.fpdid, fttype: ele.fttype, lweight: '-' + parseFloat(ele.weight) }
+      }
+      const url = 'authdata/ExecDataByConfig'
+      const data = this.requestParam
+      postJson(url, data).then(response => {
+        if (response.msg === 'fail') {
+          this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+          this.getCreateList1()
+        }
+      })
+    },
+    handleCreate() {
+      console.log('新增车次')
+      this.create.temp = { sel: 1, tmrid: '', tmrid2: '', maxweight: '', issplit: 1, begintime: '', sumweight: 0, display: '', times: 1, ftid: '', ftname: '', tmrname: '', maxweight: '' }
+      this.create.temp.times = this.table.getdataListParm.parammaps.times
+      this.getDownList()
+      this.isDispaly = false
+      this.dialogFull = false
+      this.create.dialogStatus = 'create'
+      this.create.dialogFormVisible = true
+      this.create.list1 = []
+      this.create.list2 = []
+      this.create.checkBarList = []
+    },
+    distributionAndSpreading() {
+      console.log('点击了分配撒料')
+      this.$refs['temp'].validate(valid => {
+        if (valid) {
+          this.isokDisable = true
+          setTimeout(() => {
+            this.isokDisable = false
+          }, 1000)
+          const url = 'authdata/lpplan/add'
+          const data = {}
+          this.create.temp.pastureid = Cookies.get('pastureid')
+          this.create.temp.times = parseInt(this.create.temp.times)
+          data.parammaps = this.create.temp
+          postJson(url, data).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg !== 'fail') {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.create.temp.id = response.data.Id
+              this.isDispaly = true
+            } else {
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            }
+          })
+          this.getCreateList1()
+        }
+      })
+    },
+    getCreateList1() {
+      this.create.listLoadingTimes = true
+      const url = 'authdata/spillage'
+      const data = {
+        page: 1,
+        offset: 1,
+        pagecount: 0,
+        returntype: 'Map',
+        parammaps: {
+          pastureid: Cookies.get('pastureid'),
+          times: this.create.temp.times,
+          refresh: 2,
+          ftid: this.create.temp.ftid
+        }
+      }
+      postJson(url, data).then(response => {
+        if (response.data.ftlist !== null) {
+          for (let i = 0; i < response.data.ftlist.length; i++) {
+            this.$set(response.data.ftlist[i], 'isShowTitle', true)
+            if (response.data.ftlist[i].arrList == null) {
+              this.$set(response.data.ftlist[i], 'isShowTitle', false)
+            } else {
+              for (let j = 0; j < response.data.ftlist[i].arrList.length; j++) {
+                this.$set(response.data.ftlist[i].arrList[j], 'background2', this.colorRgb(response.data.ftlist[i].arrList[j].background))
+              }
+            }
+          }
+          this.create.list1 = response.data.ftlist
+        } else {
+          this.create.list1 = []
+        }
+        this.create.listLoadingTimes = false
+      })
+      this.getCreateList2()
+    },
+    getCreateList2() {
+      const url = 'authdata/lpplandtl'
+      const data = {}
+      data.parammaps = {}
+      data.parammaps.pastureid = Cookies.get('pastureid'),
+      data.parammaps.id = this.create.temp.id
+      postJson(url, data).then(response => {
+        if (response.data !== null) {
+          this.create.list2 = response.data
+          this.create.temp.sort = response.data.length + 1
+          var sumweight = 0
+          for (let i = 0; i < this.create.list2.length; i++) {
+            sumweight += parseFloat(this.create.list2[i].weight)
+            this.$set(this.create.list2[i], 'isWeight', false)
+            this.$set(this.create.list2[i], 'focusState', false)
+          }
+          console.log('sumweight==>', sumweight)
+          this.create.temp.sumweight = (sumweight).toFixed(2)
+        } else {
+          this.create.list2 = []
+          // this.create.temp.sort = 0
+          this.create.temp.sumweight = 0
+        }
+      })
+    },
+    clickBar(item) {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.create.temp.sumweight = parseFloat(this.create.temp.sumweight)
+      console.log('this.TMRNumberList==>', this.TMRNumberList)
+      console.log('点击了栏舍item==>', item)
+      console.log('temp==>',this.create.temp)
+      console.log('this.equipmentList==>',this.equipmentList)
+      // if(this.create.temp.tclassname == '固定式'){
+      //   if(this.equipmentList.find(obj => obj.tclassname == '撒料设备') !== undefined){
+      //     this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '撒料设备').eqcode
+      //     this.create.temp.tmrid = this.equipmentList.find(obj => obj.tclassname == '撒料设备').id
+      //   }else if(this.equipmentList.find(obj => obj.tclassname == '自走式') !== undefined){
+      //     this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '自走式').eqcode
+      //     this.create.temp.tmrid = this.equipmentList.find(obj => obj.tclassname == '自走式').id
+      //   }else{
+      //     this.$message({ type: 'error', message: '请先在TMR设备中创建撒料设备', duration: 2000 })
+      //     return
+      //   }
+      // }
+      if(this.create.temp.tclassname == '固定式'){
+        if(this.equipmentList.find(obj => obj.tclassname == '任意车1') !== undefined){
+          this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '任意车1').eqcode
+          this.create.temp.tmrid = this.equipmentList.find(obj => obj.tclassname == '任意车1').id
+        }
+      }
+      var evt = this.create.temp
+      if (parseFloat(evt.maxweight) - parseFloat(evt.sumweight) < parseFloat(item.weight)) {
+        if (parseFloat(evt.sumweight) + parseFloat(item.weight) > parseFloat(evt.maxweight)) {
+          this.$set(item, 'weight', (parseFloat(evt.maxweight) - parseFloat(evt.sumweight)).toFixed(2))
+        }
+      }
+      if (parseFloat(evt.maxweight) == parseFloat(evt.sumweight) || parseFloat(evt.maxweight) < parseFloat(evt.sumweight)) {
+        this.$message({ type: 'error', message: '计划配方已经是最大容量', duration: 2000 })
+        this.getCreateList1()
+        return
+      }
+      console.log('item.weight===>', evt.maxweight)
+      console.log('item.weight===>', evt.sumweight)
+      const url = 'authdata/lpplandtl/add'
+      const data = {}
+      data.parammaps = {}
+      data.parammaps.id = item.id
+      data.parammaps.pastureid = evt.pastureid
+      data.parammaps.lppid = evt.id
+      data.parammaps.barid = item.barid
+      data.parammaps.barname = item.barname
+      data.parammaps.fpdid = item.id
+      data.parammaps.lweight = item.weight
+      data.parammaps.tmrid = evt.tmrid
+      data.parammaps.tmrname = evt.tmrname
+      data.parammaps.fttype = item.fttype
+      data.parammaps.background = item.background
+      data.parammaps.cowcount = item.cowcount
+      data.parammaps.ccountradio = item.ccountradio
+      postJson(url, data).then(response => {
+        // this.requestParam = {}
+        // this.requestParam.common = {
+        //   'returnmap': '0'
+        // }
+        // this.requestParam.data = []
+        // this.requestParam.data[0] = { 'name': 'insertLppd', 'type': 'e', 'parammaps': {
+        //     pastureid:item.pastureid,
+        //     lppid:evt.id,
+        //     barid:item.barid,
+        //     barname:item.barname,
+        //     fpdid:item.id,
+        //     tmrid:evt.tmrid,
+        //     tmrname:evt.tmrname,
+        //     fttype:item.fttype,
+        //     background:item.background,
+        //     cowcount:item.cowcount,
+        //     ccountradio:item.ccountradio,
+        //     lweight:item.weight
+        //   }
+        // }
+        // ExecDataByConfig(this.requestParam).then(response => {
+        this.requestParam = {}
+        this.requestParam.common = { 'returnmap': '0' }
+        this.requestParam.data = []
+        this.requestParam.data[0] = { 'name': 'updateFpdetailUse', 'type': 'e',
+          'parammaps': { pastureid: item.pastureid, id: item.id, fttype: item.fttype, lweight: item.weight }
+        }
+        const url2 = 'authdata/ExecDataByConfig'
+        const data2 = this.requestParam
+        postJson(url2, data2).then(response => {
+          if (response.msg === 'fail') {
+            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          } else {
+            this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+          }
+          this.getCreateList1()
+        })
+      })
+    },
+    handleUpdate(row) {
+      console.log(row)
+      console.log("equipmentList",this.equipmentList)
+      this.getDownList()
+      this.dialogFull = false
+      this.create.dialogStatus = 'update'
+      this.create.dialogFormVisible = true
+      row.tmrid2 = row.tmrid
+      this.create.temp = Object.assign({}, row)
+      this.create.temp.mytmrname = row.tmrname
+      this.create.temp.mytmrid = row.tmrid
+      this.create.checkBarList = []
+      console.log(this.create.temp,'this.create.temp')
+      this.getCreateList1()
+    },
+    updateData() {
+      this.$refs['temp'].validate(valid => {
+        if (valid) {
+          this.isokDisable = true
+          setTimeout(() => {
+            this.isokDisable = false
+          }, 1000)
+          const url = 'authdata/lpplan/edit'
+          const data = {}
+          this.create.temp.pastureid = Cookies.get('pastureid')
+          this.create.temp.times = parseInt(this.create.temp.times)
+          data.parammaps = this.create.temp
+          data.parammaps.tmrid = this.create.temp.tmrid2
+          data.parammaps.tmrname = this.create.temp.mytmrname
+          data.old = this.create.temp.arrList
+          postJson(url, data).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg !== 'fail') {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.isDispaly = false
+              this.dialogFull = false
+              this.create.dialogFormVisible = false
+              this.getList()
+            } else {
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            }
+          })
+        }
+      })
+    },
+    close() {
+      if (this.create.dialogStatus == 'create') {
+        console.log('新增关闭')
+        this.isokDisable = true
+        setTimeout(() => {
+          this.isokDisable = false
+        }, 1000)
+        const url = 'authdata/lpplandtl/restore'
+        const data = {}
+        data.old = []
+        data.new = this.create.list2
+        postJson(url, data).then(response => {
+          console.log('新增保存发送参数', this.requestParam)
+          if (response.msg !== 'fail') {
+            this.isDispaly = false
+            this.dialogFull = false
+            this.create.dialogFormVisible = false
+            this.getList()
+          }
+        })
+      } else {
+        console.log('编辑关闭')
+        this.isokDisable = true
+        setTimeout(() => {
+          this.isokDisable = false
+        }, 1000)
+        const url = 'authdata/lpplandtl/restore'
+        const data = {}
+        data.old = this.create.temp.arrList
+        data.new = this.create.list2
+        postJson(url, data).then(response => {
+          console.log('新增保存发送参数', this.requestParam)
+          if (response.msg !== 'fail') {
+            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.isDispaly = false
+            this.dialogFull = false
+            this.create.dialogFormVisible = false
+            this.getList()
+          } else {
+            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          }
+        })
+      }
+    },
+    changeEquipment(item, fttype, myid) {
+      console.log('item==>',item)
+      console.log('fttype==>',fttype)
+      console.log('myid==>',myid)
+      let tclassname = this.equipmentList.find(obj => obj.id == item).tclassname
+      let maxstirfeed = this.equipmentList.find(obj => obj.id == item).maxstirfeed
+      if(tclassname == '固定式'){
+        this.$message({ type: 'error', message: '固定式设备无法撒料，请选择撒料设备', duration: 2000 })
+        this.getCreateList2()
+        return
+      }
+      var objList = {}
+      for (let i = 0; i < this.create.list2.length; i++) {
+        if (this.create.list2[i].fttype == fttype && this.create.list2[i].id == myid) {
+          this.create.list2[i].tmrname = this.equipmentList.find(obj => obj.id === item).tname
+          objList = this.create.list2[i]
+          if(parseFloat(this.create.list2[i].weight) > parseFloat(maxstirfeed)){
+            objList.weight = maxstirfeed
+          }
+        }
+      }
+      const url = 'authdata/lpplandtl/add'
+      const data = {}
+      data.parammaps = {}
+      data.parammaps.id = objList.id
+      data.parammaps.pastureid = this.create.temp.pastureid
+      data.parammaps.lppid = this.create.temp.id
+      data.parammaps.tmrid = objList.tmrid
+      data.parammaps.tmrname = objList.tmrname
+      postJson(url, data).then(response => {
+        console.log('新增保存发送参数', this.requestParam)
+        if (response.msg === 'fail') {
+          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.getCreateList2()
+          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+        }
+      })
+    },
+    move1(evt, originalEvent){
+      console.log('move1===>evt', evt)
+      console.log('move1===>originalEvent', originalEvent)
+    },
+    changeLog1(evt){
+      console.log("evt========",evt)
+      // 按组拖拽
+      const url = 'authdata/lpplandtl/edit/sort'
+      const data = {}
+      var obj = evt.moved.element
+      data.parammaps = {}
+      data.parammaps.tmrid = obj.tmrid
+      data.parammaps.pastureid = obj.pastureid
+      data.parammaps.lppid = obj.lppid
+      data.parammaps.sort = evt.moved.newIndex +1
+      data.parammaps.id = obj.id
+      postJson(url, data).then(response => {
+        console.log('拖动保存发送参数', this.requestParam)
+        if (response.msg === 'fail') {
+          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.getCreateList2()
+          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+        }
+      })
+    },
+    start1(evt){
+      console.log('start1===>', evt)
+      // this.$set(this.table.startObj, 'from', evt.from.className)
+      // this.$set(this.table.startObj, 'to', evt.from.className)
+    },
+    end1(evt){
+      console.log('end1===>', evt)
+    },
+    // 减少车次
+    handleReduceTrains() {
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择车次', duration: 2000 })
+        return false
+      } else {
+        // 减少对应车次
+        for (let i = 0; i < this.selectList.length; i++) {
+          if (this.selectList[i].arrList.length > 0) {
+            this.$message({ type: 'error', message: '本车次已添加栏舍不可删除', duration: 2000 })
+            return false
+          }
+        }
+        MessageBox.confirm('是否确认删除此信息?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+          console.log(this.selectList)
+          this.requestParam = {}
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = {
+            'name': 'deleteLpp', 'type': 'e', 'parammaps': { id: '@insertSpotList.id', pastureid: '@insertSpotList.pastureid' }
+          }
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('删除保存发送参数', this.requestParam)
+            if (response.msg === 'fail') {
+              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.table.getdataListParm.parammaps.refresh = 1
+              this.getList()
+            }
+          })
+        })
+      }
+    },
+    // 自动生成
+    handleAutomaticGeneration() {
+      this.dialogFull = false
+      this.automaticGeneration.dialogStatus = 'automaticGeneration'
+      this.automaticGeneration.dialogFormVisible = true
+    },
+    continueData(item) {
+      if (item == 0) {
+        console.log('点击继续生成')
+        this.requestParam = {}
+        this.requestParam.pastureid = Cookies.get('pastureid')
+        this.requestParam.type = 0
+        const url = 'authdata/autogeneration'
+        const data = this.requestParam
+        postJson(url, data).then(response => {
+          console.log('新增保存发送参数', this.requestParam)
+          if (response.msg !== 'fail') {
+            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.automaticGeneration.dialogFormVisible = false
+            this.getIsDisplay()
+          } else {
+            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          }
+        })
+      } else {
+        console.log('点击重新生成')
+        MessageBox.confirm('重新生成计划会将原有计划清空再生成，是否确认重新生成?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+          this.automaticGeneration.dialogFormVisible = false
+          this.requestParam = {}
+          this.requestParam.pastureid = Cookies.get('pastureid')
+          this.requestParam.type = 1
+          const url = 'authdata/autogeneration'
+          const data = this.requestParam
+          postJson(url, data).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg !== 'fail') {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.automaticGeneration.dialogFormVisible = false
+              this.getIsDisplay()
+            } else {
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            }
+          })
+        }).catch(() => {
+          this.$message({ type: 'info', message: '已取消重新生成' })
+        })
+      }
+    },
+    handleChangeOrder() {
+      console.log('更改顺序')
+      this.isOrder = false
+      this.rowDrop()
+    },
+    // 行拖拽
+    rowDrop() {
+      console.log(document.querySelector('#table .el-table__body-wrapper tbody'))
+      const tbody = document.querySelector('#table .el-table__body-wrapper tbody')
+      const that = this
+      var sortable = Sortable.create(tbody, {
+        disabled: that.dropState,
+        onChoose({ newIndex, oldIndex }) {
+          console.log(that.isOrder, 'that.isOrder == false')
+          console.log(that.dropState, 'that.dropState')
+          if (that.dropState == true || that.isOrder == true) {
+            sortable.destroy()
+          }
+        },
+        onEnd({ newIndex, oldIndex }) {
+          const currRow = that.table.list.splice(oldIndex, 1)[0]
+          that.table.list.splice(newIndex, 0, currRow)
+          console.log('索引', newIndex)
+          console.log('拖动数据', currRow)
+          console.log('上', that.table.list[newIndex - 1])
+          console.log('下', that.table.list[newIndex + 1])
+        }
+      })
+    },
+    saveChangeOrder() {
+      // 保存顺序
+      var sortArr = []
+      for (let i = 0; i < this.table.list.length; i++) {
+        var obj = {}
+        obj.sort = i + 1
+        obj.id = this.table.list[i].id
+        obj.pastureid = this.table.list[i].pastureid
+        sortArr.push(obj)
+      }
+      const url = 'authdata/trains'
+      const data = sortArr
+      postJson(url, data).then(response => {
+        if (response.msg === 'fail') {
+          this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.$notify({ title: '', message: '顺序切换成功', type: 'success', duration: 2000 })
+          this.table.getdataListParm.parammaps.refresh = 1
+          this.getList()
+          this.isOrder = true
+        }
+      })
+    },
+    cancelChangeOrder() {
+      console.log('取消顺序')
+      this.table.getdataListParm.parammaps.refresh = 1
+      this.getList()
+      this.isOrder = true
+    },
+    handleTakeEffect() {
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息，是否生效?', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.selectList.length; i++) {
+            this.selectList[i].sel = 1
+          }
+          console.log('生效', this.selectList)
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = {
+            'name': 'updatelpplanEnable', 'type': 'e', 'parammaps': { sel: '@insertSpotList.sel', id: '@insertSpotList.id', pastureid: '@insertSpotList.pastureid' }
+          }
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('生效保存发送参数', this.requestParam)
+            if (response.msg === 'fail') {
+              this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
+              this.table.getdataListParm.parammaps.refresh = 1
+              this.getList()
+            }
+          })
+        })
+      }
+    },
+    handleDisable() {
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息，是否禁用?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.selectList.length; i++) {
+            this.selectList[i].sel = 0
+          }
+          console.log('禁用', this.selectList)
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = {
+            'name': 'updatelpplanEnable',
+            'type': 'e',
+            'parammaps': { sel: '@insertSpotList.sel', id: '@insertSpotList.id', pastureid: '@insertSpotList.pastureid' }
+          }
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('禁用保存发送参数', this.requestParam)
+            if (response.msg === 'fail') {
+              this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '禁用成功', message: '禁用成功', type: 'success', duration: 2000 })
+              this.table.getdataListParm.parammaps.refresh = 1
+              this.getList()
+            }
+          })
+        })
+      }
+    },
+    // 历史记录
+    handleHistoryRecord() {
+      console.log('点击历史记录')
+      this.dialogFull = false
+      this.historyRecord.dialogStatus = 'historyRecord'
+      this.historyRecord.dialogFormVisible = true
+      const vue = this
+      var myComponent = () => import('./historyRecord.vue')
+      return vue.historyRecord.myComponent = myComponent
+    },
+    handleCheck() {
+      console.log('点击了校验')
+      this.check.dialogStatus = 'check'
+      this.check.dialogFormVisible = true
+      this.getCheckList()
+    },
+    getCheckList() {
+      const url = 'authdata/spillage'
+      const data = {
+        page: 1,
+        offset: 1,
+        pagecount: 0,
+        returntype: 'Map',
+        parammaps: {
+          pastureid: Cookies.get('pastureid'),
+          times: this.table.getdataListParm.parammaps.times,
+          refresh: 2
+        }
+      }
+      postJson(url, data).then(response => {
+        if (response.data.ftlist !== undefined && response.data.ftlist !== null) {
+          this.$set(this.check.temp,'isDistribution',0)
+          this.check.temp.ftlist = response.data.ftlist
+        } else {
+          this.check.temp = {}
+          this.$set(this.check.temp,'isDistribution',1)
+        }
+      })
+    },
+    handleEmpty(){
+      console.log('点击了清空')
+      var list = []
+      for(let i=0;i<this.create.list2.length;i++){
+        var obj = {}
+        obj.pastureid = this.create.list2[i].pastureid
+        obj.id = this.create.list2[i].fpdid
+        obj.fttype = this.create.list2[i].fttype
+        obj.lweight = '-'+this.create.list2[i].weight
+        list.push(obj)
+      }
+      this.requestParam = {}
+      this.requestParam.common = { 'returnmap': '0' }
+      this.requestParam.data = []
+      this.requestParam.data[0] = { 'name': 'deleteLpplandtl1ByLppid', 'type': 'e', 'parammaps': { lppid: this.create.temp.id, pastureid:  Cookies.get('pastureid') }},
+      this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': list }}
+      this.requestParam.data[1].children = []
+      this.requestParam.data[1].children[0] = {
+        'name': 'updateFpdetailUse',
+        'type': 'e',
+        'parammaps': { pastureid: '@insertSpotList.pastureid', id: '@insertSpotList.id', fttype: '@insertSpotList.fttype', lweight: '@insertSpotList.lweight' }
+      }
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('清空保存发送参数', this.requestParam)
+        if (response.msg === 'fail') {
+          this.$notify({ title: '清空失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.$notify({ title: '清空成功', message: '清空成功', type: 'success', duration: 2000 })
+          this.getCreateList1()
+        }
+      })
+    },
+    handleAllEmpty(){
+      this.allEmpty.dialogStatus = 'allEmpty'
+      this.allEmpty.dialogFormVisible = true
+
+      // MessageBox.confirm('执行该操作会将现有车次已分配的撒料栏舍全部清空，是否要执行该操作?', {
+      //   confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      // }).then(() => {
+      //
+      // })
+      this.getAllEmptyList()
+    },
+    getAllEmptyList() {
+      this.allEmpty.table.listLoading = true
+      const url = 'authdata/GetDataByName'
+      const data = this.allEmpty.table.getdataListParm
+      postJson(url, data).then(response => {
+        if (response.data.list !== undefined) {
+          if (response.data.list !== null) {
+            this.allEmpty.table.list = response.data.list
+            this.allEmpty.table.total = response.data.list.length
+            setTimeout(() => {
+              this.$refs.allEmptyTable.doLayout()
+            }, 100)
+          } else {
+            this.allEmpty.table.list = []
+          }
+        }
+        this.allEmpty.table.listLoading = false
+      })
+    },
+    handleAllEmptySelect(val){
+      this.allEmptySelect = []
+      val.forEach((ele)=> {
+        this.allEmptySelect.push(ele.id)
+      });
+    },
+    allEmptyData(){
+      // console.log(this.allEmptySelect)
+      // console.log(this.allEmptySelect.toString())
+      if(this.allEmptySelect.length == 0){
+        this.allEmpty.dialogFormVisible = false;
+        this.getList()
+      }else{
+        // this.requestParam = {}
+        // this.requestParam.common = { 'returnmap': '0' }
+        // this.requestParam.data = []
+        // this.requestParam.data[0] = { 'name': 'deleteLpplandtl1All', 'type': 'e', 'parammaps': { pastureid:  Cookies.get('pastureid') ,times:this.table.getdataListParm.parammaps.times,barid:this.allEmptySelect.toString()}},
+        // this.requestParam.data[1] = { 'name': 'deletefpdetailAll', 'type': 'e', 'parammaps': { pastureid:  Cookies.get('pastureid') ,times:this.table.getdataListParm.parammaps.times,barid:this.allEmptySelect.toString()}},
+        // this.requestParam.data[1] = { 'name': 'deletefpdetailAll', 'type': 'e', 'parammaps': { pastureid:  Cookies.get('pastureid') ,times:this.table.getdataListParm.parammaps.times,barid:this.allEmptySelect.toString()}},
+        // ExecDataByConfig(this.requestParam).then(response => {
+        //   console.log('清空已分配栏舍', this.requestParam)
+        //   if (response.msg === 'fail') {
+        //     this.$notify({ title: '清空失败', message: response.data, type: 'warning', duration: 2000 })
+        //   } else {
+            let url = 'authdata/spillageall/del'
+            let data  = {}
+            data.parammaps = {}
+            data.parammaps.pastureid = Cookies.get('pastureid')
+            data.parammaps.times = this.table.getdataListParm.parammaps.times
+            data.parammaps.barid = this.allEmptySelect.toString()
+            postJson(url, data).then(response => {
+              if (response.msg !== 'fail') {
+                this.$notify({ title: '清空成功', message: '清空成功', type: 'success', duration: 2000 })
+                this.allEmpty.dialogFormVisible = false;
+                this.getList()
+              } else {
+                this.$notify({ title: '清空失败', message: response.data, type: 'warning', duration: 2000 })
+              }
+            })
+        //   }
+        // })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .list{width: 60px;display: inline-block;margin: 5px 5px;text-align: center;
+    .tmrname{
+      width:100%;padding: 5px 5px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+    }
+ }
+  .fenceHouse {
+    height: 130px;
+    background: #fff;
+    position: relative;
+    ::-webkit-scrollbar {
+      width: 7px;
+      height: 7px;
+      background-color: #F5F5F5;
+    }
+    ::-webkit-scrollbar-track {
+      box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+      -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+      border-radius: 10px;
+      background-color: #F5F5F5;
+    }
+    ::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+      -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+      background-color: #c8c8c8;
+    }
+    .fenceHouseList {
+      position: absolute;
+      width: 100%;
+      margin: 0 0;
+      height: 130px;
+      list-style: none;
+      padding: 0 0;
+      overflow: auto;
+      font-size: 12px;
+      .fenceHouseTitle {
+        float: left;
+        width: 105px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        margin: 5px 5px;
+        border-radius: 7px;
+        text-align: center;
+        color: #000;
+        height: 36px;
+        line-height: 36px;
+      }
+      li {
+        text-align: center;
+        color: #fff;
+        .barname {
+          display: block;
+          width: 100%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .barWeight{
+          display: block;
+          line-height: 18px;
+          height: 18px;
+          color: #000;
+          width: 100%;
+          margin: 0 auto;
+        }
+        .colorBlock{
+         width: 88px;float: left;margin:5px 5px;height: 36px;
+        }
+       }
+     }
+   }
+</style>
+<style lang="scss" >
+
+  .spreadingMaterial {
+    height: 200px;
+      ::-webkit-scrollbar {
+        width: 7px;
+        height: 7px;
+        background-color: #F5F5F5;
+      }
+      ::-webkit-scrollbar-track {
+        box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+        -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+        border-radius: 10px;
+        background-color: #F5F5F5;
+      }
+      ::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+        -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+        background-color: #c8c8c8;
+      }
+      .spreadingMaterialList{height: 100%;overflow: auto;}
+      .list-group-item2 {
+        width: 220px;
+        height: 50px;
+        overflow: hidden;
+        float: left;
+        margin: 5px 5px;
+        position: relative;
+        color: #fff;
+
+        .arr-t {
+          height: 50px;
+          border-radius: 5px 5px;
+        }
+
+        .arr-l {
+          float: left;
+          width: 60px;
+          height: 50px;
+          overflow: hidden;
+          border-radius: 5px 50% 50% 5px;
+
+          .arr-l-t {
+            position: relative;
+
+            .arr-l-t-t {
+              width: 0;
+              height: 0;
+              border-top: 26px solid #3479f2;
+              border-right: 26px solid transparent;
+            }
+
+            .arr-l-t-b {
+              position: absolute;
+              top: 4px;
+              left: 1px;
+              color: #fff;
+              width: 10px;
+              height: 10px;
+
+              .el-input--suffix {
+                opacity: 0;
+
+                .el-input__inner {
+                  height: 10px;
+                }
+              }
+            }
+          }
+
+          .arr-l-b {
+            width: 45px;
+            position: absolute;
+            top: 15px;
+            left: 10px;
+            color: #fff !important;
+            font-size: 12px;
+
+            .tmrname {
+              width: 100%;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+          }
+        }
+
+        .arr-c {
+          position: absolute;
+          top: 0px;
+          left: 0;
+        }
+
+        .arr-r {
+          float: right;
+          width: 160px;
+          height: 50px;
+          overflow: hidden;
+          line-height: 50px;
+
+          .arr-r-l {
+            float: left;
+            width: 70px;
+
+            .barname {
+              width: 95%;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              font-size: 14px;
+              text-align: center;
+            }
+          }
+
+          .arr-r-c {
+            float: left;
+            width: 10px;
+          }
+
+          .arr-r-r {
+            float: left;
+            width: 65px;
+
+            .weight {
+              width: 100%;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              font-size: 14px;
+            }
+          }
+        }
+      }
+    }
+</style>

src/views/formulationPlan/premixedPlan/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增车次</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleDelete">减少车次</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="form_delete">减少车次</el-button>
       <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success" @click="handleChangeOrder">更改顺序</el-button>
       <div v-else style="float: left;margin-left: 10px;">
         <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存</el-button>
@@ -783,7 +783,7 @@ export default {
       })
     },
     // 减少车次
-    handleDelete() {
+    form_delete() {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
       } else {

src/views/formulationPlan/recipeTemplate/index.vue

@@ -31,12 +31,12 @@
               <li>
                 <div style="float: right;">
                   <el-button class="downminCancel" @click="arrowUp=false;arrowDown=true;">取消</el-button>
-                  <el-button class="miniPrimary" @click="handleSearch">搜索</el-button>
+                  <el-button class="miniPrimary" @click="form_search">搜索</el-button>
                 </div>
               </li>
             </ul>
           </div>
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh">重置</el-button>
         </div>
         <div class="operation">
@@ -159,7 +159,7 @@
         </div>
         <div class="operation">
           <el-button v-if="isRoleEdit" style="float: left;" icon="el-icon-plus" class="success" @click="handleCreate2">新增</el-button>
-          <el-button v-if="isRoleEdit" style="float: left;" icon="el-icon-delete" class="danger" @click="handleDelete2">删除</el-button>
+          <el-button v-if="isRoleEdit" style="float: left;" icon="el-icon-delete" class="danger" @click="form_delete2">删除</el-button>
           <el-button v-if="isRoleEdit" style="float: left;" class="success" icon="el-icon-takeaway-box" @click="handleSyntheticPremix">合成预混料</el-button>
           <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success" @click="handleChangeOrder">更改顺序</el-button>
           <div v-else style="float: left;margin-left: 10px;">
@@ -195,12 +195,12 @@
               <li>
                 <div style="float: right;">
                   <el-button class="downminCancel" @click="arrowUp2=false;arrowDown2=true;">取消</el-button>
-                  <el-button class="miniPrimary" @click="handleSearch2">搜索</el-button>
+                  <el-button class="miniPrimary" @click="form_search2">搜索</el-button>
                 </div>
               </li>
             </ul>
           </div>
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
           <el-button class="hide" @click="handleCloseTable2">隐藏</el-button>
           <el-button v-if="isEnlarge" class="hide2" @click="handleEnlarge">放大</el-button>
@@ -1253,7 +1253,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -1581,7 +1581,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择配方', duration: 2000 })
@@ -2103,7 +2103,7 @@ export default {
       this.getList2()
       this.isOrder = true
     },
-    handleSearch2() {
+    form_search2() {
       console.log('点击了查询')
       this.arrowDown2 = true
       this.arrowUp2 = false
@@ -2735,7 +2735,7 @@ export default {
       console.log(row, '=====')
       this.handleUpdate2(row)
     },
-    handleDelete2() {
+    form_delete2() {
       console.log('点击了删除')
       if (this.selectList2.length == 0) {
         this.$message({ type: 'error', message: '请选择配方详情', duration: 2000 })

src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -3,7 +3,7 @@
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增车次
       </el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleDelete">减少车次
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="form_delete">减少车次
       </el-button>
       <el-button v-if="isRoleEdit" class="success" style="float: left;" @click="handleCheck">校验</el-button>
       <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success"
@@ -1983,7 +1983,7 @@
         })
       },
       // 减少车次
-      handleDelete() {
+      form_delete() {
         if (this.selectList.length == 0) {
           this.$message({
             type: 'error',

src/views/inventoryManagement/feedContract/index.vue

@@ -7,7 +7,7 @@
       <el-select v-model="table.getdataListParm.parammaps.providerid" filterable placeholder="请选择供应商" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
@@ -35,7 +35,7 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
         :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -65,7 +65,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="form_see(row)" />
             <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <span v-if="isRoleEdit" class="centerSpan">|</span>
@@ -253,7 +253,7 @@ export default {
       },
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
       myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
@@ -342,7 +342,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
@@ -539,7 +539,7 @@ export default {
         }
       })
     },
-    handleSee(row) {
+    form_see(row) {
       console.log('点击了查看')
       this.dialogFull = false
       this.create.dialogStatus = 'see'

src/views/inventoryManagement/inventoryList/index.vue

@@ -4,7 +4,7 @@
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增盘点单</el-button>
@@ -27,7 +27,7 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
         :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
-            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
+            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="form_see(scope.row)" />
             <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(scope.row)" />
           </template>
@@ -265,7 +265,7 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
       myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
@@ -329,7 +329,7 @@ export default {
         this.$forceUpdate()
       }
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -447,7 +447,7 @@ export default {
             feedid: '@insertSpotList.feedid',
             stockweight: '@insertSpotList.stockweight',
             factweight: '@insertSpotList.factweight'
-          }}
+          }}
           let url = 'authdata/biginventory'
           postJson(url,this.requestParam).then(response => {
             if (response.msg === 'fail') {
@@ -467,7 +467,7 @@ export default {
       })
     },
 
-    handleSee(row) {
+    form_see(row) {
       console.log('点击了查看')
       this.dialogFull = false
       this.create.dialogStatus = 'see'

src/views/inventoryManagement/laborConsumption/index.vue

@@ -15,7 +15,7 @@
       <el-select v-model="table.getdataListParm.parammaps.cowclassid" filterable placeholder="请选择牲畜类别" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
@@ -43,7 +43,7 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
         :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -88,7 +88,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="form_see(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -368,7 +368,7 @@ export default {
       })
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -532,7 +532,7 @@ export default {
         }
       })
     },
-    handleSee(row) {
+    form_see(row) {
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()
       })

src/views/inventoryManagement/statistics/index.vue

@@ -4,7 +4,7 @@
       <el-select v-model="table.getdataListParm.parammaps.feedid" filterable placeholder="饲料名称" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
       <el-button class="export" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport">导出</el-button>
     </div>
@@ -21,7 +21,7 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
         :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" :disabled="isokDisable" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" :disabled="isokDisable" @click="form_see(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -76,7 +76,7 @@
           <el-tab-pane label="入库记录" name="first">
             <div class="search">
               <el-date-picker v-model="see.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-              <el-button class="successBorder" @click="handleSearch1">查询</el-button>
+              <el-button class="successBorder" @click="form_search1">查询</el-button>
             </div>
             <div class="table">
               <el-table
@@ -127,7 +127,7 @@
                 <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.label" :value="item.value" />
               </el-select>
               <el-date-picker v-model="see.getdataListParm2.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-              <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+              <el-button class="successBorder" @click="form_search2">查询</el-button>
             </div>
             <div class="table">
               <el-table
@@ -286,7 +286,7 @@ export default {
       },
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
       myHeight:document.documentElement.clientHeight - 85- 150 -10
     }
   },
@@ -327,7 +327,7 @@ export default {
       })
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -338,7 +338,7 @@ export default {
       this.table.getdataListParm.parammaps.feedid = ''
       this.getList()
     },
-    handleSee(row) {
+    form_see(row) {
       this.see.dialogStatus = 'see'
       this.dialogFull = false
       this.see.dialogFormVisible = true
@@ -394,7 +394,7 @@ export default {
         this.getSeeList2()
       }
     },
-    handleSearch1() {
+    form_search1() {
       console.log('点击了库存入库记录查询')
       if (this.see.getdataListParm.parammaps.inputDatetime !== '' && this.see.getdataListParm.parammaps.inputDatetime !== null) {
         this.see.getdataListParm.parammaps.startTime = parseTime(this.see.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -406,7 +406,7 @@ export default {
       }
       this.getSeeList()
     },
-    handleSearch2() {
+    form_search2() {
       console.log('点击了库存出库记录查询')
       if (this.see.getdataListParm2.parammaps.inputDatetime !== '' && this.see.getdataListParm2.parammaps.inputDatetime !== null) {
         this.see.getdataListParm2.parammaps.startTime = parseTime(this.see.getdataListParm2.parammaps.inputDatetime[0], '{y}-{m}-{d}')

src/views/inventoryManagement/systemConsumption/index.vue

@@ -14,7 +14,7 @@
       <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否审核" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in isAuditList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
@@ -239,7 +239,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')

src/views/inventoryManagement/warehousing/index.vue

@@ -13,7 +13,7 @@
       <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="是否入库" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
@@ -41,7 +41,7 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
         :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -101,7 +101,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="form_see(row)" />
             <el-button v-if="row.islaid == '否'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
           </template>
         </el-table-column>
@@ -110,7 +110,7 @@
     </div>
 
     <!-- 新增入库单 -->
-    <el-dialog :fullscreen="dialogFull" :title="textMap[create.dialogStatus]" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :title="textMap[create.dialogStatus]" :visible.sync="create.dialogFormVisible" v-if='create.dialogFormVisible' :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -377,7 +377,7 @@ export default {
           laiddate: '', feedid: '', feedname: '', operateweight: '', providerid: '', providername: '', startweight: '', priceold: '', contractcode: '', pricenew: '', sumprice: '', grossweight: '', tareweight: '', licence: '', pcpde: '', createemp: '', createdate: '', remark: '', 'wagonnumber': ''
         },
         rules: {
-          laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           operateweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           feedname: [{ type: 'string', required: true, message: '必填', trigger: 'change' }],
           pricenew: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
@@ -453,7 +453,7 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
       myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
@@ -538,7 +538,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       // console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -754,6 +754,8 @@ export default {
         this.$refs.createTemp.resetFields()
       })
     },
+
+   
     createData() {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
@@ -1019,7 +1021,7 @@ export default {
         }
       })
     },
-    handleSee(row) {
+    form_see(row) {
       console.log('点击了查看')
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()

src/views/inventoryManagement/warning/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container" style="position: relative;">
-    <div v-if="activeName=='first'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
-      <el-button class="import" icon="el-icon-upload2" @click="handleExport('tab1')">导出</el-button>
-    </div>
-    <div v-if="activeName=='second'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
-      <el-button class="import" icon="el-icon-upload2" @click="handleExport('tab2')">导出</el-button>
+    <div v-if="activeName=='first'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
+      <el-button class="import" icon="el-icon-upload2" @click="handleExport('tab1')">导出</el-button>
     </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <div v-if="activeName=='second'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
+      <el-button class="import" icon="el-icon-upload2" @click="handleExport('tab2')">导出</el-button>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="预混记录" name="first">
         <div class="table">
           <el-table
@@ -20,7 +20,7 @@
             style="width: 100%;"
             :row-style="rowStyle"
             :cell-style="cellStyle"
-            class="elTable table-fixed"
+            class="elTable table-fixed"
             :max-height="myHeight"
           >
             <el-table-column label="序号" align="center" type="index" width="50px" />
@@ -35,12 +35,12 @@
             <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
                 <a v-if="row.isUpdate && isRoleEdit" class="correcting" @click="handleUpdate(row)">校正</a>
-                <el-button v-if="row.isUpdateSave && isRoleEdit" :disabled="isokDisable" class="miniSuccess" icon="el-icon-folder-checked" @click="updateData(row)" />
+                <el-button v-if="row.isUpdateSave && isRoleEdit" :disabled="isokDisable" class="miniSuccess" icon="el-icon-folder-checked" @click="updateData(row)" />
                 <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
                 <el-button v-if="row.isUpdateSave && isRoleEdit" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
               </template>
             </el-table-column>
-          </el-table>
+          </el-table>
           <span v-if="tab1.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab1.total }}条</span>
         </div>
       </el-tab-pane>
@@ -87,28 +87,28 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
-                <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(row)" />
+                <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="form_see(row)" />
               </template>
             </el-table-column>
-          </el-table>
+          </el-table>
           <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
         </div>
       </el-tab-pane>
     </el-tabs>
 
     <el-dialog :fullscreen="dialogFull" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[see.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[see.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
       <div class="app-see">
         <el-form ref="temp" :rules="see.rules" :model="see.temp" label-position="right" label-width="110px" style="width: 100%;margin:0 auto">
           <el-row>
@@ -177,8 +177,8 @@ export default {
   name: 'Warning',
   components: { Pagination },
   data() {
-    return {
-      dialogFull: false,
+    return {
+      dialogFull: false,
       isRoleEdit: [],
       activeName: 'first',
       tab1: {
@@ -253,33 +253,33 @@ export default {
       requestParam: {},
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
       myHeight:document.documentElement.clientHeight - 85- 110
     }
   },
 
-  created() {
-    this.getButtons()
-    if (this.$route.params.jmp == undefined) {
+  created() {
+    this.getButtons()
+    if (this.$route.params.jmp == undefined) {
       this.getTab1List()
-    } else {
+    } else {
       this.activeName = 'second'
-      this.getTab2List()
+      this.getTab2List()
     }
   },
 
-  methods: {
-    getButtons() {
-      const Edit = 'Warning'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
+  methods: {
+    getButtons() {
+      const Edit = 'Warning'
+      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      this.isRoleEdit = isRoleEdit
     },
     handleClick(item) {
-      console.log(item)
-      if (item.name == 'first') {
-        this.getTab1List()
-      } else {
-        this.getTab2List()
+      console.log(item)
+      if (item.name == 'first') {
+        this.getTab1List()
+      } else {
+        this.getTab2List()
       }
     },
     getTab1List() {
@@ -379,8 +379,8 @@ export default {
         }, 100)
       })
     },
-    handleSee(row) {
-      this.see.dialogStatus = 'see'
+    form_see(row) {
+      this.see.dialogStatus = 'see'
       this.dialogFull = false
       this.see.dialogFormVisible = true
       this.see.temp = Object.assign({}, row)
@@ -407,19 +407,19 @@ export default {
       })
     },
     handleExport(item) {
-      console.log('导出')
-      if (item == 'tab1') {
-        var excelDatas = [
-          {
-            tHeader: ['预混配方', '当前剩余量', '预计使用天数'],
-            filterVal: ['pftname', 'stockweight', 'days'],
-            tableDatas: this.tab1.list,
-            sheetName: 'Sheet1'
-          }
-        ]
-        json2excel(excelDatas, '预混记录', true, 'xlsx')
-      } else {
-        this.download.getdataListParm.name = 'getFsWarnList'
+      console.log('导出')
+      if (item == 'tab1') {
+        var excelDatas = [
+          {
+            tHeader: ['预混配方', '当前剩余量', '预计使用天数'],
+            filterVal: ['pftname', 'stockweight', 'days'],
+            tableDatas: this.tab1.list,
+            sheetName: 'Sheet1'
+          }
+        ]
+        json2excel(excelDatas, '预混记录', true, 'xlsx')
+      } else {
+        this.download.getdataListParm.name = 'getFsWarnList'
         GetDataByName(this.download.getdataListParm).then(response => {
           if (response.data.list !== null) {
             this.download.list = response.data.list

src/views/shedProduction/dungScores/historyRecord.vue

@@ -2,7 +2,7 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item " type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="table">
@@ -32,7 +32,7 @@
         </el-table-column>
         <el-table-column :key="6" label="操作" prop="operation" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleSeeHistory (row)">{{ row.operation }}</a>
+            <a class="correcting" @click="form_seeHistory (row)">{{ row.operation }}</a>
           </template>
         </el-table-column>
       </el-table>
@@ -42,7 +42,7 @@
       <div class="seeHistory">
         <div class="search">
           <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
         </div>
         <div class="table">
@@ -163,7 +163,7 @@ export default {
       })
     },
 
-    handleSearch() {
+    form_search() {
       console.log(this.table.getdataListParm.parammaps.changetime)
 
         if (this.table.getdataListParm.parammaps.changetime == '' || this.table.getdataListParm.parammaps.changetime == null ) {
@@ -177,7 +177,7 @@ export default {
       this.table.getdataListParm.parammaps.changetime = ''
       this.getList()
     },
-    handleSeeHistory(row) {
+    form_seeHistory(row) {
       console.log(row)
       this.textMap.seeHistory = '粪便评分修改记录——栏舍：' + row.barname
       this.seeHistory.dialogFormVisible = true
@@ -207,7 +207,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch2() {
+    form_search2() {
       if (this.seeHistory.getdataListParm.parammaps.inputDatetime !== '' && this.seeHistory.getdataListParm.parammaps.inputDatetime !== null) {
         this.seeHistory.getdataListParm.parammaps.time1 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.seeHistory.getdataListParm.parammaps.time2 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')

src/views/shedProduction/dungScores/index.vue

@@ -7,14 +7,14 @@
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
-      <!-- 临时注释 -->
-      <!-- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy"  @click="handleCopy">复制</el-button> -->
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="form_delete">删除</el-button>
+      <!-- 临时注释 -->
+      <!-- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy"  @click="handleCopy">复制</el-button> -->
       <!-- 临时注释 -->
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
@@ -119,7 +119,7 @@
     </div>
 
     <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :title="textMap[create.dialogStatus]" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :title="textMap[create.dialogStatus]" :visible.sync="create.dialogFormVisible" v-if='create.dialogFormVisible'  :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -473,7 +473,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -737,7 +737,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })

src/views/shedProduction/dutyRecord/index.vue

@@ -12,12 +12,12 @@
       </el-select>
       <el-input ref="eqcode" v-model="table.getdataListParm.parammaps.eqcode" class="filter-item" placeholder="设备编号" style="width: 120px;" />
       <el-input ref="driver" v-model="table.getdataListParm.parammaps.driver" class="filter-item" placeholder="驾驶员" style="width: 120px;" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus"  @click="handleCreate">分配</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
       <el-button class="export" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport">导出</el-button>
     </div>
     <div class="table">
@@ -383,7 +383,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -649,7 +649,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择值班记录', duration: 2000 })

src/views/shedProduction/fecalScreen/historyRecord.vue

@@ -2,7 +2,7 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" :clearable="true" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="table">
@@ -35,7 +35,7 @@
         </el-table-column>
         <el-table-column :key="6" label="操作" prop="operation" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleSeeHistory (row)">{{ row.operation }}</a>
+            <a class="correcting" @click="form_seeHistory (row)">{{ row.operation }}</a>
           </template>
         </el-table-column>
       </el-table>
@@ -45,7 +45,7 @@
       <div class="seeHistory">
         <div class="search">
           <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
         </div>
         <div class="table">
@@ -168,7 +168,7 @@ export default {
       })
     },
 
-    handleSearch() {
+    form_search() {
       if (this.table.getdataListParm.parammaps.operatetime == '' || this.table.getdataListParm.parammaps.operatetime == null ) {
         this.table.getdataListParm.parammaps.operatetime = ''
       } else {
@@ -180,7 +180,7 @@ export default {
       this.table.getdataListParm.parammaps.operatetime = ''
       this.getList()
     },
-    handleSeeHistory(row) {
+    form_seeHistory(row) {
       console.log(row)
       this.textMap.seeHistory = '粪便筛修改记录——栏舍：' + row.barname
       this.seeHistory.dialogFormVisible = true
@@ -208,7 +208,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch2() {
+    form_search2() {
       if (this.seeHistory.getdataListParm.parammaps.inputDatetime !== '' && this.seeHistory.getdataListParm.parammaps.inputDatetime !== null) {
         this.seeHistory.getdataListParm.parammaps.time1 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.seeHistory.getdataListParm.parammaps.time2 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')

src/views/shedProduction/fecalScreen/index.vue

@@ -8,15 +8,15 @@
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
 
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
-      <!-- 临时注释 -->
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="form_delete">删除</el-button>
+      <!-- 临时注释 -->
       <!-- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button> -->
-      <!-- 临时注释 -->
+      <!-- 临时注释 -->
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -95,7 +95,7 @@
     </div>
 
     <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" v-if='create.dialogFormVisible' :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -437,7 +437,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -696,7 +696,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })

src/views/shedProduction/formulaDryMatter/historyRecord.vue

@@ -2,7 +2,7 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.changeTime" :clearable="true" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" @change="changeTime" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="table">
@@ -29,7 +29,7 @@
         <el-table-column :key="7" label="实际干物质" prop="actweight" min-width="90px" align="center" />
         <el-table-column :key="8" label="操作" prop="operation" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleSeeHistory (row)">{{ row.operation }}</a>
+            <a class="correcting" @click="form_seeHistory (row)">{{ row.operation }}</a>
           </template>
         </el-table-column>
       </el-table>
@@ -39,7 +39,7 @@
       <div class="seeHistory">
         <div class="search">
           <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
         </div>
         <div class="table">
@@ -207,7 +207,7 @@ export default {
         }
       }
     },
-    handleSearch() {
+    form_search() {
       console.log(this.table.getdataListParm.parammaps.changeTime)
       if (this.table.getdataListParm.parammaps.changeTime == '' || this.table.getdataListParm.parammaps.changeTime == null ) {
         this.table.getdataListParm.parammaps.changeTime = ''
@@ -220,7 +220,7 @@ export default {
       this.table.getdataListParm.parammaps.changeTime = ''
       this.getList()
     },
-    handleSeeHistory(row) {
+    form_seeHistory(row) {
       console.log(row)
       this.textMap.seeHistory = '配方干物质修改记录——栏舍：' + row.barname
       this.seeHistory.dialogFormVisible = true
@@ -291,7 +291,7 @@ export default {
         }
       }
     },
-    handleSearch2() {
+    form_search2() {
       if (this.seeHistory.getdataListParm.parammaps.inputDatetime !== '' && this.seeHistory.getdataListParm.parammaps.inputDatetime !== null) {
         this.seeHistory.getdataListParm.parammaps.time1 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.seeHistory.getdataListParm.parammaps.time2 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')

src/views/shedProduction/formulaDryMatter/index.vue

@@ -10,15 +10,15 @@
       <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
-      <!-- 临时注释 -->
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
+      <!-- 临时注释 -->
       <!-- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button> -->
-      <!-- 临时注释 -->
+      <!-- 临时注释 -->
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -105,7 +105,7 @@
     </div>
 
     <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="70%">
+    <el-dialog :fullscreen="dialogFull" v-if='create.dialogFormVisible' :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="70%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -422,7 +422,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -695,7 +695,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })

src/views/shedProduction/materialRemainingRecord/index.vue

@@ -6,34 +6,34 @@
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
-      </el-select>
-      <el-select v-model="record" filterable placeholder="记录" class="filter-item" style="width: 150px;" @change="changeRecord">
-        <el-option v-for="item in recordList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-      <el-select v-if="record== '1'" v-model="table.getdataListParm.parammaps.eqcode" filterable placeholder="TMR编号" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.tname" :value="item.eqcode" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-select v-model="record" filterable placeholder="记录" class="filter-item" style="width: 150px;" @change="changeRecord">
+        <el-option v-for="item in recordList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-select v-if="record== '1'" v-model="table.getdataListParm.parammaps.eqcode" filterable placeholder="TMR编号" class="filter-item" style="width: 120px;" clearable>
+        <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.tname" :value="item.eqcode" />
+      </el-select>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation" v-if="record== '0'">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="form_delete">删除</el-button>
       <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy"  @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
       <el-dropdown style="float: right;margin-right: 10px;">
         <el-button class="export" icon="el-icon-upload2">导出</el-button>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu slot="dropdown">
           <el-dropdown-item  @click.native="handleExport(1)">导出模板</el-dropdown-item>
           <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-    </div>
-    <div class="operation" v-else>
-        <el-button style="float: right;margin-right: 10px;" class="export" icon="el-icon-upload2" @click="handleExport(3)">导出</el-button>
-    </div>
+    </div>
+    <div class="operation" v-else>
+        <el-button style="float: right;margin-right: 10px;" class="export" icon="el-icon-upload2" @click="handleExport(3)">导出</el-button>
+    </div>
     <!-- 手动记录 -->
     <div class="table" v-if="record== '0'">
       <el-table
@@ -56,11 +56,11 @@
           <template slot-scope="scope">
             <span>{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
-        <el-table-column label="剩料量(kg)" min-width="150px" align="center" prop="remain" />
-        <el-table-column label="班次" min-width="90px" align="center" prop="timesstr" />
-        <el-table-column label="收集时间" min-width="100px" align="center" prop="operatetime" />
+        </el-table-column>
+        <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
+        <el-table-column label="剩料量(kg)" min-width="150px" align="center" prop="remain" />
+        <el-table-column label="班次" min-width="90px" align="center" prop="timesstr" />
+        <el-table-column label="收集时间" min-width="100px" align="center" prop="operatetime" />
         <el-table-column label="操作人" min-width="90px" align="center" prop="emp" />
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
@@ -71,39 +71,39 @@
         </el-table-column>
       </el-table>
       <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
-    </div>
-    <!-- TMR设备自动记录 -->
-    <div class="table" v-else>
-      <el-table
-        :key="table.tableKey2"
-        v-loading="table.listLoading2"
-        element-loading-text="给我一点时间"
-        :data="table.list"
-        border
-        fit
-        highlight-current-row
-        style="width: 98%;"
-        :row-style="rowStyle"
-        :cell-style="cellStyle"
-        class="elTable table-fixed"
-        :height="myHeight"
-      >
-        <el-table-column type="selection" align="center" width="50" />
-        <el-table-column label="TMR设备编号" min-width="150px" align="center" prop="eqcode" />
-        <el-table-column label="TMR设备名称" min-width="150px" align="center" prop="eqname" />
-        <el-table-column label="TMR设备类型" min-width="150px" align="center" prop="tclassname" />
-        <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
-        <el-table-column label="收集时间" min-width="150px" align="center" prop="createtime" />
-        <el-table-column label="剩料重量(kg)" min-width="150px" align="center" prop="weight" />
-        <el-table-column label="开始重量(kg)" min-width="150px" align="center" prop="beginweight" />
-        <el-table-column label="结束重量(kg)" min-width="150px" align="center" prop="endweight" />
-        <el-table-column label="驾驶员" min-width="150px" align="center" prop="driver" />
-      </el-table>
-      <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+    </div>
+    <!-- TMR设备自动记录 -->
+    <div class="table" v-else>
+      <el-table
+        :key="table.tableKey2"
+        v-loading="table.listLoading2"
+        element-loading-text="给我一点时间"
+        :data="table.list"
+        border
+        fit
+        highlight-current-row
+        style="width: 98%;"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        class="elTable table-fixed"
+        :height="myHeight"
+      >
+        <el-table-column type="selection" align="center" width="50" />
+        <el-table-column label="TMR设备编号" min-width="150px" align="center" prop="eqcode" />
+        <el-table-column label="TMR设备名称" min-width="150px" align="center" prop="eqname" />
+        <el-table-column label="TMR设备类型" min-width="150px" align="center" prop="tclassname" />
+        <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
+        <el-table-column label="收集时间" min-width="150px" align="center" prop="createtime" />
+        <el-table-column label="剩料重量(kg)" min-width="150px" align="center" prop="weight" />
+        <el-table-column label="开始重量(kg)" min-width="150px" align="center" prop="beginweight" />
+        <el-table-column label="结束重量(kg)" min-width="150px" align="center" prop="endweight" />
+        <el-table-column label="驾驶员" min-width="150px" align="center" prop="driver" />
+      </el-table>
+      <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
     </div>
 
     <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="40%">
+    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" v-if='create.dialogFormVisible' width="40%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -194,12 +194,12 @@ export default {
       isRoleEdit: [],
       requestParams: [
         { name: 'getBarListEnable', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid') }},
-        { name: 'getSysoptEnable', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'inforname': 'times' }},
-        { name: 'getTMRListEnableType', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'eqtype': '1' }},
+        { name: 'getSysoptEnable', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'inforname': 'times' }},
+        { name: 'getTMRListEnableType', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'eqtype': '1' }},
 
       ],
       houseNameList: [], // 栏舍名称
-      frequencyList: [], // 班次
+      frequencyList: [], // 班次
       recordList:[{id:'0',name:'手动记录'},{id:'1',name:'TMR设备自动记录'}],
       record:'0',
       table: {
@@ -221,9 +221,9 @@ export default {
         list: [],
         total: 0,
         listLoading: true,
-        temp: {},
-        tableKey2:0,
-        listLoading2: false,
+        temp: {},
+        tableKey2:0,
+        listLoading2: false,
         list2:[]
       },
 
@@ -320,7 +320,7 @@ export default {
     },
     getDownList() {
       GetDataByNames(this.requestParams).then(response => {
-        this.houseNameList = response.data.getBarListEnable.list
+        this.houseNameList = response.data.getBarListEnable.list
         this.TMRNumberList = response.data.getTMRListEnableType.list
         if (response.data.getSysoptEnable.list !== null) {
           for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
@@ -354,14 +354,14 @@ export default {
     },
 
     getList() {
-      this.table.listLoading = true
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      } else {
-        this.table.getdataListParm.parammaps.inputDatetime = ''
-        this.table.getdataListParm.parammaps.startTime = ''
-        this.table.getdataListParm.parammaps.stopTime = ''
+      this.table.listLoading = true
+      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
+        this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      } else {
+        this.table.getdataListParm.parammaps.inputDatetime = ''
+        this.table.getdataListParm.parammaps.startTime = ''
+        this.table.getdataListParm.parammaps.stopTime = ''
       }
       GetDataByName(this.table.getdataListParm).then(response => {
         console.log('table数据', response.data.list)
@@ -377,17 +377,17 @@ export default {
           this.table.listLoading = false
         }, 100)
       })
-    },
-    changeRecord(item){
-      if(item == '0'){
-        this.table.getdataListParm.name = 'getBarfeedremainList'
-      }else{
-        this.table.getdataListParm.name = 'getRemainplanrecord'
-      }
-      this.table.getdataListParm.offset = 1
-      this.getList()
     },
-    handleSearch() {
+    changeRecord(item){
+      if(item == '0'){
+        this.table.getdataListParm.name = 'getBarfeedremainList'
+      }else{
+        this.table.getdataListParm.name = 'getRemainplanrecord'
+      }
+      this.table.getdataListParm.offset = 1
+      this.getList()
+    },
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -592,7 +592,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
@@ -689,11 +689,11 @@ export default {
           window.URL.revokeObjectURL(url)
         })
       } else {
-        console.log('点击了导出数据',item,this.record)
-        if(this.record == '0'){
-          this.download.getdataListParm.name = 'getBarfeedremainList'
-        }else{
-          this.download.getdataListParm.name = 'getRemainplanrecord'
+        console.log('点击了导出数据',item,this.record)
+        if(this.record == '0'){
+          this.download.getdataListParm.name = 'getBarfeedremainList'
+        }else{
+          this.download.getdataListParm.name = 'getRemainplanrecord'
         }
         this.download.getdataListParm.parammaps = this.table.getdataListParm.parammaps
         if (this.download.getdataListParm.parammaps.inputDatetime !== '' && this.download.getdataListParm.parammaps.inputDatetime !== null) {
@@ -709,8 +709,8 @@ export default {
             this.download.list = response.data.list
           } else {
             this.download.list = []
-          }
-           if(item== 2){
+          }
+           if(item== 2){
               var excelDatas1 = [
                 {
                   tHeader: ['栏舍名称', '剩料量（kg）', '班次', '收集时间', '操作人'],
@@ -720,16 +720,16 @@ export default {
                 }
               ]
               json2excel(excelDatas1, '栏舍剩料记录-手动记录', true, 'xlsx')
-           }else{
-             var excelDatas2 = [
-               {
-                 tHeader: ['TMR设备编号','TMR设备名称','TMR设备类型','栏舍名称','收集时间','剩料重量(kg)','开始重量(kg)','结束重量(kg)','驾驶员'],
-                 filterVal: ['eqcode','eqname','tclassname','barname','createtime','weight','beginweight','endweight','driver'],
-                 tableDatas: this.download.list,
-                 sheetName: 'Sheet1'
-               }
-             ]
-             json2excel(excelDatas2, '栏舍剩料记录-TMR设备自动记录', true, 'xlsx')
+           }else{
+             var excelDatas2 = [
+               {
+                 tHeader: ['TMR设备编号','TMR设备名称','TMR设备类型','栏舍名称','收集时间','剩料重量(kg)','开始重量(kg)','结束重量(kg)','驾驶员'],
+                 filterVal: ['eqcode','eqname','tclassname','barname','createtime','weight','beginweight','endweight','driver'],
+                 tableDatas: this.download.list,
+                 sheetName: 'Sheet1'
+               }
+             ]
+             json2excel(excelDatas2, '栏舍剩料记录-TMR设备自动记录', true, 'xlsx')
            }
         })
       }

src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue

@@ -2,7 +2,7 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="true"  placeholder="年/月/日" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="table">
@@ -41,7 +41,7 @@
         </el-table-column>
         <el-table-column :key="8" label="操作" prop="operation" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleSeeHistory (row)">{{ row.operation }}</a>
+            <a class="correcting" @click="form_seeHistory (row)">{{ row.operation }}</a>
           </template>
         </el-table-column>
       </el-table>
@@ -51,7 +51,7 @@
       <div class="seeHistory">
         <div class="search">
           <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
         </div>
         <div class="table">
@@ -224,7 +224,7 @@ export default {
         }
       }
     },
-    handleSearch() {
+    form_search() {
       if (this.table.getdataListParm.parammaps.operatetime == '' || this.table.getdataListParm.parammaps.operatetime == null ) {
         this.table.getdataListParm.parammaps.operatetime = ''
       } else {
@@ -236,7 +236,7 @@ export default {
       this.table.getdataListParm.parammaps.operatetime = ''
       this.getList()
     },
-    handleSeeHistory(row) {
+    form_seeHistory(row) {
       console.log(row)
       this.textMap.seeHistory = '宾州筛修改记录——栏舍：' + row.barname
       this.seeHistory.dialogFormVisible = true
@@ -307,7 +307,7 @@ export default {
         }
       }
     },
-    handleSearch2() {
+    form_search2() {
       if (this.seeHistory.getdataListParm.parammaps.inputDatetime !== '' && this.seeHistory.getdataListParm.parammaps.inputDatetime !== null) {
         this.seeHistory.getdataListParm.parammaps.time1 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.seeHistory.getdataListParm.parammaps.time2 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')

src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -10,15 +10,15 @@
       <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
-      <!-- 临时注释 -->
-      <!-- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button> -->
-      <!-- 临时注释 -->
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
+      <!-- 临时注释 -->
+      <!-- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button> -->
+      <!-- 临时注释 -->
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -106,7 +106,7 @@
     </div>
 
     <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" v-if='create.dialogFormVisible' width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -468,7 +468,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -741,7 +741,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择宾州筛', duration: 2000 })

src/views/shedProduction/performance/index.vue

@@ -10,12 +10,12 @@
       <el-select v-model="table.getdataListParm.parammaps.cowclass" filterable placeholder="牲畜类别" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.classname" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
       <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
@@ -141,7 +141,7 @@
       <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
     </div>
 
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false"  v-if='create.dialogFormVisible' width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -470,7 +470,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -1009,7 +1009,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择栏舍', duration: 2000 })

src/views/shedProduction/physicalConditionScore/historyRecord.vue

@@ -2,7 +2,7 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日"  :clearable="true"/>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="table">
@@ -32,7 +32,7 @@
         </el-table-column>
         <el-table-column :key="6" label="操作" prop="operation" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleSeeHistory (row)">{{ row.operation }}</a>
+            <a class="correcting" @click="form_seeHistory (row)">{{ row.operation }}</a>
           </template>
         </el-table-column>
       </el-table>
@@ -42,7 +42,7 @@
       <div class="seeHistory">
         <div class="search">
           <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
         </div>
         <div class="table">
@@ -163,7 +163,7 @@ export default {
       })
     },
 
-    handleSearch() {
+    form_search() {
 console.log(this.table.getdataListParm.parammaps.changetime)
 
         if (this.table.getdataListParm.parammaps.changetime == '' || this.table.getdataListParm.parammaps.changetime == null ) {
@@ -180,7 +180,7 @@ console.log(this.table.getdataListParm.parammaps.changetime)
       this.table.getdataListParm.parammaps.changetime = ''
       this.getList()
     },
-    handleSeeHistory(row) {
+    form_seeHistory(row) {
       console.log(row)
       this.textMap.seeHistory = '体况评分修改记录——栏舍：' + row.barname
       this.seeHistory.dialogFormVisible = true
@@ -210,7 +210,7 @@ console.log(this.table.getdataListParm.parammaps.changetime)
         }, 100)
       })
     },
-    handleSearch2() {
+    form_search2() {
       if (this.seeHistory.getdataListParm.parammaps.inputDatetime !== '' && this.seeHistory.getdataListParm.parammaps.inputDatetime !== null) {
         this.seeHistory.getdataListParm.parammaps.time1 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.seeHistory.getdataListParm.parammaps.time2 = parseTime(this.seeHistory.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')

src/views/shedProduction/physicalConditionScore/index.vue

@@ -7,15 +7,15 @@
       <el-select v-model="table.getdataListParm.parammaps.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
-      <!-- 临时注释 -->
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="form_delete">删除</el-button>
+      <!-- 临时注释 -->
       <!-- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button> -->
-      <!-- 临时注释 -->
+      <!-- 临时注释 -->
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -129,7 +129,7 @@
     </div>
 
     <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" v-if='create.dialogFormVisible' width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -499,7 +499,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -765,7 +765,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })

src/views/statisticalAnalysis/equipmentRunningTrack/index - 副本.vue

@@ -1,38 +1,38 @@
-<template>
-  <div class="app-container">
-    <!-- <h1>牧场</h1> -->
-    <div class="search">
+<template>
+  <div class="app-container">
+    <!-- <h1>牧场</h1> -->
+    <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" />
-      <el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="设备类型" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-    </div>
-    <el-row :gutter="20">
-      <el-col :span="8">
-        <h4>设备列表</h4>
-        <div class="table">
-          <el-table
-            :key="table.tableKey"
-            v-loading="table.listLoading"
-            element-loading-text="给我一点时间"
-            :data="table.list"
-            border
-            fit
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
-            :height="table1Height"
-            @row-click="rowClick1"
-          >
-            <el-table-column label="设备类型" min-width="90px" align="center" prop="field1" />
-            <el-table-column label="设备名称" min-width="80px" align="center" prop="field2" />
-            <el-table-column label="GPS设备名称" min-width="90px" align="center" prop="field3" />
-            <el-table-column label="总时长(分钟)" min-width="100px" align="center" prop="field4" />
-          </el-table>
+      <el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="设备类型" class="filter-item" style="width: 120px;" clearable>
+        <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
+      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+    </div>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <h4>设备列表</h4>
+        <div class="table">
+          <el-table
+            :key="table.tableKey"
+            v-loading="table.listLoading"
+            element-loading-text="给我一点时间"
+            :data="table.list"
+            border
+            fit
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable table-fixed"
+            :height="table1Height"
+            @row-click="rowClick1"
+          >
+            <el-table-column label="设备类型" min-width="90px" align="center" prop="field1" />
+            <el-table-column label="设备名称" min-width="80px" align="center" prop="field2" />
+            <el-table-column label="GPS设备名称" min-width="90px" align="center" prop="field3" />
+            <el-table-column label="总时长(分钟)" min-width="100px" align="center" prop="field4" />
+          </el-table>
         </div>
         <h4>设备详情</h4>
         <div class="table">
@@ -56,50 +56,50 @@
             <el-table-column label="结束时间" min-width="90px" align="center" prop="field3" />
             <el-table-column label="时长(分钟)" min-width="100px" align="center" prop="field4" />
           </el-table>
-        </div>
-      </el-col>
+        </div>
+      </el-col>
       <el-col :span="16" class="map">
         <h4>设备轨迹图</h4>
         <div v-if="isShow" style="text-align: center;line-height: 400px;">设备轨迹图加载失败，请刷新加载设备轨迹图</div>
-        <div v-else id="yzMap" style="min-height: 400px;" />
-      </el-col>
-    </el-row>
-
-  </div>
-
-</template>
+        <div v-else id="yzMap" style="min-height: 400px;" />
+      </el-col>
+    </el-row>
+
+  </div>
 
-<script>
-import MapInit from '@/components/show/MapInit.js'
-import { GetDataByName } from '@/api/common'
-import Cookies from 'js-cookie'
-import { parseTime } from '@/utils/index.js'
-export default {
-  name: 'EquipmentRunningTrack',
-  data() {
+</template>
+
+<script>
+import MapInit from '@/components/show/MapInit.js'
+import { GetDataByName } from '@/api/common'
+import Cookies from 'js-cookie'
+import { parseTime } from '@/utils/index.js'
+export default {
+  name: 'EquipmentRunningTrack',
+  data() {
     return {
       equipmentTypeList: [{ id: 0, name: '自走式TMR' }, { id: 1, name: '撒料设备TMR' }, { id: 2, name: '铲车' }, { id: 3, name: '推料车' }, { id: 4, name: '推粪车' }],
-      // TMR设备列表
-      table: {
-        getdataListParm: {
-          name: 'getprocessAnalysis',
-          page: 1,
-          offset: 1,
-          pagecount: '',
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            date: parseTime(new Date(), '{y}-{m}-{d}'),
-            iscompleted: '',
-            tmrtname: '',
-            lpplantype: ''
-          }
-        },
-        tableKey: 0,
-        list: [],
-        total: 0,
-        listLoading: true
-      },
+      // TMR设备列表
+      table: {
+        getdataListParm: {
+          name: 'getprocessAnalysis',
+          page: 1,
+          offset: 1,
+          pagecount: '',
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            date: parseTime(new Date(), '{y}-{m}-{d}'),
+            iscompleted: '',
+            tmrtname: '',
+            lpplantype: ''
+          }
+        },
+        tableKey: 0,
+        list: [],
+        total: 0,
+        listLoading: true
+      },
       table2: {
         getdataListParm: {
           name: 'getprocessAnalysisStr',
@@ -140,52 +140,52 @@ export default {
         total: 0,
         listLoading: true
       },
-      table1Height: (document.documentElement.clientHeight - 85 - 250) / 2,
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
+      table1Height: (document.documentElement.clientHeight - 85 - 250) / 2,
+      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
       map: '', drivingRoute: '',
       zoom: 16.5,
       startIcon: 'http://lbs.tianditu.gov.cn/images/bus/start.png',	// 起点图标
       endIcon: 'http://lbs.tianditu.gov.cn/images/bus/end.png', // 终点图标
       line: null,
-      points: [],
-      isShow: false
-    }
-  },
-  created() {
+      points: [],
+      isShow: false
+    }
+  },
+  created() {
     this.getList()
-    console.log(document.documentElement.clientHeight - 85 - 250)
-  },
-  methods: {
-    getList() {
-      this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('TMR设备列表table数据', response.data.list)
-        // if (response.data.list !== null) {
-        //   this.table.list = response.data.list
-        // } else {
-        //   this.table.list = []
+    console.log(document.documentElement.clientHeight - 85 - 250)
+  },
+  methods: {
+    getList() {
+      this.table.listLoading = true
+      GetDataByName(this.table.getdataListParm).then(response => {
+        console.log('TMR设备列表table数据', response.data.list)
+        // if (response.data.list !== null) {
+        //   this.table.list = response.data.list
+        // } else {
+        //   this.table.list = []
         // }
         this.table.list = [
           { 'field1': '自走式TMR', 'field2': '1', 'field3': '自走式GPS', 'field4': '100', 'id': '1' },
           { 'field1': '铲车', 'field2': '1号铲车', 'field3': '铲车GPS', 'field4': '60', 'id': '2' }
         ]
         this.table2.getdataListParm.parammaps.id = this.table.list[0].id
-        this.getList2()
-        setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
-    },
-    handleSearch() {
-      this.table.getdataListParm.offset = 1
-      this.getList()
-    },
-    handleRefresh() {
-      console.log('点击了重置')
-      this.table.getdataListParm.offset = 1
-      this.getList()
-    },
+        this.getList2()
+        setTimeout(() => {
+          this.table.listLoading = false
+        }, 100)
+      })
+    },
+    form_search() {
+      this.table.getdataListParm.offset = 1
+      this.getList()
+    },
+    handleRefresh() {
+      console.log('点击了重置')
+      this.table.getdataListParm.offset = 1
+      this.getList()
+    },
     rowClick1(row, column, event) {
       if (row.id == '1') {
         this.table2.getdataListParm.parammaps.id = '1'
@@ -193,16 +193,16 @@ export default {
         this.table2.getdataListParm.parammaps.id = '2'
       }
       this.getList2()
-    },
-
-    getList2() {
-      this.table2.listLoading = false
-      GetDataByName(this.table2.getdataListParm).then(response => {
-        console.log('过程详情table数据', response.data.list)
-        // if (response.data.list !== null) {
-        //   this.table2.list = response.data.list
-        // } else {
-        //   this.table2.list = []
+    },
+
+    getList2() {
+      this.table2.listLoading = false
+      GetDataByName(this.table2.getdataListParm).then(response => {
+        console.log('过程详情table数据', response.data.list)
+        // if (response.data.list !== null) {
+        //   this.table2.list = response.data.list
+        // } else {
+        //   this.table2.list = []
         // }
         if (this.table2.getdataListParm.parammaps.id == '1') {
           this.table2.list = [
@@ -216,10 +216,10 @@ export default {
         }
         this.table3.getdataListParm.parammaps.id = this.table2.list[0].id
         this.getList3()
-        setTimeout(() => {
-          this.table2.listLoading = false
-        }, 100)
-      })
+        setTimeout(() => {
+          this.table2.listLoading = false
+        }, 100)
+      })
     },
     rowClick2(row, column, event) {
       if (row.id == '1') {
@@ -305,44 +305,44 @@ export default {
         // this.table3.startLngLatMap = [117.754060, 33.505650]
         // this.table3.endLngLatMap = [117.728130, 33.603550]
       }
-      // this.getList3()
-      MapInit.init().then(
-        T => {
-          this.isShow = false
-          this.T = T
-          this.map = new T.Map('yzMap', config) // /初始化地图对象
-          const ctrl = new T.Control.MapType()
-          this.map.addControl(ctrl)
-          this.map.centerAndZoom(new T.LngLat(this.table3.initializationMap[0], this.table3.initializationMap[1]), this.zoom) // 初始化
-          var config = {
-            policy: 0,	// 驾车策略
-            onSearchComplete: this.searchResult	// 检索完成后的回调函数
-          }
-
-          console.log(this.map, '=========this.map')
-          // var map = this.map
-          // this.map.disableDrag()
-          // setTimeout(() => {
-          //   alert('可以拖拽地图了')
-          //   this.map.enableDrag()
-          // }, 2000)
-          this.map.setMapType(TMAP_HYBRID_MAP)
-          this.points = []
-          for (let i = 0; i < this.table3.pointsList.length; i++) {
-            this.points.push(new T.LngLat(this.table3.pointsList[i].longitude, this.table3.pointsList[i].latitude))
-          }
-          // 创建线对象
-          this.line = new T.Polyline(this.points, {
-            color: 'red'
-          })
-          // 向地图上添加线
-          this.map.addOverLay(this.line)
-          // this.drivingRoute = new T.DrivingRoute(this.map, config)
-          // this.searchDrivingRoute()
-          // this.map.enableInertia()
-        }).catch(error => {
-        console.log(error, '666')
-        this.isShow = true
+      // this.getList3()
+      MapInit.init().then(
+        T => {
+          this.isShow = false
+          this.T = T
+          this.map = new T.Map('yzMap', config) // /初始化地图对象
+          const ctrl = new T.Control.MapType()
+          this.map.addControl(ctrl)
+          this.map.centerAndZoom(new T.LngLat(this.table3.initializationMap[0], this.table3.initializationMap[1]), this.zoom) // 初始化
+          var config = {
+            policy: 0,	// 驾车策略
+            onSearchComplete: this.searchResult	// 检索完成后的回调函数
+          }
+
+          console.log(this.map, '=========this.map')
+          // var map = this.map
+          // this.map.disableDrag()
+          // setTimeout(() => {
+          //   alert('可以拖拽地图了')
+          //   this.map.enableDrag()
+          // }, 2000)
+          this.map.setMapType(TMAP_HYBRID_MAP)
+          this.points = []
+          for (let i = 0; i < this.table3.pointsList.length; i++) {
+            this.points.push(new T.LngLat(this.table3.pointsList[i].longitude, this.table3.pointsList[i].latitude))
+          }
+          // 创建线对象
+          this.line = new T.Polyline(this.points, {
+            color: 'red'
+          })
+          // 向地图上添加线
+          this.map.addOverLay(this.line)
+          // this.drivingRoute = new T.DrivingRoute(this.map, config)
+          // this.searchDrivingRoute()
+          // this.map.enableInertia()
+        }).catch(error => {
+        console.log(error, '666')
+        this.isShow = true
       })
     },
     getList3() {
@@ -440,7 +440,7 @@ export default {
 
     roadMap() {
       MapInit.init().then(
-        T => {
+        T => {
           this.isShow = false
           this.T = T
           this.map = new T.Map('yzMap', config) // /初始化地图对象
@@ -456,7 +456,7 @@ export default {
           this.map.disableDrag()
           // setTimeout(() => {
           //   alert('可以拖拽地图了')
-          //   this.map.enableDrag()
+          //   this.map.enableDrag()
           // }, 2000)
           this.map.setMapType(TMAP_HYBRID_MAP)
           this.points = []
@@ -465,8 +465,8 @@ export default {
           }
           // 创建线对象
           this.line = new T.Polyline(this.points, {
-            color: 'red'
-          })
+            color: 'red'
+          })
           // 向地图上添加线
           this.map.addOverLay(this.line)
           this.drivingRoute = new T.DrivingRoute(this.map, config)
@@ -474,16 +474,16 @@ export default {
           // this.map.enableInertia()
           // console.log(JSON.stringify(this.map), '=========this.map')
         }).catch(error => {
-        console.log(error, '666')
+        console.log(error, '666')
         this.isShow = true
       })
-    },
-    getDistance(points) {
-      var r = 0
-      for (var k = 0; k < points.length - 1; k++) {
-        r += points[k].distanceTo(points[k + 1])
-      }
-      return r
+    },
+    getDistance(points) {
+      var r = 0
+      for (var k = 0; k < points.length - 1; k++) {
+        r += points[k].distanceTo(points[k + 1])
+      }
+      return r
     }
 
     // searchDrivingRoute() {
@@ -540,23 +540,23 @@ export default {
     //     that.createRoute(plan.getPath())
     //   }
     // }
-
-  }
-}
-
-</script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-  .detail{
-    height:84px;border: 1px solid #EBEEF5;padding-left:10px;font:16px/32px '';color:#333;
-    .detail-t{margin-top: 10px;}
-    .detail-b{margin-bottom: 10px;}
+
+  }
+}
+
+</script>
+<style lang="scss" scoped>
+  .search{padding-top:10px;clear: both;}
+  .table{margin-top:10px;}
+  .detail{
+    height:84px;border: 1px solid #EBEEF5;padding-left:10px;font:16px/32px '';color:#333;
+    .detail-t{margin-top: 10px;}
+    .detail-b{margin-bottom: 10px;}
   }
   .map{position: relative;min-height: 480px;}
    #yzMap {
     width: 95%;
     height: 100%;
     position: absolute;
-  }
-</style>
+  }
+</style>

src/views/statisticalAnalysis/equipmentRunningTrack/index.vue

@@ -6,7 +6,7 @@
       <el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="设备类型" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <el-row :gutter="20">
@@ -177,7 +177,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       this.table.getdataListParm.offset = 1
       this.getList()
     },

src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue

@@ -349,7 +349,7 @@
           <el-input v-if="pasture.isTrainNumber" v-model="pasture.table.getdataListParm.parammaps.sort" class="filter-item" style="width: 150px;" placeholder="车次" />
           <el-input v-if="pasture.isTrainNumber" v-model="pasture.table.getdataListParm.parammaps.times" class="filter-item" style="width: 150px;" placeholder="班次" />
           <el-input v-if="pasture.isTrainNumber" v-model="pasture.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 150px;" placeholder="TMR名称" />
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
         </div>
         <div class="table">
           <h4>混料</h4>
@@ -1095,9 +1095,9 @@ export default {
       }
     },
     changeChecked() {
-      this.handleSearch()
+      this.form_search()
     },
-    handleSearch() {
+    form_search() {
       if (this.pasture.checked == true) {
         if (this.pasture.radio == '0') {
           console.log('配方名称/查询111')

src/views/statisticalAnalysis/errorAnalysis/group/tab2.vue

@@ -22,7 +22,7 @@
         <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 120px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
           <el-option v-for="item in isuseList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-        <el-button class="successBorder" @click="handleSearch">查询</el-button>
+        <el-button class="successBorder" @click="form_search">查询</el-button>
         <el-button class="successBorder" @click="handleRefresh">重置</el-button>
         <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">导出</el-button>
       </div>
@@ -219,7 +219,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       this.table.getdataListParm.name = 'getStatisticsHL'
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         console.log(this.table.getdataListParm.parammaps.inputDatetime)

src/views/statisticalAnalysis/errorAnalysis/group/tab3.vue

@@ -23,7 +23,7 @@
         <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 110px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
           <el-option v-for="item in isuseList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-        <el-button class="successBorder" style="float:left;" @click="handleSearch">查询</el-button>
+        <el-button class="successBorder" style="float:left;" @click="form_search">查询</el-button>
         <el-button class="successBorder" style="float:left;" @click="handleRefresh">重置</el-button>
         <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">导出</el-button>
       </div>
@@ -215,7 +215,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       this.table.getdataListParm.name = 'getStatisticsSL'
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')

src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -55,7 +55,7 @@
             <el-input-number :controls="false" :precision="2" v-model="tab.table.getdataListParm.parammaps.slzql2" placeholder="撒料正确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
           <el-checkbox v-model="tab.table.getdataListParm.parammaps.error" style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh1">重置</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
@@ -669,7 +669,7 @@
           </div>
           <el-checkbox v-model="tab2.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
 
-          <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch2">查询</el-button>
+          <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>
         </div>
@@ -751,7 +751,7 @@
             <el-input-number :controls="false" :precision="2" v-model="tab3.table.getdataListParm.parammaps.slzql2" placeholder="撒料正确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
           <el-checkbox v-model="tab3.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
-          <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch3">查询</el-button>
+          <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>
         </div>
@@ -1301,7 +1301,7 @@ export default {
       activeName: 'first',
       tab: {
         TMRNameList:[],
-        radio: '2',
+        radio: '7',
         isDriver: false,
         isFormulaName: false, // 配方名称
         isHouseName: true, // 栏舍名称
@@ -1711,7 +1711,7 @@ export default {
       stopTime:'',
       error:'',
       isShowDialog: false,
-      statisticalTypeList: [{ id: '0', name: '驾驶员' }, { id: '1', name: '配方名称' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '牲畜类别' }, { id: '4', name: '车次' }, { id: '5', name: 'TMR名称' }, { id: '6', name: '饲料' }],
+      statisticalTypeList: [{ id: '7', name: '无分类' }, { id: '0', name: '驾驶员' }, { id: '1', name: '配方名称' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '牲畜类别' }, { id: '4', name: '车次' }, { id: '5', name: 'TMR名称' }, { id: '6', name: '饲料' }],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
       exportList:{
@@ -2831,7 +2831,7 @@ export default {
         this.tab.table2.getdataListParm.offset = 1
         this.getTabList2()
         this.getTMRNameList()
-      }else if (this.tab.radio == '6') {
+      } else if (this.tab.radio == '6') {
         console.log('饲料')
         this.tab.isDriver = false
         this.tab.isFormulaName = false
@@ -2842,12 +2842,26 @@ export default {
         this.tab.isFeed = true
         this.tab.table.getdataListParm.offset = 1
         this.getTabList()
+      } else if (this.tab.radio == '7') {
+        console.log('无分类')
+        this.tab.isDriver = false
+        this.tab.isFormulaName = false
+        this.tab.isHouseName = false
+        this.tab.isLivestockType = false
+        this.tab.isTrainNumber = false
+        this.tab.isTMRName = false
+        this.tab.isFeed = false
+        this.tab.table.getdataListParm.offset = 1
+        this.getTabList()
+        this.tab.table2.getdataListParm.offset = 1
+        this.getTabList2()
+        
       }
     },
     // 按日期统计
     changeChecked() {
       console.log(this.tab.checked)
-      this.handleSearch()
+      this.form_search()
     },
     // 汇总统计/混料
     getTabList() {
@@ -2928,7 +2942,7 @@ export default {
       })
     },
     // 查询
-    handleSearch() {
+    form_search() {
       if (this.tab.radio == '0') {
         console.log('驾驶员/查询111')
         this.tab.isDriver = true
@@ -3018,6 +3032,18 @@ export default {
         this.tab.isFeed = true
         this.tab.table.getdataListParm.offset = 1
         this.getTabList()
+      }else if(this.tab.radio == '7'){
+        this.tab.isDriver = false
+        this.tab.isFormulaName = false
+        this.tab.isHouseName = false
+        this.tab.isLivestockType = false
+        this.tab.isTrainNumber = false
+        this.tab.isTMRName = false
+        this.tab.isFeed = false
+        this.tab.table.getdataListParm.offset = 1
+        this.getTabList()
+        this.tab.table2.getdataListParm.offset = 1
+        this.getTabList2()
       }
       this.tab.table2.getdataListParm.parammaps.fname = this.tab.table.getdataListParm.parammaps.fname
     },
@@ -3038,7 +3064,7 @@ export default {
       this.tab.table.getdataListParm.parammaps.slzql1 = undefined
       this.tab.table.getdataListParm.parammaps.slzql2 = undefined
       this.tab.table.getdataListParm.parammaps.error = false
-      this.handleSearch()
+      this.form_search()
     },
     handleBefore() {
       this.$forceUpdate()
@@ -4309,7 +4335,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch2() {
+    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)
@@ -4411,7 +4437,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch3() {
+    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}')

src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue

@@ -2,10 +2,10 @@
   <div class="app-container1">
     <div class="search">
       <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-      <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
-      <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
-      <el-button class="export" @click="handleDownload">导出</el-button>
+      <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
+      <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
+      <el-button class="successBorder" @click="form_search">查询</el-button>
+      <el-button class="export" @click="handleDownload">导出</el-button>
       <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
     </div>
     <div id="table" class="table">
@@ -48,29 +48,29 @@
       <!-- <pagination v-show="tab.table.total>=0" :total="tab.table.total" :page.sync="tab.table.getdataListParm.offset" :limit.sync="tab.table.getdataListParm.pagecount" @pagination="getList" /> -->
     </div>
     <div class="AnalysisChart">
-      <el-row :gutter="10">
-        <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
-          <span>图表查询时间:</span>
-          <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
-          <el-button class="successBorder" @click="handleChartDate">确认</el-button>
-          <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
+      <el-row :gutter="10">
+        <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
+          <span>图表查询时间:</span>
+          <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+          <el-button class="successBorder" @click="handleChartDate">确认</el-button>
+          <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
         </el-col>
       </el-row>
       <el-row :gutter="10" class="dashboard-editor-container">
         <!-- 泌乳牛干物质采食量 -->
-        <el-col :span="12">
+        <el-col :span="12">
           <div class="grid-content">
             <h4>泌乳牛干物质采食量</h4>
             <div v-if="tab.chart1.isChart" class="button">
               <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-              <div class="exportTable" @click="handleExport('chart1')">导出</div>
+              <div class="exportTable" @click="handleExport('chart1')">导出</div>
               <div class="exportTable" @click="handleTable('chart1')">切换表格</div>
             </div>
             <div v-if="tab.chart1.isChart" id="chartLine1" style="width:100%;height:400px;" />
             <div v-if="tab.chart1.isTable" class="table">
-              <div class="button">
-                <div class="exportTable" @click="handleExport('chart1')">导出</div>
-                <div class="exportTable" @click="handleChart('chart1')">切换图表</div>
+              <div class="button">
+                <div class="exportTable" @click="handleExport('chart1')">导出</div>
+                <div class="exportTable" @click="handleChart('chart1')">切换图表</div>
               </div>
               <el-table
                 :key="tab.chart1.table.tableKey"
@@ -90,24 +90,24 @@
                 <el-table-column label="牧场" sortable min-width="110px" align="center" prop="名称" />
                 <el-table-column label="泌乳牛干物质采食量（kg）" sortable min-width="110px" align="center" prop="准确率" />
               </el-table>
-            </div>
+            </div>
           </div>
         </el-col>
         <!-- 剩料率 -->
-        <el-col :span="12">
+        <el-col :span="12">
           <div class="grid-content">
-            <h4>剩料率</h4>
-            <div v-if="tab.chart2.isChart" class="button">
-              <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
-              <div class="exportTable" @click="handleExport('chart2')">导出</div>
-              <div class="exportTable" @click="handleTable('chart2')">切换表格</div>
-            </div>
+            <h4>剩料率</h4>
+            <div v-if="tab.chart2.isChart" class="button">
+              <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
+              <div class="exportTable" @click="handleExport('chart2')">导出</div>
+              <div class="exportTable" @click="handleTable('chart2')">切换表格</div>
+            </div>
             <div v-if="tab.chart2.isChart" id="chartLine2" style="width:100%;height:400px;" />
 
             <div v-if="tab.chart2.isTable" class="table">
-              <div class="button">
-                <div class="exportTable" @click="handleExport('chart2')">导出</div>
-                <div class="exportTable" @click="handleChart('chart2')">切换图表</div>
+              <div class="button">
+                <div class="exportTable" @click="handleExport('chart2')">导出</div>
+                <div class="exportTable" @click="handleChart('chart2')">切换图表</div>
               </div>
               <el-table
                 :key="tab.chart2.table.tableKey"
@@ -122,33 +122,33 @@
                 :row-style="rowStyle"
                 :cell-style="cellStyle"
                 class="elTable table-fixed"
-              >
+              >
                 <el-table-column label="日期" sortable min-width="110px" align="center" prop="日期" />
                 <el-table-column label="牧场" sortable min-width="110px" align="center" prop="名称" />
                 <el-table-column label="剩料量" sortable min-width="110px" align="center" prop="剩料量" />
                 <el-table-column label="撒料量" sortable min-width="110px" align="center" prop="撒料量" />
                 <el-table-column label="剩料率" sortable min-width="110px" align="center" prop="准确率" />
               </el-table>
-            </div>
+            </div>
           </div>
         </el-col>
       </el-row>
       <el-row :gutter="10" class="dashboard-editor-container">
         <!-- 混料时间统计 -->
         <el-col :span="12">
-          <div class="grid-content">
-            <h4>混料时间统计</h4>
-            <div v-if="tab.chart3.isChart" class="button">
-              <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-              <div class="exportTable" @click="handleExport('chart3')">导出</div>
-              <div class="exportTable" @click="handleTable('chart3')">切换表格</div>
-            </div>
-            <div v-if="tab.chart3.isChart" id="chartLine3" style="width:100%;height:400px;" />
-            <div v-if="tab.chart3.isTable" class="table">
-              <div class="button">
-                <div class="exportTable" @click="handleExport('chart3')">导出</div>
-                <div class="exportTable" @click="handleChart('chart3')">切换图表</div>
-              </div>
+          <div class="grid-content">
+            <h4>混料时间统计</h4>
+            <div v-if="tab.chart3.isChart" class="button">
+              <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <div class="exportTable" @click="handleExport('chart3')">导出</div>
+              <div class="exportTable" @click="handleTable('chart3')">切换表格</div>
+            </div>
+            <div v-if="tab.chart3.isChart" id="chartLine3" style="width:100%;height:400px;" />
+            <div v-if="tab.chart3.isTable" class="table">
+              <div class="button">
+                <div class="exportTable" @click="handleExport('chart3')">导出</div>
+                <div class="exportTable" @click="handleChart('chart3')">切换图表</div>
+              </div>
               <el-table
                 :key="tab.chart3.table.tableKey"
                 v-loading="tab.chart3.table.listLoading"
@@ -167,24 +167,24 @@
                 <el-table-column label="牧场" min-width="110px" align="center" prop="名称" />
                 <el-table-column label="混料时间（分钟）" min-width="110px" align="center" prop="准确率" />
               </el-table>
-            </div>
+            </div>
           </div>
         </el-col>
         <!-- 转化率 -->
         <el-col :span="12" style="position: relative;">
-          <div class="grid-content">
-            <h4>转化率</h4>
-            <div v-if="tab.chart4.isChart" class="button">
-              <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
-              <div class="exportTable" @click="handleExport('chart4')">导出</div>
-              <div class="exportTable" @click="handleTable('chart4')">切换表格</div>
-            </div>
-            <div v-if="tab.chart4.isChart" id="chartLine4" style="width:100%;height:400px;" />
-            <div v-if="tab.chart4.isTable" class="table">
-              <div class="button">
-                <div class="exportTable" @click="handleExport('chart4')">导出</div>
-                <div class="exportTable" @click="handleChart('chart4')">切换图表</div>
-              </div>
+          <div class="grid-content">
+            <h4>转化率</h4>
+            <div v-if="tab.chart4.isChart" class="button">
+              <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <div class="exportTable" @click="handleExport('chart4')">导出</div>
+              <div class="exportTable" @click="handleTable('chart4')">切换表格</div>
+            </div>
+            <div v-if="tab.chart4.isChart" id="chartLine4" style="width:100%;height:400px;" />
+            <div v-if="tab.chart4.isTable" class="table">
+              <div class="button">
+                <div class="exportTable" @click="handleExport('chart4')">导出</div>
+                <div class="exportTable" @click="handleChart('chart4')">切换图表</div>
+              </div>
               <el-table
                 :key="tab.chart4.table.tableKey"
                 v-loading="tab.chart4.table.listLoading"
@@ -203,7 +203,7 @@
                 <el-table-column label="牧场" min-width="110px" align="center" prop="名称" />
                 <el-table-column label="饲料转化率" min-width="110px" align="center" prop="准确率" />
               </el-table>
-            </div>
+            </div>
           </div>
         </el-col>
       </el-row>
@@ -211,19 +211,19 @@
       <el-row :gutter="10" class="dashboard-editor-container">
         <!-- 成本分析 -->
         <el-col :span="24">
-          <div class="grid-content">
-            <h4>成本分析</h4>
-            <div v-if="tab.chart5.isChart" class="button">
-              <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
-              <div class="exportTable" @click="handleExport('chart5')">导出</div>
-              <div class="exportTable" @click="handleTable('chart5')">切换表格</div>
-            </div>
-            <div v-if="tab.chart5.isChart" id="chartLine5" style="width:100%;height:400px;" />
-            <div v-if="tab.chart5.isTable" class="table">
-              <div class="button">
-                <div class="exportTable" @click="handleExport('chart5')">导出</div>
-                <div class="exportTable" @click="handleChart('chart5')">切换图表</div>
-              </div>
+          <div class="grid-content">
+            <h4>成本分析</h4>
+            <div v-if="tab.chart5.isChart" class="button">
+              <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
+              <div class="exportTable" @click="handleExport('chart5')">导出</div>
+              <div class="exportTable" @click="handleTable('chart5')">切换表格</div>
+            </div>
+            <div v-if="tab.chart5.isChart" id="chartLine5" style="width:100%;height:400px;" />
+            <div v-if="tab.chart5.isTable" class="table">
+              <div class="button">
+                <div class="exportTable" @click="handleExport('chart5')">导出</div>
+                <div class="exportTable" @click="handleChart('chart5')">切换图表</div>
+              </div>
               <el-table
                 :key="tab.chart5.table.tableKey"
                 v-loading="tab.chart5.table.listLoading"
@@ -625,24 +625,24 @@ export default {
       })
     },
     // 查询
-    handleSearch() {
+    form_search() {
       this.getList()
-    },
-    handleBefore() {
-      if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
-        this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
-        var start = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() - 1))
-        this.tab.table.getdataListParm.parammaps.date = parseTime(start, '{y}-{m}-{d}')
-        this.getList()
-      }
-    },
-    handleNext() {
-      if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
-        this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
-        var stop = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() + 1))
-        this.tab.table.getdataListParm.parammaps.date = parseTime(stop, '{y}-{m}-{d}')
-        this.getList()
-      }
+    },
+    handleBefore() {
+      if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
+        this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
+        var start = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() - 1))
+        this.tab.table.getdataListParm.parammaps.date = parseTime(start, '{y}-{m}-{d}')
+        this.getList()
+      }
+    },
+    handleNext() {
+      if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
+        this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
+        var stop = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() + 1))
+        this.tab.table.getdataListParm.parammaps.date = parseTime(stop, '{y}-{m}-{d}')
+        this.getList()
+      }
     },
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0 && row.pastureid !== '-1') {
@@ -717,15 +717,15 @@ export default {
         this.getTabList()
       }
     },
-    handlePastureSearch() {},
-    // 快速跳转到图表
-    handleQuickJumpChart() {
-      var myHeight = document.getElementById('table').offsetHeight + 120
-      window.scrollTo(myHeight, myHeight)
-    },
-    // 快速回到顶部
-    handleQuickJumpTop() {
-      window.scrollTo(0, 0)
+    handlePastureSearch() {},
+    // 快速跳转到图表
+    handleQuickJumpChart() {
+      var myHeight = document.getElementById('table').offsetHeight + 120
+      window.scrollTo(myHeight, myHeight)
+    },
+    // 快速回到顶部
+    handleQuickJumpTop() {
+      window.scrollTo(0, 0)
     },
     // 图表总查询
     handleChartDate() {
@@ -778,7 +778,7 @@ export default {
           // this.tab.chart1.total = response.data.total
         } else {
           this.tab.chart1.list = []
-          this.tab.chart1.chartLine_data = {}
+          this.tab.chart1.chartLine_data = {}
         }
         this.roadChartLine1(this.tab.chart1.chartLine_data)
         setTimeout(() => {
@@ -817,8 +817,8 @@ export default {
         yAxis: {
           type: 'value', name: 'kg', axisLabel: { formatter: '{value}' }
         },
-        series: (function() {
-          if (chartLine_data.data3 !== undefined) {
+        series: (function() {
+          if (chartLine_data.data3 !== undefined) {
             var serie = []
             for (var i = 0; i < chartLine_data.data3.length; i++) {
               var item = {
@@ -859,7 +859,7 @@ export default {
           console.log('剩料率图数据', this.tab.chart2.chartLine_data)
           console.log('剩料率表数据', this.tab.chart2.table.list)
         } else {
-          this.tab.chart2.list = []
+          this.tab.chart2.list = []
           this.tab.chart2.chartLine_data = {}
         }
         this.roadChartLine2(this.tab.chart2.chartLine_data)
@@ -899,8 +899,8 @@ export default {
         yAxis: {
           type: 'value', name: '剩料率', axisLabel: { formatter: '{value} %' }
         },
-        series: (function() {
-          if (chartLine_data.data3 !== undefined) {
+        series: (function() {
+          if (chartLine_data.data3 !== undefined) {
             var serie = []
             for (var i = 0; i < chartLine_data.data3.length; i++) {
               var item = {
@@ -939,7 +939,7 @@ export default {
           // }
           this.tab.chart3.total = response.data.total
         } else {
-          this.tab.chart3.list = []
+          this.tab.chart3.list = []
           this.tab.chart3.chartLine_data = {}
         }
         this.roadChartLine3(this.tab.chart3.chartLine_data)
@@ -979,8 +979,8 @@ export default {
         yAxis: {
           type: 'value', name: '分钟', axisLabel: { formatter: '{value}min' }
         },
-        series: (function() {
-          if (chartLine_data.data3 !== undefined) {
+        series: (function() {
+          if (chartLine_data.data3 !== undefined) {
             var serie = []
             for (var i = 0; i < chartLine_data.data3.length; i++) {
               var item = {
@@ -1013,7 +1013,7 @@ export default {
           console.log('转化率图数据', this.tab.chart4.chartLine_data)
           console.log('转化率表数据', this.tab.chart4.table.list)
         } else {
-          this.tab.chart4.list = []
+          this.tab.chart4.list = []
           this.tab.chart4.chartLine_data = {}
         }
         this.roadChartLine4(this.tab.chart4.chartLine_data)
@@ -1053,8 +1053,8 @@ export default {
         yAxis: {
           type: 'value', name: '饲料转化率', axisLabel: { formatter: '{value} %' }
         },
-        series: (function() {
-          if (chartLine_data.data3 !== undefined) {
+        series: (function() {
+          if (chartLine_data.data3 !== undefined) {
             var serie = []
             for (var i = 0; i < chartLine_data.data3.length; i++) {
               var item = {
@@ -1087,7 +1087,7 @@ export default {
           console.log('转化率图数据', this.tab.chart5.chartLine_data)
           console.log('转化率表数据', this.tab.chart5.table.list)
         } else {
-          this.tab.chart5.list = []
+          this.tab.chart5.list = []
           this.tab.chart5.chartLine_data = {}
         }
         this.roadChartLine5(this.tab.chart5.chartLine_data)
@@ -1127,8 +1127,8 @@ export default {
         yAxis: {
           type: 'value', name: '公斤奶饲料成本（元）'
         },
-        series: (function() {
-          if (chartLine_data.data3 !== undefined) {
+        series: (function() {
+          if (chartLine_data.data3 !== undefined) {
             var serie = []
             for (var i = 0; i < chartLine_data.data3.length; i++) {
               var item = {
@@ -1195,7 +1195,7 @@ export default {
           this.tab.chart4.getdataListParm.parammaps.stopTime = ''
           this.getChart4()
         }
-      } else if (item == 'chart5') {
+      } else if (item == 'chart5') {
         console.log(this.tab.chart5.getdataListParm.parammaps.inputDatetime, 'inputDatetime')
         if (this.tab.chart5.getdataListParm.parammaps.inputDatetime !== '' && this.tab.chart5.getdataListParm.parammaps.inputDatetime !== null) {
           this.tab.chart5.getdataListParm.parammaps.startTime = parseTime(this.tab.chart5.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -1299,45 +1299,45 @@ export default {
       if (item == 'chart1') {
         console.log('泌乳牛采食量图表')
         this.tab.chart1.isTable = false
-        this.tab.chart1.isChart = true
+        this.tab.chart1.isChart = true
         this.getChart1()
       } else if (item == 'chart2') {
         console.log('牛栏剩料率图表')
         this.tab.chart2.isTable = false
-        this.tab.chart2.isChart = true
+        this.tab.chart2.isChart = true
         this.getChart2()
       } else if (item == 'chart3') {
         console.log('混料时间统计图表')
         this.tab.chart3.isTable = false
-        this.tab.chart3.isChart = true
+        this.tab.chart3.isChart = true
         this.getChart3()
       } else if (item == 'chart4') {
         console.log('转化率图表')
         this.tab.chart4.isTable = false
-        this.tab.chart4.isChart = true
+        this.tab.chart4.isChart = true
         this.getChart4()
       } else if (item == 'chart5') {
         console.log('成本分析图表')
         this.tab.chart5.isTable = false
-        this.tab.chart5.isChart = true
+        this.tab.chart5.isChart = true
         this.getChart5()
       }
     }
   }
 }
 </script>
-<style lang="scss" scoped>
-  .button{
-    height: 50px;
-    .exportTable{float: right;margin-right: 5px;}
-  }
-  .app-container1{padding-left: 10px;background-color: #F4F4F4;}
-  .dashboard-editor-container {
-    background-color: #F4F4F4;
-    .grid-content{
-      background-color:#fff;padding: 0 10px;
-      h4{text-align: center;line-height: 50px;}
-    }
-  }
-  // .table{margin-bottom: 50px;}
+<style lang="scss" scoped>
+  .button{
+    height: 50px;
+    .exportTable{float: right;margin-right: 5px;}
+  }
+  .app-container1{padding-left: 10px;background-color: #F4F4F4;}
+  .dashboard-editor-container {
+    background-color: #F4F4F4;
+    .grid-content{
+      background-color:#fff;padding: 0 10px;
+      h4{text-align: center;line-height: 50px;}
+    }
+  }
+  // .table{margin-bottom: 50px;}
 </style>

src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -18,7 +18,7 @@
           <el-select v-model="tab.table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
@@ -1724,7 +1724,7 @@ export default {
       })
     },
     // 查询
-    handleSearch() {
+    form_search() {
       if (this.tab.radio == '1') {
         console.log('配方名称/查询')
         this.tab.isFormulaName = true

src/views/statisticalAnalysis/feedingEfficiency/pasture/index备.vue

@@ -15,7 +15,7 @@
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
           <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
@@ -895,7 +895,7 @@ export default {
       })
     },
     // 查询
-    handleSearch() {
+    form_search() {
       if (this.tab.radio == '1') {
         console.log('配方名称/查询')
         this.tab.isFormulaName = true

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -13,7 +13,7 @@
       <el-select v-else v-model="table.getdataListParm.parammaps.barid" clearable filterable placeholder="请选择栏舍" style="width: 180px;" class="filter-item">
         <el-option v-for="item in formulaList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" style="margin-left:10px;" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" style="margin-left:10px;" @click="form_search">查询</el-button>
     </div>
     <div class="search" />
     <div class="table">
@@ -233,7 +233,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="form_see(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -700,7 +700,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       if(this.table.getdataListParm.parammaps.search == '0'){
         this.table.getdataListParm.parammaps.barid = ''
       }else{
@@ -829,7 +829,7 @@ export default {
       console.log('点击了栏舍/指标')
       this.$router.push('/formulationPlan/DhedFormula')
     },
-    handleSee(row) {
+    form_see(row) {
       console.log('查看', row)
       this.dialogFull = false
       this.textMap.see = '栏舍详情——' + row.tname

src/views/statisticalAnalysis/formulationEvaluation/index备.vue

@@ -223,7 +223,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="form_see(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -769,7 +769,7 @@ export default {
       console.log('点击了栏舍/指标')
       this.$router.push('/formulationPlan/DhedFormula')
     },
-    handleSee(row) {
+    form_see(row) {
       console.log('查看', row)
       this.dialogFull = false
       this.textMap.see = '栏舍详情——' + row.tname

src/views/statisticalAnalysis/inventoryManagement/group/index.vue

@@ -11,7 +11,7 @@
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
-          <el-button class="successBorder" style="margin-left: 10px;margin-bottom:10px;" @click="handleSearch('first')">查询</el-button>
+          <el-button class="successBorder" style="margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport(tab1)">导出</el-button>
         </div>
         <div class="table">
@@ -72,7 +72,7 @@
           <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="TMR设备编号" />
           <el-input v-if="tab2.isRadio5" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="班次" />
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="车次" />
-          <el-button class="successBorder" @click="handleSearch('second')">查询</el-button>
+          <el-button class="successBorder" @click="form_search('second')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab2')">导出</el-button>
         </div>
         <el-table
@@ -116,7 +116,7 @@
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="栏舍名称" />
           <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="日期" />
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="TMR设备编号" />
-          <el-button class="successBorder" @click="handleSearch('third')">查询</el-button>
+          <el-button class="successBorder" @click="form_search('third')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab3')">导出</el-button>
         </div>
         <el-table
@@ -361,7 +361,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch(item) {
+    form_search(item) {
       if (item == 'first') {
         if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
           this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')

src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -7,7 +7,7 @@
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" style="float: left;" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" style="float: left;" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
-          <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="handleSearch('first')">查询</el-button>
+          <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" icon="el-icon-upload2" @click="handleExport('tab1')">导出</el-button>
         </div>
         <div class="table">
@@ -52,9 +52,9 @@
           <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: 245px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
-          <span style="margin-left: 10px;">统计类型：</span>
-          <el-select v-model="tab2.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio2">
-            <el-option v-for="item in statisticalTypeList2" :key="item.id" :label="item.name" :value="item.id" />
+          <span style="margin-left: 10px;">统计类型：</span>
+          <el-select v-model="tab2.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio2">
+            <el-option v-for="item in statisticalTypeList2" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-checkbox v-model="tab2.table.getdataListParm.checked" :true-label="1" :false-label="0" style="margin-right:10px;" @change="changeChecked">误差</el-checkbox>
           <el-input v-if="tab2.isRadio1" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="牲畜类别" />
@@ -63,30 +63,30 @@
           <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="TMR设备编号" />
           <el-input v-if="tab2.isRadio5" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="班次" />
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="车次" />
-          <el-select v-model="tab2.table.getdataListParm.parammaps.typea" clearable placeholder="列表显示" class="filter-item" style="width: 120px;">
-            <el-option v-for="item in displayList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-          <el-button class="successBorder" @click="handleSearch('second')">查询</el-button>
+          <el-select v-model="tab2.table.getdataListParm.parammaps.typea" clearable placeholder="列表显示" class="filter-item" style="width: 120px;">
+            <el-option v-for="item in displayList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+          <el-button class="successBorder" @click="form_search('second')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handleExport('tab2')">导出</el-button>
-        </div>
-        <div v-if="tab2.table.tableConfig.length > 8">
-          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
-            <u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow"  :prop="item.prop" align="center" :fixed="index==0">
-              <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" :label="item1.label" :prop="item1.prop" align="center">
-                <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
-              </u-table-column>
-            </u-table-column>
-          </u-table>
-        </div>
-        <div v-else>
-          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
-            <u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow"  :prop="item.prop" align="center">
-              <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" :label="item1.label" :prop="item1.prop" align="center">
-                <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
-              </u-table-column>
-            </u-table-column>
-          </u-table>
-        </div>
+        </div>
+        <div v-if="tab2.table.tableConfig.length > 8">
+          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
+            <u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow"  :prop="item.prop" align="center" :fixed="index==0">
+              <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" :label="item1.label" :prop="item1.prop" align="center">
+                <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
+              </u-table-column>
+            </u-table-column>
+          </u-table>
+        </div>
+        <div v-else>
+          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
+            <u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow"  :prop="item.prop" align="center">
+              <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" :label="item1.label" :prop="item1.prop" align="center">
+                <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
+              </u-table-column>
+            </u-table-column>
+          </u-table>
+        </div>
 
         <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
       </el-tab-pane>
@@ -95,9 +95,9 @@
           <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" style="width: 250px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
-          <span style="margin-left: 10px;">统计类型：</span>
-          <el-select v-model="tab3.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio3">
-            <el-option v-for="item in statisticalTypeList3" :key="item.id" :label="item.name" :value="item.id" />
+          <span style="margin-left: 10px;">统计类型：</span>
+          <el-select v-model="tab3.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio3">
+            <el-option v-for="item in statisticalTypeList3" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <!-- <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">牲畜类别</el-radio>
           <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">栏舍名称</el-radio>
@@ -107,26 +107,26 @@
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="栏舍名称" />
           <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="日期" />
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="TMR设备编号" />
-          <el-button class="successBorder" @click="handleSearch('third')">查询</el-button>
+          <el-button class="successBorder" @click="form_search('third')">查询</el-button>
           <el-button class="export filter-item1" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab3')">导出</el-button>
-        </div>
-        <div v-if="tab3.table.tableConfig.length>2">
-        <u-table v-if="isDispayTable3" ref="plTable3" v-loading="tab3.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable3">
-          <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center"  :prop="item.prop" :fixed="key==0">
-              <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
-                <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
-              </u-table-column>
-            </u-table-column>
-          </u-table>
-        </div>
-        <div v-else>
-          <u-table v-if="isDispayTable3" ref="plTable3" v-loading="tab3.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable3">
-            <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center" :prop="item.prop">
-                <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
-                  <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
-                </u-table-column>
-              </u-table-column>
-            </u-table>
+        </div>
+        <div v-if="tab3.table.tableConfig.length>2">
+        <u-table v-if="isDispayTable3" ref="plTable3" v-loading="tab3.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable3">
+          <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center"  :prop="item.prop" :fixed="key==0">
+              <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
+                <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
+              </u-table-column>
+            </u-table-column>
+          </u-table>
+        </div>
+        <div v-else>
+          <u-table v-if="isDispayTable3" ref="plTable3" v-loading="tab3.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable3">
+            <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center" :prop="item.prop">
+                <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
+                  <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
+                </u-table-column>
+              </u-table-column>
+            </u-table>
         </div>
         <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
       </el-tab-pane>
@@ -176,7 +176,7 @@ export default {
         }
       },
       fileComment: [{ 'label': '商务文件评分', 'children': [{ 'label': '1' }, { 'label': '2' }, { 'label': '管理员' }] }],
-      displayList:[{id:'1',name:'理论'},{id:'2',name:'实际'}],//列表显示
+      displayList:[{id:'1',name:'理论'},{id:'2',name:'实际'}],//列表显示
       activeName: 'first',
       tab: {
         chartDate: [],
@@ -203,7 +203,7 @@ export default {
       },
 
       tab2: {
-        chartDate: [],
+        chartDate: [],
         display:'',
         table: {
           getdataListParm: {
@@ -211,14 +211,14 @@ export default {
             page: 1,
             offset: 1,
             pagecount: '',
-            returntype: 'Map',
+            returntype: 'Map',
             checked: 0,
             parammaps: {
               pastureid: Cookies.get('pastureid'),
               startTime: parseTime(new Date(), '{y}-{m}-{d}'),
               stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
               inputDatetime: [new Date(), new Date()],
-              fname: '',
+              fname: '',
               typea:''
             }
           },
@@ -269,12 +269,12 @@ export default {
       downLoad: {},
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
-      myHeight2: document.documentElement.clientHeight - 95 - 150,
+      myHeight2: document.documentElement.clientHeight - 95 - 150,
       rowHeight: 30,
       isDispayTable2:false,
-      isDispayTable3:false,
+      isDispayTable3:false,
       statisticalTypeList2: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }, { id: '5', name: 'TMR班次' }, { id: '6', name: '车次' }],
-      statisticalTypeList3: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }],
+      statisticalTypeList3: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }],
     }
   },
   created() {
@@ -293,10 +293,10 @@ export default {
 
       that.tab2.table.getdataListParm.parammaps.startTime = parseTime(end, '{y}-{m}-{d}')
       that.tab2.table.getdataListParm.parammaps.stopTime = parseTime(end, '{y}-{m}-{d}')
-      that.tab2.table.getdataListParm.parammaps.inputDatetime = [end, end]
-
-      that.tab3.table.getdataListParm.parammaps.startTime = parseTime(end, '{y}-{m}-{d}')
-      that.tab3.table.getdataListParm.parammaps.stopTime = parseTime(end, '{y}-{m}-{d}')
+      that.tab2.table.getdataListParm.parammaps.inputDatetime = [end, end]
+
+      that.tab3.table.getdataListParm.parammaps.startTime = parseTime(end, '{y}-{m}-{d}')
+      that.tab3.table.getdataListParm.parammaps.stopTime = parseTime(end, '{y}-{m}-{d}')
       that.tab3.table.getdataListParm.parammaps.inputDatetime = [end, end]
       this.getTabList()
     },
@@ -313,20 +313,20 @@ export default {
         const end2 = new Date()
         start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
         end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
-        this.tab2.table.getdataListParm.parammaps.inputDatetime = [start2, end2]
-        this.tab2.radio = '1'
-        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}')
+        this.tab2.table.getdataListParm.parammaps.inputDatetime = [start2, end2]
+        this.tab2.radio = '1'
+        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}')
         this.getTab2List()
       } else if (this.activeName == 'third') {
         const start3 = new Date()
         const end3 = new Date()
         start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 1)
         end3.setTime(end3.getTime() - 3600 * 1000 * 24 * 1)
-        this.tab3.table.getdataListParm.parammaps.inputDatetime = [start3, end3]
-        this.tab3.radio = '1'
-        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}')
+        this.tab3.table.getdataListParm.parammaps.inputDatetime = [start3, end3]
+        this.tab3.radio = '1'
+        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}')
         this.getTab3List()
       }
     },
@@ -345,7 +345,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch(item) {
+    form_search(item) {
       if (item == 'first') {
         if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
           this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -381,22 +381,22 @@ export default {
 
     // 用料分析
     getTab2List() {
-      this.tab2.table.listLoading = true
-      this.isDispayTable2 = false
-      setTimeout(()=>{
-        this.isDispayTable2 = true
-        this.$nextTick(() => {
+      this.tab2.table.listLoading = true
+      this.isDispayTable2 = false
+      setTimeout(()=>{
+        this.isDispayTable2 = true
+        this.$nextTick(() => {
           let myList = []
           GetReportform(this.tab2.table.getdataListParm).then(response => {
-            if (response.data !== null && response.data.data !== null && response.data.data1 !== null) {
+            if (response.data !== null && response.data.data !== null && response.data.data1 !== null) {
               this.tab2.table.data = response.data.data
-              for (let i = 0; i < response.data.list.data2.length; i++) {
-                for (let j = 0; j < response.data.list.data1.length; j++) {
-                  for (let a = 0; a < response.data.list.data2[i].children.length; a++) {
-                    if (response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == undefined || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == null || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == '') {
-                      response.data.list.data1[j][response.data.list.data2[i].children[a].prop] = 0
-                    }
-                  }
+              for (let i = 0; i < response.data.list.data2.length; i++) {
+                for (let j = 0; j < response.data.list.data1.length; j++) {
+                  for (let a = 0; a < response.data.list.data2[i].children.length; a++) {
+                    if (response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == undefined || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == null || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == '') {
+                      response.data.list.data1[j][response.data.list.data2[i].children[a].prop] = 0
+                    }
+                  }
                 }
                 if (response.data.list.data2[i].children.length > 1) {
                   for (let j = 0; j < response.data.list.data2[i].children.length; j++) {
@@ -409,7 +409,7 @@ export default {
                 } else {
                   this.$set(response.data.list.data2[i].children[0], 'width', '80px')
                 }
-              }
+              }
               myList = response.data.list.data1
               this.tab2.table.list = response.data.list.data1
               this.tab2.table.tableConfig = response.data.list.data2
@@ -418,18 +418,18 @@ export default {
               console.log('库存统计-用料分析this.tab2.table.list', response.data.list.data1)
               console.log('库存统计-用料分析this.tab2.table.tableConfig',response.data.list.data2)
             } else {
-              myList = []
-              this.tab2.table.list = []
+              myList = []
+              this.tab2.table.list = []
               this.tab2.table.tableConfig = []
-            }
+            }
 
             console.log(this.tab2.table.list.length)
-            this.$refs.plTable2.reloadData(myList)
+            this.$refs.plTable2.reloadData(myList)
             setTimeout(() => {
               this.tab2.table.listLoading = false
             }, 100)
-          })
-        })
+          })
+        })
       })
     },
     changeRadio2() {
@@ -442,9 +442,9 @@ export default {
         this.tab2.isRadio5 = false,
         this.tab2.isRadio6 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisSC'
-        this.tab2.table.getdataListParm.offset = 1
-        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}')
+        this.tab2.table.getdataListParm.offset = 1
+        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}')
         this.getTab2List()
       } else if (this.tab2.radio == '2') {
         this.tab2.isRadio1 = false,
@@ -454,9 +454,9 @@ export default {
         this.tab2.isRadio5 = false,
         this.tab2.isRadio6 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisLS'
-        this.tab2.table.getdataListParm.offset = 1
-        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}')
+        this.tab2.table.getdataListParm.offset = 1
+        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}')
         this.getTab2List()
       } else if (this.tab2.radio == '3') {
         this.tab2.isRadio1 = false,
@@ -467,8 +467,8 @@ export default {
         this.tab2.isRadio6 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisRQ'
         this.tab2.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab2List()
       } else if (this.tab2.radio == '4') {
         this.tab2.isRadio1 = false,
@@ -479,8 +479,8 @@ export default {
         this.tab2.isRadio6 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisTMR'
         this.tab2.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab2List()
       } else if (this.tab2.radio == '5') {
         this.tab2.isRadio1 = false,
@@ -491,8 +491,8 @@ export default {
         this.tab2.isRadio6 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisBC'
         this.tab2.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab2List()
       } else if (this.tab2.radio == '6') {
         this.tab2.isRadio1 = false,
@@ -503,51 +503,51 @@ export default {
         this.tab2.isRadio6 = true,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisCC'
         this.tab2.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab2List()
       }
     },
     // 价格分析
     getTab3List() {
-      this.tab3.table.listLoading = true
-      this.isDispayTable3 = false
-      setTimeout(()=>{
-        this.isDispayTable3 = true
-        this.$nextTick(() => {
+      this.tab3.table.listLoading = true
+      this.isDispayTable3 = false
+      setTimeout(()=>{
+        this.isDispayTable3 = true
+        this.$nextTick(() => {
           let myList = []
           GetReportform(this.tab3.table.getdataListParm).then(response => {
             if (response.data !== null && response.data.list.data1 !== null && response.data.list.data2 !== null) {
               console.log('库存统计-价格分析', response.data.list)
-              for (let i = 0; i < response.data.list.data2.length; i++) {
-                for (let j = 0; j < response.data.list.data1.length; j++) {
-                  for (let a = 0; a < response.data.list.data2[i].children.length; a++) {
-                    if (response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == undefined || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == null || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == '') {
-                      response.data.list.data1[j][response.data.list.data2[i].children[a].prop] = 0
-                    }
-                  }
-                }
-                if (response.data.list.data2[i].children.length > 1) {
-                  for (let j = 0; j < response.data.list.data2[i].children.length; j++) {
-                    if (response.data.list.data2[i].children[j].label == '理论' || response.data.list.data2[i].children[j].label == '实际') {
-                      this.$set(response.data.list.data2[i].children[j], 'width', '80px')
-                    } else {
-                      this.$set(response.data.list.data2[i].children[j], 'width', '80px')
-                    }
-                  }
-                } else {
-                  this.$set(response.data.list.data2[i].children[0], 'width', '80px')
-                }
-              }
-              myList = response.data.list.data1
+              for (let i = 0; i < response.data.list.data2.length; i++) {
+                for (let j = 0; j < response.data.list.data1.length; j++) {
+                  for (let a = 0; a < response.data.list.data2[i].children.length; a++) {
+                    if (response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == undefined || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == null || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == '') {
+                      response.data.list.data1[j][response.data.list.data2[i].children[a].prop] = 0
+                    }
+                  }
+                }
+                if (response.data.list.data2[i].children.length > 1) {
+                  for (let j = 0; j < response.data.list.data2[i].children.length; j++) {
+                    if (response.data.list.data2[i].children[j].label == '理论' || response.data.list.data2[i].children[j].label == '实际') {
+                      this.$set(response.data.list.data2[i].children[j], 'width', '80px')
+                    } else {
+                      this.$set(response.data.list.data2[i].children[j], 'width', '80px')
+                    }
+                  }
+                } else {
+                  this.$set(response.data.list.data2[i].children[0], 'width', '80px')
+                }
+              }
+              myList = response.data.list.data1
               this.tab3.table.list = response.data.list.data1
               this.tab3.table.tableConfig = response.data.list.data2
               this.tab3.table.total = response.data.list.data1.length
-            } else {
-              this.tab3.table.tableConfig = []
+            } else {
+              this.tab3.table.tableConfig = []
               this.tab3.table.list = []
               myList = []
-            }
+            }
             setTimeout(() => {
              this.$refs.plTable3.reloadData(myList)
               this.tab3.table.listLoading = false
@@ -679,8 +679,8 @@ export default {
         this.tab3.isRadio4 = false,
         this.tab3.table.getdataListParm.name = 'getPriceAnalysisSC'
         this.tab3.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab3List()
       } else if (this.tab3.radio == '2') {
         this.tab3.isRadio1 = false,
@@ -689,8 +689,8 @@ export default {
         this.tab3.isRadio4 = false,
         this.tab3.table.getdataListParm.name = 'getPriceAnalysisLS'
         this.tab3.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab3List()
       } else if (this.tab3.radio == '3') {
         this.tab3.isRadio1 = false,
@@ -699,8 +699,8 @@ export default {
         this.tab3.isRadio4 = false,
         this.tab3.table.getdataListParm.name = 'getPriceAnalysisRQ'
         this.tab3.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab3List()
       } else if (this.tab3.radio == '4') {
         this.tab3.isRadio1 = false,
@@ -709,13 +709,13 @@ export default {
         this.tab3.isRadio4 = true,
         this.tab3.table.getdataListParm.name = 'getPriceAnalysisTMR'
         this.tab3.table.getdataListParm.offset = 1
-        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}')
+        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}')
         this.getTab3List()
       }
     },
     changeChecked(item) {
-      this.handleSearch('second')
+      this.form_search('second')
     },
     handleExport(item) {
       if (item == 'tab1') {
@@ -745,6 +745,10 @@ export default {
         console.log('用料分析导出数据', this.tab2.table.list)
         console.log('用料分析导出表头', this.tab2.table.tableConfig)
         console.log(this.tab2.table.getdataListParm.checked, 'checked')
+        console.log(this.tab2.table.getdataListParm)
+        var startTime = this.tab2.table.getdataListParm.parammaps.startTime
+        var stopTime = this.tab2.table.getdataListParm.parammaps.stopTime
+
         var exportData = []
         var exportTitle1 = [] // 一级标题
         var exportTitle2 = [] // 二级标题
@@ -768,17 +772,17 @@ export default {
               headerArr.push(exportTitle1[i])
             }
           }
-        } else {
-          if(this.tab2.table.getdataListParm.parammaps.typea == ''){
-            for (let i = 0; i < exportTitle1.length; i++) {
-              if (i > 0) {
-                headerArr.push(exportTitle1[i], '')
-              } else {
-                headerArr.push(exportTitle1[i])
-              }
-            }
-          }else{
-            headerArr = exportTitle1
+        } else {
+          if(this.tab2.table.getdataListParm.parammaps.typea == ''){
+            for (let i = 0; i < exportTitle1.length; i++) {
+              if (i > 0) {
+                headerArr.push(exportTitle1[i], '')
+              } else {
+                headerArr.push(exportTitle1[i])
+              }
+            }
+          }else{
+            headerArr = exportTitle1
           }
         }
         console.log('headerArr', headerArr)
@@ -795,22 +799,22 @@ export default {
             const data = this.tab2.table.list.map(v => filterVal.map(j => v[j]))
             // const data = []
             const merges = ['A1:A1']
+            excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析-'+startTime+'-' +stopTime , merges })
+          })
+        }else{
+          import('@/vendor/Export3Excel').then((excel) => {
+            const multiHeader = [
+              headerArr
+            ]
+            const multiHeader2 = []
+            const tHeader = exportTitle2
+            const filterVal = filterValArr
+            const data = this.tab2.table.list.map(v => filterVal.map(j => v[j]))
+            // const data = []
+            // const merges = ['A1:A1']
+            const merges = []
             excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析', merges })
           })
-        }else{
-          import('@/vendor/Export3Excel').then((excel) => {
-            const multiHeader = [
-              headerArr
-            ]
-            const multiHeader2 = []
-            const tHeader = exportTitle2
-            const filterVal = filterValArr
-            const data = this.tab2.table.list.map(v => filterVal.map(j => v[j]))
-            // const data = []
-            // const merges = ['A1:A1']
-            const merges = []
-            excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析', merges })
-          })
         }
       } else if (item == 'tab3') {
         console.log('价格分析导出')
@@ -888,22 +892,22 @@ export default {
     margin-bottom:10px;
     .el-radio{margin-right: 10px;}
     .filter-item1{margin-top: 10px;}
-  }
-  /deep/ .el-table th>.cell{
-    padding-left: 0 !important;;
-    padding-right: 0 !important;;
-  }
-  /deep/ .el-table td>.cell{
-    padding-left: 0 !important;;
-    padding-right: 0 !important;;
-  }
+  }
+  /deep/ .el-table th>.cell{
+    padding-left: 0 !important;;
+    padding-right: 0 !important;;
+  }
+  /deep/ .el-table td>.cell{
+    padding-left: 0 !important;;
+    padding-right: 0 !important;;
+  }
   // .el-radio{margin-right: 20px;}
-</style>
-<style lang="css">
-  .el-tooltip__popper{
-  max-width: 60% !important;
-  }
-  .plTableBox .el-table td.is-hidden>*, .plTableBox .el-table th.is-hidden>*{
-    visibility:inherit;
-  }
+</style>
+<style lang="css">
+  .el-tooltip__popper{
+  max-width: 60% !important;
+  }
+  .plTableBox .el-table td.is-hidden>*, .plTableBox .el-table th.is-hidden>*{
+    visibility:inherit;
+  }
 </style>

src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -16,7 +16,7 @@
       <el-select v-model="table.getdataListParm.parammaps.iscompleted" placeholder="工作状态" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in workingConditionList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <el-row :gutter="20">
@@ -761,7 +761,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')

src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -15,34 +15,34 @@
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.iscompleted" placeholder="工作状态" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in workingConditionList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-      <!-- 临时注释 -->
-      <div style="display: inline-block;" class="filter-item1">
+      </el-select>
+      <!-- 临时注释 -->
+      <div style="display: inline-block;" class="filter-item1">
         <el-input-number :controls="false" :precision="2" v-model="hlwc1" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
-        <span>-</span>
+        <span>-</span>
         <el-input-number :controls="false" :precision="2"  v-model="hlwc2" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
-      </div>
-      <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="hlzq1" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
-        <span>-</span>
-        <el-input-number :controls="false" :precision="2" v-model="hlzq2" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
-      </div>
-      <el-select v-model="table.getdataListParm.parammaps.fclassid" placeholder="混料类别" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in cixCategoryList" :key="item.id" :label="item.fcname" :value="item.id" />
+      </div>
+      <div style="display: inline-block;" class="filter-item1">
+        <el-input-number :controls="false" :precision="2" v-model="hlzq1" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
+        <span>-</span>
+        <el-input-number :controls="false" :precision="2" v-model="hlzq2" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
+      </div>
+      <el-select v-model="table.getdataListParm.parammaps.fclassid" placeholder="混料类别" class="filter-item" style="width: 120px;" clearable>
+        <el-option v-for="item in cixCategoryList" :key="item.id" :label="item.fcname" :value="item.id" />
       </el-select>
-      <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="slwc1" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
-        <span>-</span>
-        <el-input-number :controls="false" :precision="2"  v-model="slwc2" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
-      </div>
-      <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="slzq1" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
-        <span>-</span>
-        <el-input-number :controls="false" :precision="2" v-model="slzq2" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
-      </div>
-      <el-checkbox v-model="ccys"style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
-      <!-- 临时注释 -->
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <div style="display: inline-block;" class="filter-item1">
+        <el-input-number :controls="false" :precision="2" v-model="slwc1" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
+        <span>-</span>
+        <el-input-number :controls="false" :precision="2"  v-model="slwc2" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
+      </div>
+      <div style="display: inline-block;" class="filter-item1">
+        <el-input-number :controls="false" :precision="2" v-model="slzq1" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
+        <span>-</span>
+        <el-input-number :controls="false" :precision="2" v-model="slzq2" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
+      </div>
+      <el-checkbox v-model="ccys"style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
+      <!-- 临时注释 -->
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <el-row :gutter="10">
@@ -517,16 +517,16 @@ import { parseTime } from '@/utils/index.js'
 export default {
   name: 'PastureProcessAnalysis',
   data() {
-    return {
-      hlwc1:undefined ,
-      hlwc2:undefined ,
-      hlzq1:undefined ,
-      hlzq2:undefined ,
-      slwc1:undefined ,
-      slwc2:undefined ,
-      slzq1:undefined ,
-      slzq2:undefined ,
-      ccys:false,
+    return {
+      hlwc1:undefined ,
+      hlwc2:undefined ,
+      hlzq1:undefined ,
+      hlzq2:undefined ,
+      slwc1:undefined ,
+      slwc2:undefined ,
+      slzq1:undefined ,
+      slzq2:undefined ,
+      ccys:false,
       myheight:970,
       title: '',
       isPremixedPlan: '', // 预混计划
@@ -564,14 +564,14 @@ export default {
           }
           return time.getTime() > Date.now() + 8.64e7
         }
-      },
-      cixCategoryParm:{
-        name: 'getFeedclassList', offset: 0, pagecount: 0,
-        parammaps: { 'pastureid': Cookies.get('pastureid') }
+      },
+      cixCategoryParm:{
+        name: 'getFeedclassList', offset: 0, pagecount: 0,
+        parammaps: { 'pastureid': 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: '已完成' }], // 工作状态
-      cixCategoryList: [], // 混料类别
+      workingConditionList: [{ id: '0', name: '进行中' }, { id: '1', name: '已完成' }], // 工作状态
+      cixCategoryList: [], // 混料类别
 
       // TMR设备列表
       table: {
@@ -588,8 +588,8 @@ export default {
             inputDatetime: [new Date(), new Date()],
             iscompleted: '',
             tmrtname: '',
-            lpplantype: '',
-            error:'',
+            lpplantype: '',
+            error:'',
             fclassid:''
           }
         },
@@ -688,7 +688,7 @@ export default {
       },
     }
   },
-  created() {
+  created() {
     this.getCixCategoryList()
     this.getList()
   },
@@ -706,14 +706,14 @@ export default {
          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(){
+      GetDataByName(this.cixCategoryParm).then(response => {
+        if(response.data.list !== null){
+          this.cixCategoryList = response.data.list
+        }else{
+          this.cixCategoryList = []
+        }
+      })
     },
     // TMR设备列表
     getList() {
@@ -732,8 +732,8 @@ export default {
             this.table2.getdataListParm.parammaps.id = response.data.list[0].id
             this.table2.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
-            this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
+            this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].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()
@@ -751,8 +751,8 @@ export default {
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
             this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
-            this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
+            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].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()
@@ -769,8 +769,8 @@ export default {
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
             this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
-            this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
+            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].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()
@@ -790,8 +790,8 @@ export default {
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
             this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
-            this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
+            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].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()
@@ -811,8 +811,8 @@ export default {
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
             this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
-            this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
+            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].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()
@@ -832,8 +832,8 @@ export default {
             this.table3.getdataListParm.parammaps.pid = response.data.list[0].id
             this.table3.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
             this.table4.getdataListParm.parammaps.pid = response.data.list[0].id
-            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].pastureid
-            this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
+            this.table4.getdataListParm.parammaps.pastureid = response.data.list[0].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()
@@ -858,7 +858,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -867,89 +867,89 @@ export default {
         this.table.getdataListParm.parammaps.inputDatetime = ''
         this.table.getdataListParm.parammaps.startTime = ''
         this.table.getdataListParm.parammaps.stopTime = ''
-      }
-      // 临时注释
-      // this.table.getdataListParm.parammaps.hlwc1 = this.hlwc1
-      // this.table.getdataListParm.parammaps.hlwc2 = this.hlwc2
-      // this.table.getdataListParm.parammaps.hlzq1 = this.hlzq1
-      // this.table.getdataListParm.parammaps.hlzq2 = this.hlzq2
-      // this.table.getdataListParm.parammaps.slwc1 = this.slwc1
-      // this.table.getdataListParm.parammaps.slwc2 = this.slwc2
-      // this.table.getdataListParm.parammaps.slzq1 = this.slzq1
-      // this.table.getdataListParm.parammaps.slzq2 = this.slzq2
-      // if(this.ccys == true){
-      //   if(this.table3.getdataListParm.name !== 'getprocessAnalysisHL'){
-      //     this.hlwc1 = undefined
-      //     this.hlwc2 = undefined
-      //     this.hlzq1 = undefined
-      //     this.hlzq2 = undefined
-      //     this.slwc1 = undefined
-      //     this.slwc2 = undefined
-      //     this.slzq1 = undefined
-      //     this.slzq2 = undefined
-      //     this.table.getdataListParm.parammaps.error = ''
-      //     this.table3.getdataListParm.parammaps.error = ''
-      //     this.table4.getdataListParm.parammaps.error = ''
-      //   }
-      //   if(this.table3.getdataListParm.name == 'getprocessAnalysisHL'){
-      //     this.table3.getdataListParm.parammaps.hlwc1  = this.hlwc1
-      //     this.table3.getdataListParm.parammaps.hlwc2  = this.hlwc2
-      //     this.table3.getdataListParm.parammaps.hlzq1  = this.hlzq1
-      //     this.table3.getdataListParm.parammaps.hlzq2  = this.hlzq2
-      //     this.table3.getdataListParm.parammaps.slwc1  = this.slwc1
-      //     this.table3.getdataListParm.parammaps.slwc2  = this.slwc2
-      //     this.table3.getdataListParm.parammaps.slzq1  = this.slzq1
-      //     this.table3.getdataListParm.parammaps.slzq2  = this.slzq2
-      //     this.table3.getdataListParm.parammaps.error  = '有误差'
-      //   }
-      //   if(this.table4.getdataListParm.name == 'getprocessAnalysisSL'){
-      //     this.table4.getdataListParm.parammaps.hlwc1  = this.hlwc1
-      //     this.table4.getdataListParm.parammaps.hlwc2  = this.hlwc2
-      //     this.table4.getdataListParm.parammaps.hlzq1  = this.hlzq1
-      //     this.table4.getdataListParm.parammaps.hlzq2  = this.hlzq2
-      //     this.table4.getdataListParm.parammaps.slwc1  = this.slwc1
-      //     this.table4.getdataListParm.parammaps.slwc2  = this.slwc2
-      //     this.table4.getdataListParm.parammaps.slzq1  = this.slzq1
-      //     this.table4.getdataListParm.parammaps.slzq2  = this.slzq2
-      //     this.table4.getdataListParm.parammaps.error  = '有误差'
-      //   }
-      //   if(this.table.getdataListParm.name == 'getprocessAnalysis'){
-      //     this.table.getdataListParm.parammaps.hlwc1  = this.hlwc1
-      //     this.table.getdataListParm.parammaps.hlwc2  = this.hlwc2
-      //     this.table.getdataListParm.parammaps.hlzq1  = this.hlzq1
-      //     this.table.getdataListParm.parammaps.hlzq2  = this.hlzq2
-      //     this.table.getdataListParm.parammaps.slwc1  = this.slwc1
-      //     this.table.getdataListParm.parammaps.slwc2  = this.slwc2
-      //     this.table.getdataListParm.parammaps.slzq1  = this.slzq1
-      //     this.table.getdataListParm.parammaps.slzq2  = this.slzq2
-      //     this.table.getdataListParm.parammaps.error = '有误差'
-      //   }
-      // }else{
-      //   this.table3.getdataListParm.parammaps.hlwc1  = ''
-      //   this.table3.getdataListParm.parammaps.hlwc2  = ''
-      //   this.table3.getdataListParm.parammaps.hlzq1  = ''
-      //   this.table3.getdataListParm.parammaps.hlzq2  = ''
-      //   this.table3.getdataListParm.parammaps.slwc1  = ''
-      //   this.table3.getdataListParm.parammaps.slwc2  = ''
-      //   this.table3.getdataListParm.parammaps.slzq1  = ''
-      //   this.table3.getdataListParm.parammaps.slzq2  = ''
-      //   this.table4.getdataListParm.parammaps.hlwc1  = ''
-      //   this.table4.getdataListParm.parammaps.hlwc2  = ''
-      //   this.table4.getdataListParm.parammaps.hlzq1  = ''
-      //   this.table4.getdataListParm.parammaps.hlzq2  = ''
-      //   this.table4.getdataListParm.parammaps.slwc1  = ''
-      //   this.table4.getdataListParm.parammaps.slwc2  = ''
-      //   this.table4.getdataListParm.parammaps.slzq1  = ''
-      //   this.table4.getdataListParm.parammaps.slzq2  = ''
-      //   this.table3.getdataListParm.parammaps.error  = ''
-      //   this.table4.getdataListParm.parammaps.error  = ''
-      // }
+      }
+    
+      this.table.getdataListParm.parammaps.hlwc1 = this.hlwc1
+      this.table.getdataListParm.parammaps.hlwc2 = this.hlwc2
+      this.table.getdataListParm.parammaps.hlzq1 = this.hlzq1
+      this.table.getdataListParm.parammaps.hlzq2 = this.hlzq2
+      this.table.getdataListParm.parammaps.slwc1 = this.slwc1
+      this.table.getdataListParm.parammaps.slwc2 = this.slwc2
+      this.table.getdataListParm.parammaps.slzq1 = this.slzq1
+      this.table.getdataListParm.parammaps.slzq2 = this.slzq2
+      // if(this.ccys == true){
+      //   if(this.table3.getdataListParm.name !== 'getprocessAnalysisHL'){
+      //     this.hlwc1 = undefined
+      //     this.hlwc2 = undefined
+      //     this.hlzq1 = undefined
+      //     this.hlzq2 = undefined
+      //     this.slwc1 = undefined
+      //     this.slwc2 = undefined
+      //     this.slzq1 = undefined
+      //     this.slzq2 = undefined
+      //     this.table.getdataListParm.parammaps.error = ''
+      //     this.table3.getdataListParm.parammaps.error = ''
+      //     this.table4.getdataListParm.parammaps.error = ''
+      //   }
+      //   if(this.table3.getdataListParm.name == 'getprocessAnalysisHL'){
+      //     this.table3.getdataListParm.parammaps.hlwc1  = this.hlwc1
+      //     this.table3.getdataListParm.parammaps.hlwc2  = this.hlwc2
+      //     this.table3.getdataListParm.parammaps.hlzq1  = this.hlzq1
+      //     this.table3.getdataListParm.parammaps.hlzq2  = this.hlzq2
+      //     this.table3.getdataListParm.parammaps.slwc1  = this.slwc1
+      //     this.table3.getdataListParm.parammaps.slwc2  = this.slwc2
+      //     this.table3.getdataListParm.parammaps.slzq1  = this.slzq1
+      //     this.table3.getdataListParm.parammaps.slzq2  = this.slzq2
+      //     this.table3.getdataListParm.parammaps.error  = '有误差'
+      //   }
+      //   if(this.table4.getdataListParm.name == 'getprocessAnalysisSL'){
+      //     this.table4.getdataListParm.parammaps.hlwc1  = this.hlwc1
+      //     this.table4.getdataListParm.parammaps.hlwc2  = this.hlwc2
+      //     this.table4.getdataListParm.parammaps.hlzq1  = this.hlzq1
+      //     this.table4.getdataListParm.parammaps.hlzq2  = this.hlzq2
+      //     this.table4.getdataListParm.parammaps.slwc1  = this.slwc1
+      //     this.table4.getdataListParm.parammaps.slwc2  = this.slwc2
+      //     this.table4.getdataListParm.parammaps.slzq1  = this.slzq1
+      //     this.table4.getdataListParm.parammaps.slzq2  = this.slzq2
+      //     this.table4.getdataListParm.parammaps.error  = '有误差'
+      //   }
+      //   if(this.table.getdataListParm.name == 'getprocessAnalysis'){
+      //     this.table.getdataListParm.parammaps.hlwc1  = this.hlwc1
+      //     this.table.getdataListParm.parammaps.hlwc2  = this.hlwc2
+      //     this.table.getdataListParm.parammaps.hlzq1  = this.hlzq1
+      //     this.table.getdataListParm.parammaps.hlzq2  = this.hlzq2
+      //     this.table.getdataListParm.parammaps.slwc1  = this.slwc1
+      //     this.table.getdataListParm.parammaps.slwc2  = this.slwc2
+      //     this.table.getdataListParm.parammaps.slzq1  = this.slzq1
+      //     this.table.getdataListParm.parammaps.slzq2  = this.slzq2
+      //     this.table.getdataListParm.parammaps.error = '有误差'
+      //   }
+      // }else{
+      //   this.table3.getdataListParm.parammaps.hlwc1  = ''
+      //   this.table3.getdataListParm.parammaps.hlwc2  = ''
+      //   this.table3.getdataListParm.parammaps.hlzq1  = ''
+      //   this.table3.getdataListParm.parammaps.hlzq2  = ''
+      //   this.table3.getdataListParm.parammaps.slwc1  = ''
+      //   this.table3.getdataListParm.parammaps.slwc2  = ''
+      //   this.table3.getdataListParm.parammaps.slzq1  = ''
+      //   this.table3.getdataListParm.parammaps.slzq2  = ''
+      //   this.table4.getdataListParm.parammaps.hlwc1  = ''
+      //   this.table4.getdataListParm.parammaps.hlwc2  = ''
+      //   this.table4.getdataListParm.parammaps.hlzq1  = ''
+      //   this.table4.getdataListParm.parammaps.hlzq2  = ''
+      //   this.table4.getdataListParm.parammaps.slwc1  = ''
+      //   this.table4.getdataListParm.parammaps.slwc2  = ''
+      //   this.table4.getdataListParm.parammaps.slzq1  = ''
+      //   this.table4.getdataListParm.parammaps.slzq2  = ''
+      //   this.table3.getdataListParm.parammaps.error  = ''
+      //   this.table4.getdataListParm.parammaps.error  = ''
+      // }
       // 临时注释
       this.table.getdataListParm.offset = 1
       this.getList()
     },
     handleRefresh() {
-      console.log('点击了重置')
+      console.log('点击了重置')
       this.table.getdataListParm.parammaps.fclassid = ''
       this.table.getdataListParm.parammaps.tmrtname = ''
       this.table.getdataListParm.parammaps.iscompleted = ''
@@ -1003,7 +1003,7 @@ export default {
       this.getDownList()
       this.getList()
     },
-    rowClick(row, column, event) {
+    rowClick(row, column, event) {
       this.table2.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
       this.table3.getdataListParm.parammaps.fclassid = this.table.getdataListParm.parammaps.fclassid
       this.table2.getdataListParm.parammaps.id = row.id
@@ -1352,77 +1352,77 @@ export default {
             return "";
         }
     },
-    changeccysChecked(){
-      // table.getdataListParm.parammaps.ccys
-      // console.log(this.table.getdataListParm.parammaps.ccys,'===')
-      if(this.ccys == true){
-        if(this.table3.getdataListParm.name !== 'getprocessAnalysisHL'){
-          this.hlwc1 = undefined
-          this.hlwc2 = undefined
-          this.hlzq1 = undefined
-          this.hlzq2 = undefined
-          this.slwc1 = undefined
-          this.slwc2 = undefined
-          this.slzq1 = undefined
-          this.slzq2 = undefined
-          this.table3.getdataListParm.parammaps.error = ''
-          this.table4.getdataListParm.parammaps.error = ''
-          this.table.getdataListParm.parammaps.error = ''
-        }
-        if(this.table3.getdataListParm.name == 'getprocessAnalysisHL'){
-        //   // hlwc1,hlwc2,hlzq1,hlzq2,slwc1,slwc2,slzq1,slzq2,ccys
-          this.table3.getdataListParm.parammaps.hlwc1  = this.hlwc1
-          this.table3.getdataListParm.parammaps.hlwc2  = this.hlwc2
-          this.table3.getdataListParm.parammaps.hlzq1  = this.hlzq1
-          this.table3.getdataListParm.parammaps.hlzq2  = this.hlzq2
-          this.table3.getdataListParm.parammaps.slwc1  = this.slwc1
-          this.table3.getdataListParm.parammaps.slwc2  = this.slwc2
-          this.table3.getdataListParm.parammaps.slzq1  = this.slzq1
-          this.table3.getdataListParm.parammaps.slzq2  = this.slzq2
-          this.table3.getdataListParm.parammaps.error = '有误差'
-        }
-        if(this.table4.getdataListParm.name == 'getprocessAnalysisSL'){
-          this.table4.getdataListParm.parammaps.hlwc1  = this.hlwc1
-          this.table4.getdataListParm.parammaps.hlwc2  = this.hlwc2
-          this.table4.getdataListParm.parammaps.hlzq1  = this.hlzq1
-          this.table4.getdataListParm.parammaps.hlzq2  = this.hlzq2
-          this.table4.getdataListParm.parammaps.slwc1  = this.slwc1
-          this.table4.getdataListParm.parammaps.slwc2  = this.slwc2
-          this.table4.getdataListParm.parammaps.slzq1  = this.slzq1
-          this.table4.getdataListParm.parammaps.slzq2  = this.slzq2
-          this.table4.getdataListParm.parammaps.error = '有误差'
-        }
-        if(this.table.getdataListParm.name == 'getprocessAnalysis'){
-          this.table.getdataListParm.parammaps.hlwc1  = this.hlwc1
-          this.table.getdataListParm.parammaps.hlwc2  = this.hlwc2
-          this.table.getdataListParm.parammaps.hlzq1  = this.hlzq1
-          this.table.getdataListParm.parammaps.hlzq2  = this.hlzq2
-          this.table.getdataListParm.parammaps.slwc1  = this.slwc1
-          this.table.getdataListParm.parammaps.slwc2  = this.slwc2
-          this.table.getdataListParm.parammaps.slzq1  = this.slzq1
-          this.table.getdataListParm.parammaps.slzq2  = this.slzq2
-          this.table.getdataListParm.parammaps.error = '有误差'
-        }
-        this.getList2()
-        this.getList3()
-        this.getList4()
-      }else{
-        this.table.getdataListParm.parammaps.error = ''
-        this.table3.getdataListParm.parammaps.error = ''
-        this.table4.getdataListParm.parammaps.error = ''
-        this.getList2()
-        this.getList3()
-        this.getList4()
-      }
+    changeccysChecked(){
+      // table.getdataListParm.parammaps.ccys
+      // console.log(this.table.getdataListParm.parammaps.ccys,'===')
+      if(this.ccys == true){
+        if(this.table3.getdataListParm.name !== 'getprocessAnalysisHL'){
+          this.hlwc1 = undefined
+          this.hlwc2 = undefined
+          this.hlzq1 = undefined
+          this.hlzq2 = undefined
+          this.slwc1 = undefined
+          this.slwc2 = undefined
+          this.slzq1 = undefined
+          this.slzq2 = undefined
+          this.table3.getdataListParm.parammaps.error = ''
+          this.table4.getdataListParm.parammaps.error = ''
+          this.table.getdataListParm.parammaps.error = ''
+        }
+        if(this.table3.getdataListParm.name == 'getprocessAnalysisHL'){
+        //   // hlwc1,hlwc2,hlzq1,hlzq2,slwc1,slwc2,slzq1,slzq2,ccys
+          this.table3.getdataListParm.parammaps.hlwc1  = this.hlwc1
+          this.table3.getdataListParm.parammaps.hlwc2  = this.hlwc2
+          this.table3.getdataListParm.parammaps.hlzq1  = this.hlzq1
+          this.table3.getdataListParm.parammaps.hlzq2  = this.hlzq2
+          this.table3.getdataListParm.parammaps.slwc1  = this.slwc1
+          this.table3.getdataListParm.parammaps.slwc2  = this.slwc2
+          this.table3.getdataListParm.parammaps.slzq1  = this.slzq1
+          this.table3.getdataListParm.parammaps.slzq2  = this.slzq2
+          this.table3.getdataListParm.parammaps.error = '有误差'
+        }
+        if(this.table4.getdataListParm.name == 'getprocessAnalysisSL'){
+          this.table4.getdataListParm.parammaps.hlwc1  = this.hlwc1
+          this.table4.getdataListParm.parammaps.hlwc2  = this.hlwc2
+          this.table4.getdataListParm.parammaps.hlzq1  = this.hlzq1
+          this.table4.getdataListParm.parammaps.hlzq2  = this.hlzq2
+          this.table4.getdataListParm.parammaps.slwc1  = this.slwc1
+          this.table4.getdataListParm.parammaps.slwc2  = this.slwc2
+          this.table4.getdataListParm.parammaps.slzq1  = this.slzq1
+          this.table4.getdataListParm.parammaps.slzq2  = this.slzq2
+          this.table4.getdataListParm.parammaps.error = '有误差'
+        }
+        if(this.table.getdataListParm.name == 'getprocessAnalysis'){
+          this.table.getdataListParm.parammaps.hlwc1  = this.hlwc1
+          this.table.getdataListParm.parammaps.hlwc2  = this.hlwc2
+          this.table.getdataListParm.parammaps.hlzq1  = this.hlzq1
+          this.table.getdataListParm.parammaps.hlzq2  = this.hlzq2
+          this.table.getdataListParm.parammaps.slwc1  = this.slwc1
+          this.table.getdataListParm.parammaps.slwc2  = this.slwc2
+          this.table.getdataListParm.parammaps.slzq1  = this.slzq1
+          this.table.getdataListParm.parammaps.slzq2  = this.slzq2
+          this.table.getdataListParm.parammaps.error = '有误差'
+        }
+        this.getList2()
+        this.getList3()
+        this.getList4()
+      }else{
+        this.table.getdataListParm.parammaps.error = ''
+        this.table3.getdataListParm.parammaps.error = ''
+        this.table4.getdataListParm.parammaps.error = ''
+        this.getList2()
+        this.getList3()
+        this.getList4()
+      }
     }
   }
 }
 
 </script>
 <style lang="scss" scoped>
-  .filter-item1{
-    margin-top: 10px;
-    span{margin-right: 5px;}
+  .filter-item1{
+    margin-top: 10px;
+    span{margin-right: 5px;}
   }
   /deep/.el-table--scrollable-y .el-table__body-wrapper{
     bottom: 15px;

src/views/systemManagement/boardEchartManagement/index.vue

@@ -9,7 +9,7 @@
           <el-select v-model="table.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh">重置</el-button>
         </div>
         <div class="operation">
@@ -117,7 +117,7 @@
           <el-select v-model="table2.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList2" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
         </div>
         <div class="operation">
@@ -413,12 +413,12 @@ export default {
     handleEnableChange(val) {
       console.log('点击了是否启用', val)
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
     },
-    handleSearch2() {
+    form_search2() {
       console.log('点击了查询')
       this.table2.getdataListParm.offset = 1
       this.getList2()

src/views/systemManagement/boardEchartManagement2/index.vue

@@ -9,7 +9,7 @@
           <el-select v-model="table.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh">重置</el-button>
         </div>
         <div class="operation">
@@ -117,7 +117,7 @@
           <el-select v-model="table2.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList2" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="handleSearch2">查询</el-button>
+          <el-button class="successBorder" @click="form_search2">查询</el-button>
           <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
         </div>
         <div class="operation">
@@ -413,12 +413,12 @@ export default {
     handleEnableChange(val) {
       console.log('点击了是否启用', val)
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
     },
-    handleSearch2() {
+    form_search2() {
       console.log('点击了查询')
       this.table2.getdataListParm.offset = 1
       this.getList2()

src/views/systemManagement/groupInformation/index.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="集团名称" name="first">
         <div class="search">
           <el-input v-model="table.getdataListParm.parammaps.groupsname" placeholder="集团名称" style="width: 180px;" class="filter-item" clearable />
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
         </div>
 
         <div class="table">
@@ -53,7 +53,7 @@
       <el-tab-pane label="牧场管理" name="second">
         <div class="search">
           <el-input v-model="table.getdataListParm.parammaps.pasturename" placeholder="牧场名称" style="width: 180px;" class="filter-item" clearable />
-          <el-button class="successBorder" @click="handleSearch">查询</el-button>
+          <el-button class="successBorder" @click="form_search">查询</el-button>
         </div>
 
         <div class="table">
@@ -180,7 +180,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了集团信息查询')
       if (this.activeName == 'first') {
         this.getList()
@@ -205,7 +205,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了牧场管理查询')
       this.getList()
     }

src/views/systemManagement/labelManagement/index.vue

@@ -7,12 +7,12 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="标签值" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in tagValueList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -254,7 +254,7 @@ export default {
       console.log('点击了是否启用')
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.table.getdataListParm.offset = 1
       this.getList()
@@ -363,7 +363,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择驾驶员信息', duration: 2000 })

src/views/systemManagement/notificationManagement/index.vue

@@ -4,12 +4,12 @@
       <el-input v-model="table.getdataListParm.parammaps.rolename" placeholder="标题" style="width: 180px;" class="filter-item" clearable />
       <el-input v-model="table.getdataListParm.parammaps.rolename" placeholder="创建人" style="width: 180px;" class="filter-item" clearable />
       <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="successBorder" @click="handleSearch('table')">查询</el-button>
+      <el-button class="successBorder" @click="form_search('table')">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh('table')">重置</el-button>
     </div>
     <div class="operation">
       <el-button class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button class="danger" icon="el-icon-delete" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -38,7 +38,7 @@
         <el-table-column label="创建人" min-width="100px" align="center" prop="createmp" />
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="form_see(row)" />
             <span class="centerSpan">|</span>
             <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <span class="centerSpan">|</span>
@@ -58,7 +58,7 @@
         </el-select>
         <el-input v-model="statisticsRead.getdataListParm.parammaps.rolename" placeholder="用户" style="width: 180px;" class="filter-item" clearable />
         <el-date-picker ref="inputDatetime" v-model="statisticsRead.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-        <el-button class="successBorder" @click="handleSearch('statisticsRead')">查询</el-button>
+        <el-button class="successBorder" @click="form_search('statisticsRead')">查询</el-button>
         <el-button class="successBorder" @click="handleRefresh('statisticsRead')">重置</el-button>
       </div>
       <div class="table">
@@ -195,7 +195,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch(item) {
+    form_search(item) {
       if (item == 'table') {
         if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
           this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -230,7 +230,7 @@ export default {
     },
     handleCreate() {},
 
-    handleSee(row) {},
+    form_see(row) {},
     handleUpdate(row) {},
     handleRowDelete(row) {},
     handleStatisticsRead(row) {
@@ -259,7 +259,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择角色信息', duration: 2000 })

src/views/systemManagement/operation/index.vue

@@ -12,7 +12,7 @@
         <el-option v-for="item in operatorList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="table">
@@ -41,7 +41,7 @@
         <el-table-column label="操作时间" min-width="130px" align="center" prop="rolename" />
         <el-table-column label="操作" align="center" width="50px" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="form_see(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -161,7 +161,7 @@ export default {
         }, 100)
       })
     },
-    handleSearch() {
+    form_search() {
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
@@ -176,7 +176,7 @@ export default {
     handleRefresh() {
       console.log('点击了重置')
     },
-    handleSee(row) {
+    form_see(row) {
       this.see.dialogStatus = 'see'
       this.see.dialogFormVisible = true
       this.see.temp = Object.assign({}, row)

src/views/systemManagement/operationManagement/group/index.vue

@@ -5,7 +5,7 @@
       <el-select v-model="tab1.table.getdataListParm.parammaps.enable" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in stateList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
@@ -415,7 +415,7 @@ export default {
       })
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.tab1.table.getdataListParm.offset = 1
       this.getList()

src/views/systemManagement/operationManagement/pasture/index.vue

@@ -8,7 +8,7 @@
       <el-select v-model="tab2.table.getdataListParm.parammaps.statue" placeholder="是否归属集团" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in isBelongGroupList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
@@ -209,7 +209,7 @@ export default {
     handleEnableChange() {
       console.log('点击了是否启用')
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.tab2.table.getdataListParm.offset = 1
       this.getList()

src/views/systemManagement/ranchInformation/index.vue

@@ -16,12 +16,12 @@
           <li>
             <div style="float: right;">
               <el-button class="downminCancel" @click="arrowUp=false;arrowDown=true;">取消</el-button>
-              <el-button class="miniPrimary" @click="handleSearch">搜索</el-button>
+              <el-button class="miniPrimary" @click="form_search">搜索</el-button>
             </div>
           </li>
         </ul>
       </div>
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
 
@@ -188,7 +188,7 @@ export default {
     handleConfirmStartChange() {
       console.log('点击了确认开始')
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       this.getList()
       this.table.getdataListParm.offset = 1

src/views/systemManagement/reminderSettings/index.vue

@@ -24,7 +24,7 @@
         </el-table-column>
         <el-table-column label="详细配置" min-width="130px" align="center">
           <template slot-scope="{row}">
-            <a class="correcting" size="mini" style="width: 80px;" @click="handleSee(row)">查看</a>
+            <a class="correcting" size="mini" style="width: 80px;" @click="form_see(row)">查看</a>
           </template>
         </el-table-column>
         <el-table-column label="提醒对象" min-width="130px" align="center" prop="user" />
@@ -170,7 +170,7 @@
                 <el-input v-model="setUp.empCode" placeholder="角色名称" style="width: 180px;" class="filter-item" clearable />
                 <el-input v-model="setUp.empCode" placeholder="用户名称" style="width: 180px;" class="filter-item" clearable />
                 <el-input v-model="setUp.empname" placeholder="员工姓名" style="width: 180px;" class="filter-item" clearable />
-                <el-button class="successBorder" @click="handleSearch">查询</el-button>
+                <el-button class="successBorder" @click="form_search">查询</el-button>
               </div>
               <el-row :gutter="5">
                 <el-col :span="6">
@@ -616,7 +616,7 @@
         }
         this.getList1()
       },
-      handleSee(row){
+      form_see(row){
         this.see.dialogStatus = 'see'
         this.see.dialogFormVisible = true
         this.setUp.temp = Object.assign({}, row)
@@ -729,7 +729,7 @@
         this.QRcode.dialogStatus = 'QRcode'
         this.QRcode.dialogFormVisible = true
       },
-      handleSearch(){
+      form_search(){
         this.getList2()
       },
       getList1() {

src/views/systemManagement/role/index.vue

@@ -7,12 +7,12 @@
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -266,7 +266,7 @@ export default {
     handleConfirmStartChange() {
       console.log('点击了确认开始')
     },
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -440,7 +440,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择角色信息', duration: 2000 })

src/views/systemManagement/user/index.vue

@@ -7,17 +7,17 @@
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <!-- 临时注释 -->
-      <!-- <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="公众号关注状态" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in attentionStatusList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select> -->
       <!-- 临时注释 -->
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
+      <!-- <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="公众号关注状态" class="filter-item" style="width: 150px;" clearable>
+        <el-option v-for="item in attentionStatusList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select> -->
+      <!-- 临时注释 -->
+      <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -65,16 +65,16 @@
               <el-option v-for="item in roleList" :key="item.id" :label="item.rolename" :value="item.id" />
             </el-select>
           </template>
-        </el-table-column>
-        <!-- 临时注释 -->
-        <!-- <el-table-column label="公众号关注状态" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.rolename }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.roleid" placeholder="角色" class="filter-item" style="width:90%;padding:10px 0;" filterable @change="changeRolename">
-              <el-option v-for="item in attentionStatusList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </template>
-        </el-table-column> -->
+        </el-table-column>
+        <!-- 临时注释 -->
+        <!-- <el-table-column label="公众号关注状态" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.NoEdit">{{ scope.row.rolename }}</span>
+            <el-select v-if="scope.row.Edit" v-model="scope.row.roleid" placeholder="角色" class="filter-item" style="width:90%;padding:10px 0;" filterable @change="changeRolename">
+              <el-option v-for="item in attentionStatusList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </template>
+        </el-table-column> -->
         <!-- 临时注释 -->
         <el-table-column label="创建时间" min-width="110px" align="center">
           <template slot-scope="scope">
@@ -97,11 +97,11 @@
             <el-button v-if="row.isCreate && isRoleEdit" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
             <span v-if="row.isCreate && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isCreate && isRoleEdit" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-            <!-- 扫码接收消息 -->
-            <!-- 临时注释 -->
-            <a v-if="row.isUpdate && isRoleEdit" class="correcting" size="mini" style="width: 80px;" @click="handleScanningCode(row)">扫码接收消息</a>
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-            <!-- 临时注释 -->
+            <!-- 扫码接收消息 -->
+            <!-- 临时注释 -->
+            <a v-if="row.isUpdate && isRoleEdit" class="correcting" size="mini" style="width: 80px;" @click="handleScanningCode(row)">扫码接收消息</a>
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <!-- 临时注释 -->
             <!-- 重置密码 -->
             <a v-if="row.isUpdate && isRoleEdit" class="correcting" size="mini" style="width: 80px;" @click="handleResetPassword(row)">重置密码</a>
             <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
@@ -117,21 +117,21 @@
         </el-table-column>
       </el-table>
       <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
-    </div>
-    <el-dialog :title="textMap[QRcode.dialogStatus]" :visible.sync="QRcode.dialogFormVisible" :close-on-click-modal="false" width="50%">
-      <div class="QRcode">
-        <div class="content">
-          <div class="title">
-            <p>微信接收系统待办、预警等消息，必须先扫码关注公众号；</p>
-            <p>请将下方二维码分享给需要接收信息的用户扫码</p>
-          </div>
-          <div style="font-weight: 600;">关注微信：</div>
-          <img :src="imgUrl" alt="">
-        </div>
-        <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
-          <el-button class="save" :disabled="isokDisable" @click="QRcode.dialogFormVisible = false;">确认</el-button>
-        </div>
-      </div>
+    </div>
+    <el-dialog :title="textMap[QRcode.dialogStatus]" :visible.sync="QRcode.dialogFormVisible" :close-on-click-modal="false" width="50%">
+      <div class="QRcode">
+        <div class="content">
+          <div class="title">
+            <p>微信接收系统待办、预警等消息，必须先扫码关注公众号；</p>
+            <p>请将下方二维码分享给需要接收信息的用户扫码</p>
+          </div>
+          <div style="font-weight: 600;">关注微信：</div>
+          <img :src="imgUrl" alt="">
+        </div>
+        <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
+          <el-button class="save" :disabled="isokDisable" @click="QRcode.dialogFormVisible = false;">确认</el-button>
+        </div>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -151,7 +151,7 @@ export default {
       requestParams: [
         { name: 'getRoleAll', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid') }}
       ],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是否启用
+      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是否启用
       attentionStatusList: [{ id: 1, name: '已关注公众号' }, { id: 0, name: '未关注公众号' }],
       roleList: [], // 角色
 
@@ -180,16 +180,16 @@ export default {
       },
       requestParam: {},
       isokDisable: false,
-      selectList: [],
-      QRcode:{
-        dialogStatus: '',
-        dialogFormVisible:false,
-      },
-      textMap: {
-        QRcode:'提示'
+      selectList: [],
+      QRcode:{
+        dialogStatus: '',
+        dialogFormVisible:false,
+      },
+      textMap: {
+        QRcode:'提示'
       },
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
       imgUrl:''
 
     }
@@ -240,7 +240,7 @@ export default {
       console.log('点击了是否启用')
     },
 
-    handleSearch() {
+    form_search() {
       console.log('点击了查询')
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -438,7 +438,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
+    form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择用户信息', duration: 2000 })
@@ -489,25 +489,25 @@ export default {
           })
         })
       })
-    },
-    handleScanningCode(row){
-      this.QRcode.dialogStatus = 'QRcode'
-      this.QRcode.dialogFormVisible = true
-      this.imgUrl = 'http://tmrwatch.cn/wx/code?scene_str=tmrwatch.'+ Cookies.get('pastureid')+'.'+ row.username + '.'+row.empname
-      console.log(this.imgUrl)
+    },
+    handleScanningCode(row){
+      this.QRcode.dialogStatus = 'QRcode'
+      this.QRcode.dialogFormVisible = true
+      this.imgUrl = 'http://tmrwatch.cn/wx/code?scene_str=tmrwatch.'+ Cookies.get('pastureid')+'.'+ row.username + '.'+row.empname
+      console.log(this.imgUrl)
     }
   }
 }
 </script>
 <style lang="scss" scoped>
   // .search{margin-top:10px;}
-  .QRcode{display:flex;justify-content: center; align-items:center;}
-  .content{
-    /* margin-top: 100px; */
-    width: 500px;
-  }
-  .content img{
-    max-width:300px;
-
+  .QRcode{display:flex;justify-content: center; align-items:center;}
+  .content{
+    /* margin-top: 100px; */
+    width: 500px;
+  }
+  .content img{
+    max-width:300px;
+
   }
  </style>