修改bug

src/app/map/App.vue

@@ -145,8 +145,9 @@ const getQuery = (
   share: boolean = false,
   single: boolean = false
 ) =>
-  `${getFuseCodeLink(caseId, true)}${share ? "&share=1" : ""}${single ? "&single=1" : ""
-  }#show/summary`;
+`./#/fireDetails/${caseId}?editOrShow=show&fromRoute=fire`
+  // `${getFuseCodeLink(caseId, true)}${share ? "&share=1" : ""}${single ? "&single=1" : ""
+  // }#show/summary`;
 
 const request = axios.create({
   baseURL: "",

src/view/camera/index.vue

@@ -1,7 +1,7 @@
 <template>
   <com-head :options="[{ name: '相机管理', value: '2' }]">
     <el-form label-width="97px" inline>
-      <el-form-item label="所属架构：">
+      <el-form-item label="所属架构：" v-if="canShowAll">
         <com-select v-model="state.query.deptId" />
       </el-form-item>
       <el-form-item label="S/N码：">

src/view/case/newShare.vue

@@ -13,7 +13,7 @@
         <span>上级组织共享权限</span>
       </template>
       <div class="org-share-row">
-        <el-select v-model="selectedParentId" placeholder="上级组织名称">
+        <el-select v-model="selectedParentId" :disabled="orgSharePerm == 'none'" placeholder="上级组织名称">
           <el-option v-for="item in organTrees" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </div>
@@ -77,10 +77,14 @@ const copyPublicShare = async () => {
   //   ElMessage.error("请选择上级组织");
   //   return;
   // }
+    const shareAuthVal = viewScope.value === "login" ? 0 : 1;
     if(selectedParentId.value){
       await handleConfirm(true);
     }
-  await (shareRef.value as any)?.submit();
+    if(!shareAuthVal){
+      await (shareRef.value as any)?.submit();
+    }
+  // await (shareRef.value as any)?.submit();
 };
 function generateFourDigitString() {
   // 生成 0 ~ 9999 的随机整数

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

@@ -314,10 +314,11 @@ const onSelectionChange = (rows: any[]) => {
 const onConfirmEdit = async () => {
   try {
     if (!caseId.value) return;
+    const scenesId = scenes.value.map(ele => ele.fusionId)
     const fusionIds = (selectedRows.value || [])
       .map((r: any) => r?.fusionId)
       .filter((v: any) => v !== undefined && v !== null);
-    await addMix3dFusionIds({ caseId: caseId.value, fusionIds });
+    await addMix3dFusionIds({ caseId: caseId.value, fusionIds: [...scenesId, ...fusionIds] });
     // 刷新案件已关联的融合列表
     scenes.value = (await getFusionAndSceneList({ caseId: caseId.value, type: 'fusion' })) as unknown as Scene[];
     if (!activeId.value) {

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

@@ -1444,6 +1444,9 @@ watch(caseId, () => { loadListsFromTree(); loadAlbum(); });
       position: relative;
       border-radius: 4px;
       padding: 24px 48px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
       cursor: pointer;
       &.active {
         background: var(--el-menu-hover-bg-color);

src/view/newFireCase/newdispatch/header.vue

@@ -26,7 +26,7 @@
         ></el-cascader>
       </el-form-item>
 
-      <el-form-item label="承办单位：" v-show="canShowAll || pagging.state.query.searchType == 1">
+      <el-form-item label="承办单位：">
         <com-company :currentId="deptId == 0 ? '' : deptId" v-model="pagging.state.query.deptId" />
       </el-form-item>
       <el-form-item label="事故日期：">

src/view/newFireCase/newdispatch/index.vue

@@ -24,7 +24,7 @@
 
     <template v-slot:rowCtrl="{ row }: { row: Fire }">
       <template v-if="!isRecycle">
-        <EditMenuToDetail :caseId="row.caseId" :fromRoute="appId" :row="row"></EditMenuToDetail>
+        <EditMenuToDetail v-if="row.isAuth == 2" :caseId="row.caseId" :fromRoute="appId" :row="row"></EditMenuToDetail>
         <MoreMenu :caseId="row.caseId" v-if="pagging.state.query.searchType !== '1'" :title="row.projectSn" :projectName="row.projectName" :searchType="pagging.state.query.searchType" @copy="copy" />
         <span class="oper-span delete-oper" v-if="pagging.state.query.searchType !== '1'" @click="pagging.del(row)" v-pdpath="['del']">
           删除