1

src/core/Scene.js

@@ -299,7 +299,7 @@ export default class Scene extends Mitt {
             console.log(`Width: ${offset}`);
             if (index === slides) {
               console.log("last");
-              that.emit("submitScreenshot", true);
+              that.emit("submitScreenshot", isSaveJpg);
               window.isExportScreenshot = false
             }
           }, index * 500);
@@ -311,7 +311,7 @@ export default class Scene extends Mitt {
         console.log("total", total);
         this.player.floorplanControls.reset();
         this.screenshot(-0.3, 227);
-        this.emit("submitScreenshot", true);
+        this.emit("submitScreenshot", isSaveJpg);
         window.isExportScreenshot = false
       }
     }

src/store/case.ts

@@ -268,7 +268,8 @@ export const getUrlSrc = (item, caseId) => {
     2: `/swkk/spg.html?m=${item.num}`,
     3: `/swss/index.html?m=${item.num}`,
     4: `/swkk/spg.html?m=${item.num}`,
-    5: `index.html?caseId=${caseId}&modelId=${item.num}#sign-model`,
+    5: `/spg.html?m=${item.num}`,
+    // 5: `index.html?caseId=${caseId}&modelId=${item.num}#sign-model`,
     6: `/swss/index.html?m=${item.num}`,
     7: `/swkk/spg.html?m=${item.num}`,
     99: `/code/index.html?caseId=${caseId}&single#/show`,

src/view/abstract/index.vue

@@ -364,7 +364,7 @@ const searchAMapAddress = async () => {
   console.log("searchAMapAddress", data);
   if (!data?.search) return;
   bindExample.value.caseAddress = data.search.text;
-  bindExample.value.latAndLong = `${data.search.lat},${data.search.lng}`;
+  bindExample.value.latAndLong = `${data.search.lng},${data.search.lat}`;
 };
 </script>
 <style lang="scss" scoped>

src/view/case/photos/index.vue

@@ -367,9 +367,9 @@ const handleSave = async () => {
 
     console.log("res", res);
     //TODO bugID: 48011 2024-11-13 17:59:15 隐藏自动导出
-    // if (newlist.value.length > 0) {
-    //   window.scene.exportScreenshot(false);
-    // }
+    if (newlist.value.length > 0 && !window.isExportScreenshot) {
+      window.scene.exportScreenshot(false);
+    }
     ElMessage.success("保存成功！");
   }
 };

src/view/originalPhoto/addCaseFile.vue

@@ -147,7 +147,7 @@ const handleExceed = (option) => {
 }
 
 const handleAdd = async () => {
-  let fileId =  await addCaseScenes({formats: props.fileInfo?.formats || [".jpg", ".jpeg", ".png", '.mp4']});
+  let fileId =  await addCaseScenes({formats: props.fileInfo?.formats || [".jpg", ".jpeg", ".png"]});
   mtkList.value = fileId.map(ele => {
     return {
       filesUrl: ele.fileUrl,
@@ -181,7 +181,7 @@ defineExpose<QuiskExpose>({
       throw "文件分类不能为空！";
     }
     let uploadId = file.value?.response?.data.id,
-    uploadIds = mtkList.value.map(ele => ele.id) || [];
+    uploadIds = mtkList.value.map(ele => ele.uploadId) || [];
     let params = { ...caseFile.value, file: file.value, filesTypeId: filesTypeId[0], uploadId, uploadIds };
     console.log('filesTypeId', params);
     await addByMediaLiBrary(params);

src/view/originalPhoto/addScenes.vue

@@ -1,8 +1,8 @@
 <template>
   <VRModelList :params="params">
     <template v-slot:header>
-      <el-form-item label="名称：" style="grid-area: 1 / 1 / 2 / 4">
-        <el-input v-model="params.keyword" placeholder="请输入" />
+      <el-form-item label="名称1：" style="grid-area: 1 / 1 / 2 / 4">
+        <el-input v-model="params.name" placeholder="请输入" />
       </el-form-item>
       <el-form-item label="分组：" style="grid-area: 1 / 1 / 2 / 4">
         <el-input v-model="params.keyword" placeholder="请输入" />

src/view/originalPhoto/pagging.ts

@@ -10,6 +10,7 @@ export const useScenePaggingParams = () => {
     paramsTemlate: {
       sceneName: "",
       modelTitle: "",
+      name: "",
       deptId: "",
       snCode: "",
       type: '1',