Signed-off-by: 段小段 <1729609802@qq.com>

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

@@ -22,7 +22,7 @@
             <el-option v-for="(item,index) in tab.TMRNameList" :key="index" :label="item.tmrloadname" :value="item.tmrloadname" />
           </el-select>
           <!-- 临时注释 -->
-          <!-- <div style="display: inline-block;" class="filter-item1">
+          <div style="display: inline-block;" class="filter-item1">
             <el-input-number :controls="false" :precision="2" v-model="tab.table.getdataListParm.parammaps.hlwc1" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
             <span>-</span>
             <el-input-number :controls="false" :precision="2"  v-model="tab.table.getdataListParm.parammaps.hlwc2" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
@@ -52,7 +52,7 @@
             <span>-</span>
             <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.ccys" style="margin-right: 10px;">只看超出预设值数据</el-checkbox> -->
+          <el-checkbox v-model="tab.table.getdataListParm.parammaps.ccys" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
           <!-- 临时注释 -->
           <el-button class="successBorder" @click="handleSearch">查询</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
@@ -657,7 +657,7 @@
             <el-option v-for="item in tab2.isuseList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select> -->
           <!-- 临时注释 -->
-          <!-- <div style="display: inline-block;" class="filter-item1">
+          <div style="display: inline-block;" class="filter-item1">
             <el-input-number :controls="false" :precision="2" v-model="tab2.table.getdataListParm.parammaps.hlwc1" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
             <span>-</span>
             <el-input-number :controls="false" :precision="2"  v-model="tab2.table.getdataListParm.parammaps.hlwc2" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
@@ -672,7 +672,7 @@
             <span>-</span>
             <el-input-number :controls="false" :precision="2" v-model="tab2.table.getdataListParm.parammaps.hlzql2" placeholder="混料正确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
-          <el-checkbox v-model="tab2.table.getdataListParm.parammaps.ccys" style="margin-right: 10px;">只看超出预设值数据</el-checkbox> -->
+          <el-checkbox v-model="tab2.table.getdataListParm.parammaps.ccys" 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="handleRefresh2">重置</el-button>
@@ -701,7 +701,7 @@
             <u-table-column sortable label="配方名称" min-width="90px" align="center" prop="配方名称" />
             <u-table-column sortable label="饲料" min-width="70px" align="center" prop="饲料" />
             <!-- 临时注释 -->
-            <!-- <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
+            <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
               <template slot-scope="{row}">
                 <a @click="clickRecipeName2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
               </template>
@@ -710,7 +710,7 @@
               <template slot-scope="{row}">
                 <a @click="clickFeed2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.饲料 }}</a>
               </template>
-            </u-table-column> -->
+            </u-table-column>
             <!-- 临时注释 -->
             <u-table-column sortable label="理论重量" min-width="55px" align="center" prop="理论重量" />
             <u-table-column sortable label="实际重量" min-width="55px" align="center" prop="实际重量" />
@@ -751,7 +751,7 @@
             <el-option v-for="item in tab3.isuseList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select> -->
           <!-- 临时注释 -->
-          <!-- <div style="display: inline-block;" class="filter-item1">
+          <div style="display: inline-block;" class="filter-item1">
             <el-input-number :controls="false" :precision="2" v-model="tab3.table.getdataListParm.parammaps.slwc1" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
             <span>-</span>
             <el-input-number :controls="false" :precision="2"  v-model="tab3.table.getdataListParm.parammaps.slwc2" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
@@ -766,7 +766,7 @@
             <span>-</span>
             <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.ccys" style="margin-right: 10px;">只看超出预设值数据</el-checkbox> -->
+          <el-checkbox v-model="tab3.table.getdataListParm.parammaps.ccys" 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="handleRefresh3">重置</el-button>
@@ -795,7 +795,7 @@
             <u-table-column sortable label="配方名称" min-width="90px" align="center" prop="配方名称" />
             <u-table-column sortable label="栏舍" min-width="90px" align="center" prop="栏舍" />
             <!-- 临时注释 -->
-            <!-- <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
+            <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
               <template slot-scope="{row}">
                 <a @click="clickRecipeName3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
               </template>
@@ -804,7 +804,7 @@
               <template slot-scope="{row}">
                 <a @click="clickFence3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.栏舍 }}</a>
               </template>
-            </u-table-column> -->
+            </u-table-column>
             <!-- 临时注释 -->
             <u-table-column sortable label="理论重量" min-width="55px" align="center" prop="理论重量" />
             <u-table-column sortable label="实际重量" min-width="55px" align="center" prop="实际重量" />

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

@@ -17,27 +17,27 @@
         <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-input-number :controls="false" :precision="2" v-model="table.getdataListParm.parammaps.hlwc1" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
+      <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>
-        <el-input-number :controls="false" :precision="2"  v-model="table.getdataListParm.parammaps.hlwc2" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
+        <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="table.getdataListParm.parammaps.hlzq1" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
+        <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="table.getdataListParm.parammaps.hlzq2" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="hlzq2" placeholder="混料准确率" :min="0" :max="100" 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="table.getdataListParm.parammaps.slwc1" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
+        <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="table.getdataListParm.parammaps.slwc2" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
+        <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="table.getdataListParm.parammaps.slzq1" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
+        <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="table.getdataListParm.parammaps.slzq2" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
+        <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="table.getdataListParm.parammaps.ccys" style="margin-right: 10px;">只看超出预设值数据</el-checkbox> -->
+      <el-checkbox v-model="ccys" style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
       <!-- 临时注释 -->
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
@@ -514,7 +514,16 @@ import { parseTime } from '@/utils/index.js'
 export default {
   name: 'PastureProcessAnalysis',
   data() {
-    return {
+    return {
+      hlwc1:undefined ,
+      hlwc2:undefined ,
+      hlzq1:undefined ,
+      hlzq2:undefined ,
+      slwc1:undefined ,
+      slwc2:undefined ,
+      slzq1:undefined ,
+      slzq2:undefined ,
+      ccys:false,
       myheight:970,
       title: '',
       isPremixedPlan: '', // 预混计划
@@ -830,6 +839,56 @@ export default {
         this.table.getdataListParm.parammaps.inputDatetime = ''
         this.table.getdataListParm.parammaps.startTime = ''
         this.table.getdataListParm.parammaps.stopTime = ''
+      }
+      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 
+        }
+        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
+        }
+        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
+        }
+      }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.table.getdataListParm.offset = 1
       this.getList()
@@ -1235,7 +1294,44 @@ 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 
+        }
+        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
+        }
+        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.getList()
+      }
+    }
   }
 }