bugfix

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

@@ -54,7 +54,7 @@ const vueRouter = useRouter();
 const typeName = computed(() => {
   let type = route.query.type as string || route.query.editSub as string;
   if (type === 'inquest') return '勘验笔录';
-  else if (type === 'extraction') return '提取笔录';
+  else if (type === 'extraction') return '提取清单';
   else if (type === 'photoEdit') return '照片制卷';
   return '编辑';
 });

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

@@ -139,7 +139,7 @@ const scenes = ref<Scene[]>([]);
 const hoverId = ref<string>('');
 
 const activeId = ref<string>('');
-const props = defineProps<{ fire?: any, caseId?: number, editOrShow?: string }>();
+const props = defineProps<{ fire?: any, caseId?: number, fromRoute?: string, editOrShow?: string }>();
 const activeScene = computed(() => {
   return scenes.value.find((s: any) => String(s?.fusionId) === activeId.value) || null;
 });
@@ -174,7 +174,7 @@ const handleImportClick = () => {
 };
 
 const onEdit = (scene: Scene) => {
-  window.open(`${url}/code/index.html?caseId=${scene?.fusionId}&token=${user.value.token}#/fuseEdit/merge`, '_blank');
+  window.open(`${url}/code/index.html?caseId=${scene?.fusionId}&fromRoute=${import.meta.env.VITE_APP_APP}&token=${user.value.token}#/fuseEdit/merge`, '_blank');
 };
 
 const onDelete = async (scene: any) => {

src/view/newFireCase/newFireDetails/editIndex.vue

@@ -21,7 +21,7 @@
       <Scene :fire="tempFire" :caseId="caseId" :editOrShow="'edit'" />
     </template>
     <template v-if="currentMenuKey === 'mix3d'">
-      <Mix3d :fire="tempFire" :caseId="caseId" :editOrShow="'edit'" />
+      <Mix3d :fire="tempFire" :caseId="caseId" :fromRoute="fromRoute" :editOrShow="'edit'" />
     </template>
     <template v-if="currentMenuKey === 'siteInspection'">
       <SiteInspection :fire="tempFire" :caseId="caseId" :editOrShow="'edit'" />

src/view/newFireCase/newFireDetails/showIndex.vue

@@ -2,7 +2,7 @@
   <div class="new-fire-details">
     <el-menu :default-active="currentMenuKey" mode="horizontal" class="menu-vertical">
       <el-menu-item 
-        v-for="menu in preview === 'abstract' ? menusAbstract : menus" 
+        v-for="menu in menus" 
         :key="menu.key"
         :index="menu.key"
         @click="handleMenuClick(menu)"

src/view/user/edit.vue

@@ -132,6 +132,7 @@ defineExpose<QuiskExpose>({
     } else {
       await setUser(bindUser.value, deptPath.value);
     }
+    return true as any;
   },
 });
 </script>