Forráskód Böngészése

mod:同步 调整

panqiuyao 7 hónapja
szülő
commit
69373ea841
1 módosított fájl, 17 hozzáadás és 6 törlés
  1. 17 6
      frontend/src/views/Photography/shot.vue

+ 17 - 6
frontend/src/views/Photography/shot.vue

@@ -552,6 +552,11 @@ onMounted(async () => {
         getPhotoRecords()
         getPhotoRecords()
       },3000)
       },3000)
       takePictureLoading.value = false;
       takePictureLoading.value = false;
+      return;
+    }
+    if(result.code !== 0  && result.msg){
+      ElMessage.error(result.msg)
+      takePictureLoading.value = false;
     }
     }
 
 
   })
   })
@@ -593,15 +598,18 @@ onMounted(async () => {
 
 
       ElMessage.success('正在拍摄中,请稍候')
       ElMessage.success('正在拍摄中,请稍候')
 
 
+      takePictureLoading.value = true;
+/*      setTimeout(()=>{
+        takePictureLoading.value = false;
+      },3000)*/
       await socketStore.connectSocket();
       await socketStore.connectSocket();
       socketStore.sendMessage(result.data)
       socketStore.sendMessage(result.data)
-      takePictureLoading.value = true;
 
 
-      getPhotoRecords()
-      // 延迟两秒再获取一遍数据
-      setTimeout(()=>{
-        getPhotoRecords()
-      },3000)
+           getPhotoRecords()
+         // 延迟两秒再获取一遍数据
+         setTimeout(()=>{
+           getPhotoRecords()
+         },3000)
 
 
     }
     }
 
 
@@ -732,6 +740,9 @@ clientStore.ipc.on(icpList.socket.message + '_run_mcu_update', (event, result) =
             console.log(item);
             console.log(item);
             item.items[result.data.image_index].PhotoRecord.image_path = result.data?.file_path
             item.items[result.data.image_index].PhotoRecord.image_path = result.data?.file_path
             result.data.action_name =  item.items[result.data.image_index].action_name
             result.data.action_name =  item.items[result.data.image_index].action_name
+            setTimeout(()=>{
+              item.items[result.data.image_index].PhotoRecord.image_path = result.data?.file_path
+            },1000)
             console.log(item);
             console.log(item);
             console.log( goodsList.value);
             console.log( goodsList.value);
           }
           }