fix优化日志，对刀仪界面优化

imcs-ui/src/api/modelingCenter/cutterTestData.js

@@ -57,6 +57,11 @@ const apiList = {
     method: 'POST',
     url: `/authority/toolTask/page`
   },
+  getCutterByRfid: {
+    method: 'POST',
+    url: `/authority/cutterTestData/getCutterByRfid`
+  },
+  
 }
 
 export default {
@@ -170,5 +175,12 @@ export default {
       data
     })
   },
+  getCutterByRfid(data) {
+    return axiosApi({
+      ...apiList.getCutterByRfid,
+      data
+    })
+  },
+
 
 }

imcs-ui/src/views/zuihou/centralToolMagazine/cutterTestData/Index.vue

@@ -559,15 +559,17 @@
 	      }
 	    },
 		openDrawerWin (){
-			console.log("=====");
+			console.log("打开弹框");
 			this.drawerVisible = true;
+			this.$refs.cutterTtestCourseRef.startTimer();
 		},
 		cutterTtestClose(){
-
+			console.log("关闭弹框")
+			this.$refs.cutterTtestCourseRef.stopTimer();
 		},
 		cutterTtestSuccess(){
 
-		},
+		}
 		
 	  }
 	}

imcs-ui/src/views/zuihou/centralToolMagazine/cutterTestData/components/CutterTestCourse.vue

@@ -37,58 +37,18 @@
           </el-col>
           <el-col :span="10">
             <el-col :span="24">
-              <span>对刀比对数据</span>
+              <span>刀具参数对比数据</span>
             </el-col>
             <el-col :span="24" style="margin-top: 15px;">
               <span >
                 <span>刀具类型：</span>
-                <el-select v-model="queryParams.model.cutterTyp" clearable >
-                  <el-option
-                    v-for="item in cutterTypList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-              </span>
-            </el-col>
-            <el-col :span="24" style="margin-top: 15px;">
-              <span >
-                <span>刀具类型：</span>
-                <el-select v-model="queryParams.model.cutterTyp" clearable >
-                  <el-option
-                    v-for="item in cutterTypList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-              </span>
-            </el-col>
-            <el-col :span="24" style="margin-top: 15px;">
-              <span >
-                <span>刀具类型：</span>
-                <el-select v-model="queryParams.model.cutterTyp" clearable >
-                  <el-option
-                    v-for="item in cutterTypList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-              </span>
-            </el-col>
-            <el-col :span="24" style="margin-top: 15px;">
-              <span >
-                <span>刀具类型：</span>
-                <el-select v-model="queryParams.model.cutterTyp" clearable >
-                  <el-option
-                    v-for="item in cutterTypList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+                <el-input
+                  type="textarea"
+                  :cols="10"
+                  :rows="6" 
+                  :disabled="true"
+                  v-model="parameterControl.toolSetToCheckParameter">
+                </el-input>
               </span>
             </el-col>
             <el-col :span="24" style="margin-top: 15px;">
@@ -131,6 +91,9 @@
 <script>
 import { initDicts, initQueryParams } from '@/utils/commons'
 
+// 读取机外对刀仪数据获取对刀仪参数
+import classScheduleMgrApi from "@/api/modelingCenter/cutterTestData"
+
 export default {
   name: "DrawerComponent",
   props: {
@@ -237,6 +200,10 @@ export default {
           label: '修磨刀'
         }],
       queryParams: initQueryParams({}),
+      isReadError: false, 
+      parameterControl:{
+        toolSetToCheckParameter : ''
+      }
     };
   },
   watch: {
@@ -253,9 +220,41 @@ export default {
       this.$emit('closed');
     },
     modifyPicture(){
+    },
+    // 开启定时
+    startTimer() {
+			this.intervalId = setInterval(this.timerFunction, 2000);
+		},
+    // 关闭定时
+		stopTimer() {
+			if (this.intervalId) {
+				clearInterval(this.intervalId);
+				this.intervalId = null;
+			}
+		},
+    // 定时的方法体
+		timerFunction() {
+			console.log('根据刀具类型，查询需要比对的参数');
+      classScheduleMgrApi.getCutterByRfid({ }).then(response => {
+	        if (response.status == 200) {
+	          this.isReadError = false;
+            console.log(response.data.data)
+            var datada = response.data.data;
+            this.parameterControl.toolSetToCheckParameter = datada.toolSetToCheckParameter
+	       
+	        }else {
+            if(this.isReadError == false){
+              this.$message({
+                message: response.msg,
+                type: "error"
+              })
+            }
+            this.isReadError = true;
+          }
+	      });
+		}
 
-    }
-  },
+  }, 
 }
 </script>
 

imcs-ui/src/views/zuihou/dispatchMgr/productLineInfo/Index.vue

@@ -18,6 +18,7 @@
             style="width: 100%;"
           >
             <el-table-column prop="orderName" label='订单名称'  width="160px" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="completeBatchNo" label='同一零件批次'  width="140px"  show-overflow-tooltip> </el-table-column>
             <el-table-column prop="uniqueCode" label='零件编码'  width="140px"  show-overflow-tooltip> </el-table-column>
             <el-table-column prop="taskNodeName" label='任务名称'  width="180px"> </el-table-column>
             <el-table-column prop="startStorge" label='开始点位'  width="180px"> </el-table-column>