人生啊人生 3 viikkoa sitten
vanhempi
säilyke
4d4b5a2608

+ 11 - 0
user_web/src/view/student/components/navMenus.vue

@@ -6,6 +6,7 @@
         :title="(courseChapter3dShow().show.screenBool == false ? '全屏' : '退出全屏')"></div>
         <div class="nav-item help" title="帮助"></div>
         <div v-if="!showLogout" class="nav-item back" title="返回" @click="backConfirm"></div>
+        <div v-if="returnMain == true" class="nav-item back" title="返回首页" @click="returnMainEvnet"></div>
         <div v-if="showLogout" class="nav-item logout" @click="logout" title="退出"></div>
     </div>
     <el-dialog v-model="mainContainer.isBlur" width="80%" :show-close="false" :align-center="true" :append-to-body="true" modal-class="back-tips" :close-on-click-modal="false">
@@ -23,6 +24,8 @@ import { reactive, inject } from 'vue';
 import { useUserInfo } from '@/stores/userInfo';
 import { courseChapter3dShow } from '@/stores/courseChapter3dShow';
 import router from '@/router/index';
+import { useRouter } from 'vue-router';
+const routerNew = useRouter();
 
 const mainContainer: anyObj = inject('mainContainer') ?? reactive({ isBlur: false });
 interface Props {
@@ -30,10 +33,12 @@ interface Props {
     backPath?: string;
     backConfirm?: boolean;
     confirmCnt?: string;
+    returnMain? : boolean;
 }
 const props = withDefaults(defineProps<Props>(), {
     backPath: '',
     showLogout: false,
+    returnMain: false,
     backConfirm: true,
     confirmCnt: '实验尚未完成,部分章节将重新开始,<br />是否返回任务首页?',
 });
@@ -90,6 +95,12 @@ const exitFullscreen = () => {
         de.webkitCancelFullScreen();
     }
 }
+
+// 返回首页
+const returnMainEvnet = () => {
+    routerNew.push('/studentMain');
+}
+
 </script>
 <style lang="scss" scoped>
 .nav-container {

+ 6 - 3
user_web/src/view/student/main/Main.vue

@@ -79,17 +79,20 @@ const menuListEvent = (json, index) => {
 
         case "声纳检测实训":
             // window.open('#/Sonar', '_blank');
-            window.open('#/train/list', '_blank');
+            // window.open('#/train/list', '_blank');
+            router.push('/train/list');
             break;
 
         case "CCTV检测实训":
             // window.open('https://www.3dyzt.com/eduTrain/web-user/index.html', '_blank');
-            window.open('#/train/list', '_blank');
+            // window.open('#/train/list', '_blank');
+            router.push('/train/list');
             break;
 
         case "QV检测实训":
             // window.open('#/Qv', '_blank');
-            window.open('#/train/list', '_blank');
+            // window.open('#/train/list', '_blank');
+            router.push('/train/list');
             break;
 
     }

+ 1 - 1
user_web/src/view/student/trainList/trainList.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="tl-container">
-        <NavMenus :show-logout="true"></NavMenus>
+        <NavMenus :show-logout="true" :returnMain="true" ></NavMenus>
         <div class="tl-search-bar"></div>
         <div class="tl-card-list">
             <TrainItem v-for="item in state.trainList" :data="item"></TrainItem>