修改bug

src/constant/scene.ts

@@ -48,7 +48,7 @@ export const QuoteSceneStatusDesc: { [key in QuoteSceneStatus]: string } = {
   [QuoteSceneStatus.SUCCESS]: "计算成功",
   [QuoteSceneStatus.ARCHIVE]: "封存",
   [QuoteSceneStatus.QUEUE]: "排队中",
-  [QuoteSceneStatus.RERUN]: "重新计算中",
+  [QuoteSceneStatus.RERUN]: "计算中",//重新计算中
 };
 
 export const ModelSceneStatusDesc: { [key in ModelSceneStatus]: string } = {

src/view/case/newShare.vue

@@ -31,7 +31,7 @@
     <el-form-item label="查看权限">
       <el-radio-group class="view-perm" v-model="viewScope">
         <el-radio :label="'login'">仅登录用户可访问</el-radio>
-        <el-radio :label="'public'">公开且支持复制查看链接或加密链接分享</el-radio>
+        <el-radio :label="'public'">可通过分享链接和密码访问</el-radio>
       </el-radio-group>
     </el-form-item>
 

src/view/newFireCase/dyManager/index.vue

@@ -1,7 +1,7 @@
 <template>
   <List :params="params">
     <template v-slot:header>
-      <el-form-item label="所属架构：" v-if="params.pagging.state.query.searchType === '2'">
+      <el-form-item label="所属架构：" v-if="params.pagging.state.query.searchType != '0'">
         <com-select v-model="params.pagging.state.query.deptId" />
       </el-form-item>
       <el-form-item label="标题：">

src/view/newFireCase/dyManager/sceneContent.vue

@@ -46,9 +46,9 @@
         <span class="oper-span" v-if="row.status != 0 && row.status == 2 && row.isAuth == 2" v-pdpath="['edit']" @click="openSceneEdit(row, 0)">
           编辑
         </span>
-        <span v-pdpath="['gen']" v-if="pagging.state.query.searchType != '1' && row.status == 2 && row.location != 6" class="oper-span" @click="getMeshScene(row)">
+        <!-- <span v-pdpath="['gen']" v-if="pagging.state.query.searchType != '1' && row.status == 2 && row.location != 6" class="oper-span" @click="getMeshScene(row)">
           生成obj
-        </span>
+        </span> -->
         <span class="oper-span" v-pdpath="['del']" v-if="pagging.state.query.searchType === '0' && row.status == 2" @click="openSceneShareDialog(row)">
           权限
         </span>

src/view/newFireCase/dyManager/sceneDownload.vue

@@ -61,7 +61,7 @@ const stateTitle = {
 
 const params = {
   num: props.scene.num,
-  isObj: Number(![SceneType.SWSS, SceneType.SWYDSS].includes(props.scene.type)),
+  isObj: 1,
 };
 // 初始化
 const initial = async () => {

src/view/newFireCase/meshManager/index.vue

@@ -1,7 +1,7 @@
 <template>
   <List :params="params">
     <template v-slot:header>
-      <el-form-item label="所属架构：" v-if="params.pagging.state.query.searchType === '2'">
+      <el-form-item label="所属架构：" v-if="params.pagging.state.query.searchType != '0'">
         <com-select v-model="params.pagging.state.query.deptId" />
       </el-form-item>
       <el-form-item label="标题：">

src/view/newFireCase/meshManager/sceneContent.vue

@@ -101,9 +101,10 @@ const openSceneEdit = async (scene: QuoteScene, type: any) => {
   const token = await transformSWToken(scene, type);
   if (!token) return;
   let newUrl = SceneTypePaths[scene.type][1];
+  let returnurl = window.location.origin + window.location.pathname + '/#/login';
   // const isTest = window.location.host.includes("localhost") || window.location.host.includes("test");
   // const base = isTest ? "https://test.4dkankan.com" : "https://4dkankan.com";
-  window.open(`${newUrl}?m=${scene.num}&token=${token}`, "_blank");
+  window.open(`${newUrl}?m=${scene.num}&token=${token}&returnurl=${encodeURIComponent(returnurl)}`, "_blank");
 };
 
 // 权限弹窗：传递 num 和 isObj（由行数据或类型推断）

src/view/newFireCase/meshManager/sceneDownload.vue

@@ -60,7 +60,7 @@ const stateTitle = {
 
 const params = {
   num: props.scene.num,
-  isObj: Number(![SceneType.SWSS, SceneType.SWYDSS].includes(props.scene.type)),
+  isObj: 0,
 };
 // 初始化
 const initial = async () => {

src/view/newFireCase/mix3dManager/index.vue

@@ -1,7 +1,7 @@
 <template>
   <List :params="params">
     <template v-slot:header>
-      <el-form-item label="所属架构：" v-if="params.pagging.state.query.searchType === '2'">
+      <el-form-item label="所属架构：" v-if="params.pagging.state.query.searchType != '0'">
         <com-select v-model="params.pagging.state.query.deptId" />
       </el-form-item>
       <el-form-item label="标题：">

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

@@ -188,7 +188,7 @@ const handleImportClick = () => {
 };
 
 const onEdit = (scene: Scene) => {
-  window.open(`${url}/code/index.html?caseId=${scene?.fusionId}&fromRoute=${nowRouteName}&token=${user.value.token}#/fuseEdit/merge`, '_blank');
+  window.open(`${url}/code/index.html?caseId=${scene?.fusionId}&caseId2=${caseId.value}&fromRoute=${nowRouteName}&token=${user.value.token}#/fuseEdit/merge`, '_blank');
 };
 
 const onDelete = async (scene: any) => {

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

@@ -298,10 +298,11 @@ const onOpen = async (scene: Scene) => {
   const token = await transformSWToken(scene, type);
   if(!token) return;
   let newUrl = SceneTypePaths[scene.sceneType][1];
+  let returnurl = window.location.origin + window.location.pathname + '/#/login';
   if(window.location.host.includes('localhost') || window.location.host.includes('test')){
-    newUrl += `?m=${scene.num}&token=${token}`
+    newUrl += `?m=${scene.num}&token=${token}&returnurl=${encodeURIComponent(returnurl)}`
   } else {
-    newUrl += `?m=${scene.num}&token=${token}`
+    newUrl += `?m=${scene.num}&token=${token}&returnurl=${encodeURIComponent(returnurl)}`
   }
   window.open(newUrl, '_blank');
 };

src/view/newFireCase/newdispatch/index.vue

@@ -25,7 +25,7 @@
     <template v-slot:rowCtrl="{ row }: { row: Fire }">
       <template v-if="!isRecycle">
         <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" />
+        <MoreMenu :caseId="row.caseId" v-if="pagging.state.query.searchType !== '1'" :title="row.projectSn" :projectName="row.projectName" :searchType="pagging.state.query.searchType=='1'?'1':'0'" @copy="copy" />
         <span class="oper-span delete-oper" v-if="pagging.state.query.searchType !== '1'" @click="pagging.del(row)" v-pdpath="['del']">
           删除
         </span>