修改bug

src/util/file-serve.ts

@@ -104,7 +104,8 @@ export const saveAs: SaveAs =
           // }
           return click(a);
         } else {
-          a.href = URL.createObjectURL(blob);
+          console.log('URL.createObjectURL', blob);
+          a.href = URL.createObjectURL(blob?.data || blob);
           setTimeout(function () {
             URL.revokeObjectURL(a.href);
           }, 4e4); // 40s

src/view/case/newphotos/index.vue

@@ -66,7 +66,7 @@
 
 <script setup>
 import { onMounted, ref, computed, onUnmounted, reactive } from "vue";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from 'vue-router';
 import { Menu, FullScreen } from "@element-plus/icons-vue";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import "swiper/css";
@@ -77,6 +77,7 @@ import {
   getCaseImgTagData,
   submitMergePhotos,
 } from "@/store/case";
+import { RouteName, router } from "@/router";
 import Scene from "@/core/Scene.js";
 import draggable from "./draggable.vue";
 import edit from "./edit.vue";
@@ -85,6 +86,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 
 const props = defineProps({ caseId: Number, title: String });
 const route = useRoute();
+const vueRouter = useRouter();
 
 const editing = ref({
   show: false,
@@ -262,11 +264,18 @@ const renderCanvas = () => {
       setTimeout(async () => {
         try {
           const res = await submitMergePhotos(params);
-          console.log("res", res);
           const { data, code } = res;
+          console.log("submitMergePhotos1", data, save);
           const title = `${props.title}-照片卷.jpg`;
           if (data && data.imgUrl) {
             if (save) {
+              const current = router.currentRoute.value;
+              const query = { ...current.query, editSub: 'photoEdit' };
+              console.log("submitMergePhotos1", query.parentId, data.id, route);
+              if(!query.parentId){//新的照片制卷
+                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);
             } else {

src/view/case/photos/index.vue

@@ -261,7 +261,7 @@ const renderCanvas = () => {
       setTimeout(async () => {
         try {
           const res = await submitMergePhotos(params);
-          console.log("res", res);
+          console.log("submitMergePhotos2", res);
           const { data, code } = res;
           const title = `${props.title}-照片卷.jpg`;
           if (data && data.imgUrl) {

src/view/newFireCase/newFireDetails/components/siteInspection.vue

@@ -185,7 +185,7 @@
                   :class="['record-item', { active: selectedExtractId === rec.id }]"
                   @click="selectExtraction(rec)"
                 >
-                  <span class="name">{{ rec.title }}</span>
+                  <span class="name">{{ rec.createType == 'upload' ? rec.filesTitle : rec.title }}</span>
                   <div class="header-actions" v-if="editOrShow === 'edit'">
                     <el-tooltip content="下载" placement="top">
                       <span class="action-icon" @click="downloadSelected(rec)">
@@ -227,7 +227,7 @@
                   :class="['record-item', { active: selectedAlbumIndex === idx }]"
                   @click="selectAlbum(idx)"
                 >
-                  <span class="name">{{ alb.title }}</span>
+                  <span class="name">{{ alb.createType == 'upload' ? alb.filesTitle : alb.title }}</span>
                   <div class="header-actions" v-if="editOrShow === 'edit'">
                     <el-tooltip content="下载" placement="top">
                       <span class="action-icon" @click="downloadSelected(alb)">
@@ -258,7 +258,7 @@
         <!-- 现场图右侧：图片查看器 -->
         <template v-if="activeTab === 'scene'">
           <div v-if="currentSceneImageUrl" class="scene-image" @click="showViewer = true">
-            <el-image :src="currentSceneImageUrl" loading="lazy" fit="contain" class="inline-image" />
+            <el-image :src="currentSceneImageUrl + '?x-oss-process=image/quality,q_80'" loading="eager" fit="contain" class="inline-image" />
             <!-- <div class="click-tip">点击图片放大</div> -->
           </div>
           <div class="viewer-placeholder" v-else>暂无数据</div>

src/view/newFireCase/newFireDetails/index.vue

@@ -306,13 +306,15 @@ const saveEditSub = async () => {
   }
   try {
     const ok = await comp.handleSave();
+    // console.log(ok, 'handleSave', editFilePageRef.value)
     if (ok) {
       ElMessage.success('保存成功');
-      // const newQuery: any = { ...route.query };
+      // const newQuery: any = { ...route.query, imgId: ok.id, parentId: ok.id };
+      // imgId=683&parentId=683
       // delete newQuery.editSub;
       // delete newQuery.type;
       // delete newQuery.presetKey;
-      // vueRouter.replace({ path: route.path, query: newQuery });
+      // vueRouter.replace({ path: route.path, params:route.params, query: newQuery });
     }
   } catch (e) {
     console.error('保存失败', e);