对接json

src/request/urls.ts

@@ -282,6 +282,7 @@ export const casePhotoRollList = "/fusion/casePhotoRoll/getByCaseId";
 export const getAllPhoto = "/fusion/casePhotoRoll/getAllPhoto";
 export const casePhotoRollUpdate = "/fusion/casePhotoRoll/addOrUpdate";
 export const casePhotoRolldel = "/fusion/casePhotoRoll/del";
+export const casePhotoRollgenImage = "/fusion/casePhotoRoll/genImage";
 
 const VITE_VIBE = import.meta.env.VITE_VIBE;
 let getTipss = "/s/api/gettips";

src/store/case.ts

@@ -58,6 +58,7 @@ import {
   getAllPhoto,
   casePhotoRollUpdate,
   casePhotoRolldel,
+  casePhotoRollgenImage,
 } from "@/request";
 import { router } from "@/router";
 import { ModelScene, QuoteScene, Scene, SceneType } from "./scene";
@@ -229,6 +230,8 @@ export const getAllPhotoList = async (filesTypeId): Promise<Scene[]> => {
 };
 export const casePhotoUpdate = (params) =>
   axios.post(casePhotoRollUpdate, params);
+export const casePhotoUpImage = (params) =>
+  axios.post(casePhotoRollgenImage, params);
 export const casePhotodel = (params) => {
   console.log(params)
   return  axios.post(casePhotoRolldel, params);

src/view/case/photos/canvas-photo-editor.js

@@ -1233,8 +1233,8 @@ resizePageAndReflow(pages, pageIndex, itemValue) {
   if(!pages[pageIndex]){
     pages[pageIndex] = {
       layoutMode: this.layoutMode, //页码布局类型
-      list:[itemValue.list],
-      item: [itemValue.item]
+      list:this.layoutMode != 'double'?[itemValue.list]:[itemValue.list, null],
+      item:this.layoutMode != 'double'?[itemValue.item]:[itemValue.item, null],
     }
     return pages
   }
@@ -1245,19 +1245,17 @@ resizePageAndReflow(pages, pageIndex, itemValue) {
   for (let i = pageIndex; i < pages.length; i++) {
     let lastList = pages[i].list.pop();
     let lastItem = pages[i].item.pop();
-    if(!pages[i + 1] && lastList != undefined){
+    if(!pages[i + 1]){
       pages[i + 1] = {
         layoutMode: this.layoutMode, //页码布局类型
-        list:[lastList],
-        item: [lastItem]
+        list:this.layoutMode != 'double'?[lastList]:[lastList, null],
+        item:this.layoutMode != 'double'?[lastItem]:[lastItem, null],
       }
       return pages;
     }
     console.log(lastList, 'pageslastList')
-    if (lastList != undefined) {
-      pages[i + 1].list.unshift(lastList);
-      pages[i + 1].item.unshift(lastItem);
-    }
+    pages[i + 1].list.unshift(lastList || null);
+    pages[i + 1].item.unshift(lastItem || null);
   }
   return pages;
 }

src/view/material/sceneImg.vue

@@ -526,6 +526,7 @@ import {
   updateByTreeFileLists,
   getByTreeFileLists,
   getCasePhotoRollList,
+  casePhotoUpImage,
   caseExportImg,
   overviewAdd,
   TabulationAdd,
@@ -1149,7 +1150,7 @@ async function handledrawCasePhotos(val) {
   });
   console.log("handleAdd");
 }
-async function frameLoad(sdk) {
+async function frameLoad(sdk, num) {
   // 这里可以获取到mesh方法
   const player = sdk.core.get("Player");
   sdk.Scene.on("loaded", () => {
@@ -1160,10 +1161,16 @@ async function frameLoad(sdk) {
     // }
   });
   console.log("--------frameLoad!---------");
-  const list = await sdk.Camera.routeSnapGenerate();
+  const jsonContent = await sdk.Camera.routeSnapGenerate();
   console.log("返回数据", list);
   const iframe = document.getElementById("iframe-outside");
   iframe?.classList.remove('show');
+  let res = await casePhotoUpImage({
+    caseId: caseId.value,
+    num,
+    jsonContent,
+  });
+  console.log("返回数据1", res);
   // sdk.Scene.whenLoaded(()=>{
   //     console.log("返回数据",sdk.Camera.getPose())
   // })
@@ -1181,7 +1188,7 @@ function handleAIdrawCasePhotos(num) {
     iframe.classList.add("show");
     iframe.onload = () => {
       console.log(iframe.contentWindow, "contentWindow");
-      frameLoad(iframe.contentWindow.__sdk);
+      frameLoad(iframe.contentWindow.__sdk, num);
     };
     iframe.src = "./model.html?m=" + num;
   }