Merge remote-tracking branch 'origin/dev-frontend_0701' into dev-frontend_0702

frontend/src/views/Photography/detail.vue

@@ -395,6 +395,16 @@ const generate = async function () {
   clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);
   clientStore.ipc.send(icpList.generate.generatePhotoDetail, params);
   clientStore.ipc.on(icpList.generate.generatePhotoDetail, (event, result) => {
+    if(result.code !== 0 ){
+     if(result.msg){
+       handleFail(result.msg)
+       message.value = 'result.msg'
+     }
+      progress.value = 0
+      loadingDialogVisible.value = false
+      return;
+    }
+
     console.log('result', result)
     requesting.value =  true
     clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);

frontend/src/views/Photography/shot.vue

@@ -66,7 +66,15 @@
         </div>
 
         <div class="last-photo" v-show="showlastPhoto" v-key="lastPhoto.file_path">
-          <div>{{lastPhoto.action_name || ''}}</div>
+          <div class="flex between">
+            <div></div>
+            <div class="flex-item">{{ lastPhoto.action_name || '' }}</div>
+            <div class="cu-p">
+              <el-icon style="color: #000" @click="showlastPhoto = false" class="close-icon">
+                <Close/>
+              </el-icon>
+            </div>
+          </div>
           <el-image  :src="getFilePath(lastPhoto.file_path)"  fit="contain" ></el-image>
         </div>
 
@@ -205,6 +213,7 @@ import  generate from '@/utils/menus/generate'
 const loading = ref(false)
 const runLoading = ref(false)
 const takePictureLoading = ref(false)
+import { Close } from '@element-plus/icons-vue'
 
 
 import useUserInfo from "@/stores/modules/user";
@@ -576,6 +585,14 @@ const reTakePicture = async (img)=>{
 
 }
 
+const resetStatus = ()=>{
+  runLoading.value = false;
+  reNosObj.value.goods_art_no = ''
+  reNosObj.value.action = ''
+  runAction.value.goods_art_no = '';
+  runAction.value.action = '';
+}
+
 const reNosObj = ref({
   goods_art_no:null,
   action:null,
@@ -692,16 +709,11 @@ onMounted(async () => {
 
   })
 
-
   // 监听一键停止结束
   clientStore.ipc.on(icpList.socket.message + '_run_mcu_stop', (event, result) => {
     console.log('_run_mcu_stop')
 
-    runLoading.value = false;
-    reNosObj.value.goods_art_no = ''
-    reNosObj.value.action = ''
-    runAction.value.goods_art_no = '';
-    runAction.value.action = '';
+    resetStatus()
   })
 
 
@@ -908,20 +920,20 @@ clientStore.ipc.on(icpList.socket.message + '_run_mcu_update', (event, result) =
   if(result.code === 0){
     if(result.data?.file_path){
       if(  lastPhoto.value?.file_path == result.data?.file_path) return;
-
-      if(runAction.value.goods_art_no === result.data?.goods_art_no){
+      let goods_art_no =  runAction.value.goods_art_no ||  reNosObj.value.goods_art_no
+      if(goods_art_no === result.data?.goods_art_no){
         showlastPhoto.value = true
         goodsList.value.map(item=>{
           if(item.goods_art_no === result.data?.goods_art_no){
-            console.log('========item');
-            console.log(item);
             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
             setTimeout(()=>{
               item.items[result.data.image_index].PhotoRecord.image_path = result.data?.file_path
             },1000)
-            console.log(item);
-            console.log( goodsList.value);
+
+            setTimeout(()=>{
+              showlastPhoto.value = false
+            },5000)
           }
         })
        // getPhotoRecords()
@@ -934,6 +946,9 @@ clientStore.ipc.on(icpList.socket.message + '_run_mcu_update', (event, result) =
   }else if(result.msg) {
     ElMessage.error(result.msg)
   }
+  if(reNosObj.value.goods_art_no){
+    resetStatus()
+  }
 })