Просмотр исходного кода

refactor(frontend): 优化日志记录和拍摄流程

- 在 log.ts 中调整了日志记录的时机,增加了一个延迟
- 在 shot.vue 中优化了拍摄流程,移除了冗余的日志记录和监听器移除操作
- 重构了单张拍摄完成后的处理逻辑,提高了代码的可读性和维护性
panqiuyao 3 месяцев назад
Родитель
Сommit
89faf24b03
2 измененных файлов с 14 добавлено и 36 удалено
  1. 1 1
      frontend/src/utils/log.ts
  2. 13 35
      frontend/src/views/Photography/shot.vue

+ 1 - 1
frontend/src/utils/log.ts

@@ -153,7 +153,7 @@ export function log(router: any) {
       setLogInfo(this_to, {
         action: '进入' + this_to.meta.title,
         query: { ...to.query, ...to.params }
-      });
+      },1);
     }
   });
 

+ 13 - 35
frontend/src/views/Photography/shot.vue

@@ -572,7 +572,6 @@ const reTakePicture = async (img)=>{
     await clickLog({ describe: { action: '点击开始重拍', goods_art_no: img.goods_art_no } }, route)
 
 
-    clientStore.ipc.removeAllListeners(icpList.socket.message + '_digicam_take_picture');
     socketStore.sendMessage({
       type: 'smart_shooter_photo_take',
       "data":{"id":img.id,"goods_art_no":img.goods_art_no},
@@ -583,9 +582,6 @@ const reTakePicture = async (img)=>{
 
       runLoading.value = false;
       if(result.code === 0){
-
-
-       if(runAction.value.goods_art_no ) setLogInfo(route, { action: '单张拍摄完成', goods_art_no: runAction.value.goods_art_no });
         getPhotoRecords()
         setTimeout(()=>{
           showlastPhoto.value = false
@@ -597,7 +593,6 @@ const reTakePicture = async (img)=>{
         reNosObj.value.action = ''
         ElMessage.error(result.msg)
       }
-      clientStore.ipc.removeAllListeners(icpList.socket.message + '_smart_shooter_photo_take');
 
     })
   }
@@ -710,9 +705,6 @@ onMounted(async () => {
     console.log('_photo_take')
     console.log(result)
     if(result.status === 2 && result.msg.includes('执行完成')){
-      if(runAction.value.goods_art_no  ){
-        setLogInfo(route, { action: '单张拍摄完成', goods_art_no: runAction.value.goods_art_no });
-      }
       getPhotoRecords()
       // 延迟两秒再获取一遍数据
       setTimeout(()=>{
@@ -916,37 +908,23 @@ clientStore.ipc.on(icpList.socket.message+'_smart_shooter_photo_take', async (ev
   console.log('_smart_shooter_photo_take');
   console.log(result);
 
-  if( reNosObj.value.goods_art_no ){
-
 
-    setLogInfo(route, { action: '单张拍摄完成', goods_art_no: reNosObj.value.goods_art_no });
-
-    runLoading.value = false;
-    if(result.code === 0){
-      getPhotoRecords()
-      setTimeout(()=>{
-        showlastPhoto.value = false
-      },6000)
-    }else if(result.msg) {
-
-      runLoading.value = false;
-      reNosObj.value.goods_art_no = ''
-      reNosObj.value.action = ''
-      ElMessage.error(result.msg)
+  //
+  if(result.code === 0){
+    if(result.data.goods_art_no ) setLogInfo(route, { action: '单张拍摄完成', goods_art_no: result.data.goods_art_no });
+    if (smartShooterTimeout) {
+      clearTimeout(smartShooterTimeout);
     }
+    smartShooterTimeout = setTimeout(() => {
+      getPhotoRecords();
+    }, 2000);
+  }else if(result.msg) {
 
-  }else{
-
-    if(result.code === 0 && result.data?.photo_file_name){
-      if (smartShooterTimeout) {
-        clearTimeout(smartShooterTimeout);
-      }
-      smartShooterTimeout = setTimeout(() => {
-        getPhotoRecords();
-      }, 2000);
-    }
+    runLoading.value = false;
+    reNosObj.value.goods_art_no = ''
+    reNosObj.value.action = ''
+    ElMessage.error(result.msg)
   }
-
 })