1

src/store/caseFile.ts

@@ -76,6 +76,7 @@ export type SaveCaseFileImageInfo = Pick<CaseFile, "caseId" | "filesTitle"> & {
   imgType: BoardType;
   content: BoardData;
   file: File;
+  ognFileUrl?: string;
 };
 
 export const saveCaseFileImageInfo = async (props: SaveCaseFileImageInfo) =>
@@ -229,5 +230,6 @@ export type BoardShapeData =
 
 export interface BoardData {
   id: number;
+  ognFilesUrl: string | null;
   shapes: BoardShapeData[];
 }

src/view/case/draw/board/useBoard.ts

@@ -69,11 +69,12 @@ const getStore = async (caseId: number, fileId: number, type: BoardType) => {
   } else {
     const fileInfo = await getCaseFileImageInfo(fileId);
     if (fileInfo) {
-      console.log(fileInfo);
       data = {
         ...fileInfo.content,
+        ognFilesUrl: fileInfo.ognFilesUrl,
         id: fileInfo.filesId,
       };
+      console.log('fileInfo', fileInfo, data);
     } else {
       router.replace({ name: RouteName.caseFile, params: { caseId } });
       throw "该图不存在！";
@@ -118,7 +119,9 @@ export const useBoard = (props: Ref<BoardProps | null>) => {
       props.value.fileId,
       props.value.type
     );
+    console.log('store', store);
     const boardRaw = (board.value = await boardFactory(store, props.value.dom));
+    console.log('boardRaw', boardRaw);
     state.value.exixtsBgImage = !!(store as any).floors[0].bgImage
     onCleanup(() => {
       boardRaw && boardRaw.destroy();

src/view/case/draw/index.vue

@@ -65,6 +65,7 @@ const list = ref({
 });
 const fmtId = ref(0);
 const pmtId = ref(0);
+const ognFilesUrl = ref('')
 const dom = ref<HTMLCanvasElement>();
 const props = computed(() => {
   const route = router.currentRoute.value;
@@ -113,7 +114,10 @@ const trackImage = async () => {
     props.value!.type === BoardType.scene
       ? await selectFuseImage(props.value!)
       : await selectMapImage({});
-
+  console.log('户型图', data);
+  if (data?.ognFilesUrl) {
+    ognFilesUrl.value = data.ognFilesUrl;
+  }
   if (data?.blob) {
     setBackImage(data.blob);
     if ("taggings" in data) {
@@ -128,22 +132,24 @@ const trackImage = async () => {
 };
 
 const { board, state } = useBoard(props);
-
+console.log('board', board, state, props);
 // 获取通用数据
 const getStore = async () => {
   const store = await board.value!.getStore();
+  console.log('getStore', store, board.value, state.value);
   const titleShape = store.shapes.find(
     (shape: any) => shape.type === title
   ) as TitleShapeData;
-  return { store, titleShape };
+  return { store, titleShape, ognFilesUrl: store.ognFilesUrl };
 };
 
 //裁剪
 const handleCropping = async (data) => {
   const appStore = await getStore();
-  console.log('titleShape', appStore, board.value, state.value);
+  const args = props.value!;
+  console.log('titleShape', appStore, board.value, args);
   const {width, height } = appStore.store.floors?.[0].bgImage;
-  const blob = await fetch(state.value.selectShape.data.url).then(res => res.blob());
+  const blob = await fetch(appStore.store.ognFilesUrl || state.value.selectShape.data.url).then(res => res.blob());
   const cropBlob = await imageCropper({
       img: blob,
       fixed: [width, height]
@@ -168,6 +174,7 @@ const saveHandler = async () => {
     file: new File([blob], `${filesTitle}.jpg`),
     filesTitle: filesTitle,
     content: store && JSON.stringify(store),
+    ognFileUrl: ognFilesUrl.value || store.ognFilesUrl,
   };
   args.inAdd || (body.filesId = props.value!.fileId);
   const { data } = await uploadNewFile(body);

src/view/case/draw/selectFuseImage.vue

@@ -61,7 +61,7 @@ import { imageCropper } from "@/view/system/quisk";
 
 export type FuseImage = { blob: Blob | null; taggings: CaseTagging[] };
 const props = defineProps<{ caseId: number }>();
-
+const ognFilesUrl = ref<string | null>(null);
 const fuseUrl = computed(() => getQuery(props.caseId, true, true));
 
 const taggings = ref<CaseTagging[]>([]);
@@ -95,7 +95,9 @@ const refreshBlob = async () => {
   const width = Math.ceil(540 * scale);
   const height = Math.ceil(390 * scale);
   const fuseImage = await getFuseImage(iframeRef.value, width, height);
-
+  if(fuseImage?.ognFilesUrl) {
+    ognFilesUrl.value = fuseImage?.ognFilesUrl;
+  }
   if (fuseImage?.blob) {
     console.log('fuseImage', fuseImage?.blob);
     // const cropBlob = await imageCropper({
@@ -118,7 +120,7 @@ const refreshBlob = async () => {
 
 defineExpose<QuiskExpose>({
   submit() {
-    return { blob: imageBlob.value, taggings: selectTaggings.value };
+    return { blob: imageBlob.value, taggings: selectTaggings.value, ognFilesUrl: ognFilesUrl.value };
   },
 });
 

src/view/case/help.ts

@@ -187,6 +187,7 @@ export const getFuseImage = async (
 ) => {
   const typeMap = await getIframeSceneType(iframe);
   let blob: Blob | null = null;
+  let newUrl: string | null = null;
 
   switch (typeMap?.type) {
     case FuseImageType.FUSE:
@@ -199,19 +200,21 @@ export const getFuseImage = async (
       console.error("截图尺寸", width, height);
       if(typeMap.sdk.store?.getValue('metadata')?.floorPlanUser) {
         let num = typeMap.sdk.store?.getValue('metadata').num
+        newUrl = `/oss/scene_view_data/${num}/user/cad-style-3-${typeMap.sdk.Scene.floorId}.jpg`
        // /oss/scene_view_data/YZL-jm-3EOpLfZxim9/user/cad-style-3.jpg
-       let newBlob = await urlToBlob(`/oss/scene_view_data/${num}/user/cad-style-3.jpg`)
+       let newBlob = await urlToBlob(newUrl)
        blob = await imageCropper({
         img: newBlob,
         fixed: [width, height]
        })
        console.error("截图尺寸2", blob);
       } else {
-        const result = await typeMap.sdk.Camera.screenshot(
-          [{ width: width, height: height, name: "2k", bgOpacity: 0 }],
-          false
-        );
-        blob = base64ToBlob(result[0].data);
+        alert("暂未获取到平面图，请前往三维场景制作");
+        // const result = await typeMap.sdk.Camera.screenshot(
+        //   [{ width: width, height: height, name: "2k", bgOpacity: 0 }],
+        //   false
+        // );
+        // blob = base64ToBlob(result[0].data);
       }
      
       break;
@@ -225,7 +228,7 @@ export const getFuseImage = async (
       });
       break;
   }
-  return { type: typeMap?.type, blob };
+  return { type: typeMap?.type, blob, ognFilesUrl: newUrl };
 };
 
 // 处理fuse融合一起的图，将热点加入图片内