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

src/views/formulationPlan/recipeTemplate/index.vue

@@ -259,6 +259,11 @@
                 <el-select v-if="scope.row.Edit" v-model="scope.row.autosecond" filterable placeholder="搅拌延时" class="filter-item" style="width:95%;padding:10px 0;">
                   <el-option v-for="item in mixingDelayList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
+                <!-- <div v-if="scope.row.Edit">
+                  <el-input-number  v-model="num" style="width:50%;padding:10px 0;dispaly:inline-block;" :controls='false' :precision="2"/>
+                  <span>-</span>
+                  <el-input-number v-model="num" style="width:45%;padding:10px 0;dispaly:inline-block;" :controls='false' :precision="2"/>
+                </div> -->
               </template>
             </el-table-column>
             <el-table-column v-if="lockCount.isLockCount" label="是否锁定牛头数比例" min-width="80px" align="center">

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

@@ -16,13 +16,15 @@
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 140px;" placeholder="栏舍名称" />
           <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 140px;" placeholder="牲畜名称" />
           <el-input v-if="tab.isTrainNumber" v-model="tab.table.getdataListParm.parammaps.projname" class="filter-item" style="width: 100px;" placeholder="车次" />
-          <el-input v-if="tab.isTrainNumber" v-model="tab.table.getdataListParm.parammaps.times" class="filter-item" style="width: 100px;" placeholder="班次" />
+          <!-- <el-input v-if="tab.isTrainNumber" v-model="tab.table.getdataListParm.parammaps.times" class="filter-item" style="width: 100px;" placeholder="班次" /> -->
+          <el-select v-if="tab.isTrainNumber" v-model="tab.table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
+            <el-option v-for="item in tab2.frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
           <el-input v-if="tab.isTrainNumber" v-model="tab.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 100px;" placeholder="TMR名称" />
           <el-select v-if="tab.isTMRName" v-model="tab.table.getdataListParm.parammaps.fname" placeholder="请选择TMR设备" class="filter-item" style="width: 150px;">
             <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,8 +54,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.error" style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox> -->
-          <!-- 临时注释 -->
+          <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="handleRefresh1">重置</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
@@ -657,8 +658,7 @@
           <!-- <el-select v-model="tab2.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
             <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 />
@@ -673,8 +673,8 @@
             <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.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox> -->
-          <!-- 临时注释 -->
+          <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="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>
@@ -751,8 +751,7 @@
           <!-- <el-select v-model="tab3.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
             <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 />
@@ -767,8 +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.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox> -->
-          <!-- 临时注释 -->
+          <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="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>
@@ -1184,9 +1182,9 @@ export default {
       tab: {
         TMRNameList:[],
         radio: '2',
-        isDriver: true,
+        isDriver: false,
         isFormulaName: false, // 配方名称
-        isHouseName: false, // 栏舍名称
+        isHouseName: true, // 栏舍名称
         isLivestockType: false, // 牲畜类别
         isTrainNumber: false, // 车次
         isTMRName: false, // TMR名称
@@ -1664,8 +1662,8 @@ export default {
         },
         tableKey2: 0, total2: 0, listLoading2: false, list2: [],
         temp1:{},
-        temp2:{}
-      }
+        temp2:{},
+      },
     }
   },
   created() {

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

@@ -732,7 +732,9 @@ 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.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()
           } else if (response.data.list[0].lpplantype == '剩料计划') {
@@ -749,7 +751,9 @@ 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.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()
             this.getList4()
@@ -765,7 +769,9 @@ 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.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()
             this.getList4()
@@ -784,7 +790,9 @@ 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.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()
             this.getList4()
@@ -803,7 +811,9 @@ 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.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()
             this.getList4()
@@ -822,7 +832,9 @@ 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.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()
             this.getList4()
@@ -937,7 +949,8 @@ export default {
       this.getList()
     },
     handleRefresh() {
-      console.log('点击了重置')
+      console.log('点击了重置')
+      this.table.getdataListParm.parammaps.fclassid = ''
       this.table.getdataListParm.parammaps.tmrtname = ''
       this.table.getdataListParm.parammaps.iscompleted = ''
       this.table.getdataListParm.parammaps.lpplantype = ''
@@ -990,7 +1003,9 @@ 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
       this.table3.getdataListParm.parammaps.pid = row.id
       this.table4.getdataListParm.parammaps.pid = row.id

src/views/systemManagement/user/index.vue

@@ -493,7 +493,7 @@ export default {
     handleScanningCode(){
       this.QRcode.dialogStatus = 'QRcode'
       this.QRcode.dialogFormVisible = true
-      this.imgUrl = 'http://tmrwatch.cn:80/wx/code?scene_id=tmrwatch.'+Cookies.get('name')+ '.'+Cookies.get('employename')
+      this.imgUrl = 'http://tmrwatch.cn/wx/code?scene_str=tmrwatch.'+Cookies.get('name')+ '.'+Cookies.get('employename')
       console.log(this.imgUrl)
     }
   }