tangning 1 неделя назад
Родитель
Сommit
75aa264e2e

+ 5 - 3
src/view/case/newphotos/index.vue

@@ -274,8 +274,10 @@ const renderCanvas = () => {
               const query = { ...current.query, editSub: 'photoEdit' };
               console.log("submitMergePhotos1", query.parentId, data.id, route);
               if(!query.parentId){//新的照片制卷
+                handleAutoSave(data.id);
                 vueRouter.replace({ path: route.path, params:route.params, query: {...query, imgId: data.id, parentId: data.id} });
                 console.log("submitMergePhotos2", { path: route.path, params:route.params, query: {...query, imgId: data.id, parentId: data.id} });
+              
               }
               // debugger;
               // saveAs(data.imgUrl, title);
@@ -367,7 +369,7 @@ const handleSave = async () => {
   if (window.scene) {
     const data = scene.player.getDrawData();
     scene.player.syncDrawData();
-    console.log("data", data);
+    console.log("data", newlist.value);
     const imgId = typeof route.query.imgId === 'string' ? Number(route.query.imgId) : undefined;
     const res = await saveCaseImgTagData({
       caseId: caseId.value,
@@ -389,14 +391,14 @@ const handleSave = async () => {
   }
 };
 
-const handleAutoSave = async () => {
+const handleAutoSave = async (id) => {
   if (window.scene) {
     const data = scene.player.getDrawData();
     scene.player.syncDrawData();
     const imgId = typeof route.query.imgId === 'string' ? Number(route.query.imgId) : undefined;
     await saveCaseImgTagData({
       caseId: caseId.value,
-      imgId,
+      imgId: id || imgId,
       data: data,
       isHorizontal: !sortType.value,
     });

+ 9 - 8
src/view/newFireCase/newFireDetails/photoEdit.vue

@@ -59,14 +59,15 @@ const handleSave = async () => {
     // 保存当前标注数据
     const data = scene.player.getDrawData();
     scene.player.syncDrawData();
-    await saveCaseImgTagData({
-      caseId: caseId.value!,
-      id: tagId.value,
-      imgId: imgId.value,
-      data,
-      isHorizontal: isHorizontal.value,
-    });
-
+    if(imgId.value){
+      await saveCaseImgTagData({
+        caseId: caseId.value!,
+        id: tagId.value,
+        imgId: imgId.value,
+        data,
+        isHorizontal: isHorizontal.value,
+      });
+    }
     // 与 index.vue 保持一致:自动导出并保存合并图片,不打开新窗口
     if ((window as any).scene && !(window as any).isExportScreenshot) {
       (window as any).scene.exportScreenshot(true);