Merge remote-tracking branch 'origin/dev-frontend'

frontend/src/views/Photography/shot.vue

@@ -172,27 +172,7 @@ const takePictureLoading = ref(false)
 const clientStore = client();
 
 const Router = useRouter()
-const goodsList = ref([{
-  goods_art_no:"110",
-  action_time:"110110110110110110110",
-  items:[
-    {
-      image_path:"C:\\Users\\Administrator\\Desktop\\174339173144067.png"
-    },
-    {
-      image_path:"C:\\Users\\Administrator\\Desktop\\微信图片_20250317091000.jpg"
-    },
-    {
-      image_path:"C:\\Users\\Administrator\\Desktop\\174339173144067.png"
-    },
-    {
-      image_path:"C:\\Users\\Administrator\\Desktop\\微信图片_20250317091000.jpg"
-    },
-    {
-      image_path:"C:\\Users\\Administrator\\Desktop\\174339173144067.png"
-    }
-  ]
-}])
+const goodsList = ref([])
 const  goods_art_no_tpl = ref('')
 const  goods_art_no = ref('')
 const runAction = ref({
@@ -335,6 +315,10 @@ onMounted(async () => {
     console.log(result)
     if(result.status === 2 && result.msg.includes('执行完成')){
       getPhotoRecords()
+      //延迟两秒在获取一遍
+      setTimeout(()=>{
+        getPhotoRecords()
+      },2000)
       takePictureLoading.value = false;
     }
 

package.json

@@ -62,7 +62,7 @@
     "ee-core": "2.12.0",
     "electron-updater": "5.3.0",
     "lodash": "4.17.21",
-    "node-window-manager": "^2.2.4",
+    "node-window-manager": "2.2.4",
     "ws": "8.18.1"
   }
 }