Merge branch 'master' of http://gitlab.pubdata.cn/liangyibo/CameraMachine

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>
 
@@ -204,6 +212,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";
@@ -538,7 +547,10 @@ const reTakePicture = async (img)=>{
   async function this_re_take_picture(){
 
     await ElMessageBox.alert('已复位到该视图下,请把鞋子摆放完毕之后，点击按钮开始重拍', '提示',{
-      confirmButtonText:"开始重拍"
+      confirmButtonText:"开始重拍",
+      showClose:false,
+      closeOnClickModal:false,
+      closeOnPressEscape:false
     })
 
 
@@ -554,11 +566,6 @@ const reTakePicture = async (img)=>{
       runLoading.value = false;
       if(result.code === 0){
         getPhotoRecords()
-
-
-        runLoading.value = false;
-        reNosObj.value.goods_art_no = ''
-        reNosObj.value.action = ''
         setTimeout(()=>{
           showlastPhoto.value = false
         },6000)
@@ -577,6 +584,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,
@@ -693,16 +708,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()
   })
 
 
@@ -870,24 +880,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);
 
-            runLoading.value = false;
-            reNosObj.value.goods_art_no = ''
-            reNosObj.value.action = ''
+            setTimeout(()=>{
+              showlastPhoto.value = false
+            },5000)
           }
         })
        // getPhotoRecords()
@@ -900,6 +906,8 @@ clientStore.ipc.on(icpList.socket.message + '_run_mcu_update', (event, result) =
   }else if(result.msg) {
     ElMessage.error(result.msg)
   }
+
+  resetStatus()
 })
 
 

frontend/src/views/RemoteControl/index.vue

@@ -15,26 +15,15 @@
       <el-col :span="3"></el-col>
     </el-row>
     <el-row align="middle">
-      <el-col :span="9"></el-col>
+      <el-col :span="6"></el-col>
       <el-col :span="6">
-        <el-col :span="6">
-          <div class="button up" @click.native="switchLED(1)"  @contextmenu.native="switchLED(0)">LED</div>
-        </el-col>
-<!--          <el-dropdown>
-
-
-            <div class="button up">
-              LED
-            </div>
-            <template #dropdown>
-              <el-dropdown-menu>
-                <el-dropdown-item @click.native="switchLED(1)">开</el-dropdown-item>
-                <el-dropdown-item @click.native="switchLED(0)">关</el-dropdown-item>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>-->
+        <div class="button up" @click.native="switchLED(1)" >LED开</div>
       </el-col>
-      <el-col :span="9"></el-col>
+      <el-col :span="1"></el-col>
+      <el-col :span="6">
+        <div class="button up" @click.native="switchLED(0)">LED关</div>
+      </el-col>
+      <el-col :span="4"></el-col>
     </el-row>
     <div class="te-c  fs-14"  style="color: #8C92A7">左脚控制左脚鞋启动拍摄</div>
     <div class="te-c  fs-14"  style="color: #8C92A7">右脚控制右脚鞋启动拍摄</div>