Browse Source

修改多元融合跳转

wangfumin 2 months ago
parent
commit
b9bc3143b9
1 changed files with 4 additions and 12 deletions
  1. 4 12
      src/view/newFireCase/newFireDetails/components/mix3d.vue

+ 4 - 12
src/view/newFireCase/newFireDetails/components/mix3d.vue

@@ -34,15 +34,11 @@
               <el-tooltip content="删除">
                 <el-icon class="act" :size="18" @click.stop="onDelete(item)"><Delete /></el-icon>
               </el-tooltip>
-              <el-tooltip content="全屏">
-                <el-icon class="act" :size="18" @click.stop="onFullscreen()"><FullScreen /></el-icon>
-              </el-tooltip>
             </div>
           </el-menu-item>
         </el-menu>
       </div>
-     <div class="right-bar" :class="{ fullscreen: isFullscreen }">
-        <div class="exit-full" v-if="isFullscreen" @click="isFullscreen = false">退出全屏</div>
+     <div class="right-bar">
         <div class="iframe-container">
           <iframe :key="activeNum" :src="`${url}/code/index.html?caseId=${activeScene?.fusionId}&pure=1&token=${user?.token}#/show/summary`" width="96%" height="96%" frameborder="0"></iframe>
       </div>
@@ -160,7 +156,7 @@ const handleImportClick = () => {
 };
 
 const onEdit = (scene: Scene) => {
-  editingScene.value = scene;
+  window.open(`${url}/code/index.html?caseId=${scene?.fusionId}&token=${user.value.token}#/fuseEdit/merge`, '_blank');
 };
 
 const onDelete = async (scene: any) => {
@@ -183,10 +179,6 @@ const onDelete = async (scene: any) => {
   }
 };
 
-const onFullscreen = () => {
-  isFullscreen.value = true;
-};
-
 const onSelect = (index: string) => {
   activeId.value = index;
 };
@@ -405,7 +397,7 @@ onMounted(async () => {
         }
         .actions{
           position: absolute;
-          right: 0;
+          right: 20px;
           bottom: 26px;
           display: flex;
           align-items: center;
@@ -414,7 +406,7 @@ onMounted(async () => {
           color: rgba(0,0,0,0.85);
           transition: opacity .2s ease;
         }
-        &:hover{
+        &.is-active{
           .actions{ opacity: 1; }
         }
         .act{