From ddbca0646871f1aebee6d637d4946a760e836df6 Mon Sep 17 00:00:00 2001
From: gongdi <410827992@qq.com>
Date: Sat, 19 Feb 2022 07:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=8B=E6=B5=A6=E5=AD=A6=E6=A0=A1=20?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=B7=A5=E4=BD=9C=E9=98=B6=E6=AE=B5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/screenAdaptation/menuConfig.js      |  6 +-
 .../pages/secondPages/secondPageBox.vue       |  1 +
 .../pages/secondPages/top.vue                 |  1 +
 .../pages/teachingAdmin/index.vue             | 68 +++++++++++++++++++
 .../pages/teachingCenter/teachingCenter.vue   |  1 -
 .../pages/teachingResource/index.vue          | 68 +++++++++++++++++++
 src/views/screenAdaptation/router/guards.js   | 20 +++---
 7 files changed, 152 insertions(+), 13 deletions(-)
 create mode 100644 src/views/screenAdaptation/pages/teachingAdmin/index.vue
 create mode 100644 src/views/screenAdaptation/pages/teachingResource/index.vue

diff --git a/src/views/screenAdaptation/menuConfig.js b/src/views/screenAdaptation/menuConfig.js
index b20edf8..18bd555 100644
--- a/src/views/screenAdaptation/menuConfig.js
+++ b/src/views/screenAdaptation/menuConfig.js
@@ -455,7 +455,8 @@ const menuConfigDS = [
         path: "/teachingCenter",
         name: "teachingCenterPage",
         imgUrl:"./3D/builds-b2/3d-res/texture/three.png",
-        component: () => import("./pages/secondPages/secondPageBox.vue"),
+        //component: () => import("./pages/secondPages/secondPageBox.vue"),
+        component: () => import("./pages/teachingAdmin/index.vue"),
         children: [
             {
                 title: "首页",
@@ -529,7 +530,8 @@ const menuConfigDS = [
         path: "/resourcesCenter",
         name: "resourcesCenterPage",
         imgUrl:"./3D/builds-b2/3d-res/texture/seven.png",
-        component: () => import("./pages/secondPages/secondPageBox.vue"),
+        /*component: () => import("./pages/secondPages/secondPageBox.vue"),*/
+        component: () => import("./pages/teachingResource/index.vue"),
         children: [
             {
                 title: "首页",
diff --git a/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue b/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue
index e0f5d90..c440fa7 100644
--- a/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue
+++ b/src/views/screenAdaptation/pages/secondPages/secondPageBox.vue
@@ -51,6 +51,7 @@
                 }, 500)
             },
             modelChange:function (path) {
+                console.log("path:",path)
                 this.$router.replace({path:path});
             }
         },
diff --git a/src/views/screenAdaptation/pages/secondPages/top.vue b/src/views/screenAdaptation/pages/secondPages/top.vue
index 0558930..006b9ea 100644
--- a/src/views/screenAdaptation/pages/secondPages/top.vue
+++ b/src/views/screenAdaptation/pages/secondPages/top.vue
@@ -142,6 +142,7 @@
                         this.$emit("modelChange", this.menuPath);
                         return;
                     }
+
                     //二级菜单路由重组
                     routePath = "/" + routePathAry[0];
                 }
diff --git a/src/views/screenAdaptation/pages/teachingAdmin/index.vue b/src/views/screenAdaptation/pages/teachingAdmin/index.vue
new file mode 100644
index 0000000..efe9d10
--- /dev/null
+++ b/src/views/screenAdaptation/pages/teachingAdmin/index.vue
@@ -0,0 +1,68 @@
+<template>
+    <div class="iframe-box-style" style="width: 100%;height: 100%">
+        <!--<div class="back-style" title="回到首页" @click="toMainPage"><a-icon type="home" theme="filled" /></div>-->
+        <iframe class="iframe-style"
+                src="https://cloud.edusoa.com/DataCenter/TeachCenter.html"
+                width="100%" height="100%"
+                frameborder="0"
+                scrolling="auto"
+                sandbox="allow-scripts allow-top-navigation allow-same-origin"
+        ></iframe>
+        <div class="content-right-style" style="pointer-events: none">
+            <MenuRight/>
+        </div>
+    </div>
+</template>
+<script>
+    import {Icon} from 'ant-design-vue';
+    import MenuRight from '../homePages/threeDimensionalSchoolModel/menuRight.vue';
+    //src="https://cloud.edusoa.com/DataCenter/TeachCenter.html"
+    //src="https://www.edusoa.com/dsideal_yy/pro_integration/reactProject/test/test.html"
+    export default{
+        data(){
+            return {}
+        },
+        methods:{},
+        components:{
+            AIcon:Icon,
+            MenuRight
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    @import "../../assets/scss/style";
+    .iframe-box-style{
+        position: relative;
+        .back-style{
+            width: 30px;
+            height: 30px;
+            border-radius: 30px;
+            background-color: $color-default-bright;
+            margin-left: 10px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #0a1f3f;
+            cursor: pointer;
+            position: absolute;
+            top: 10px;
+            left: 1805px;
+            z-index: 1000;
+        }
+        .iframe-style{
+            position: absolute;
+            top: 0;
+            left: 0;
+        }
+        .content-right-style{
+            width: auto;
+            height: 800px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            position: absolute;
+            right: 0;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/teachingCenter/teachingCenter.vue b/src/views/screenAdaptation/pages/teachingCenter/teachingCenter.vue
index 1a857ac..b5cdec2 100644
--- a/src/views/screenAdaptation/pages/teachingCenter/teachingCenter.vue
+++ b/src/views/screenAdaptation/pages/teachingCenter/teachingCenter.vue
@@ -1,7 +1,6 @@
 <template>
     <div>
 
-
     </div>
 </template>
 
diff --git a/src/views/screenAdaptation/pages/teachingResource/index.vue b/src/views/screenAdaptation/pages/teachingResource/index.vue
new file mode 100644
index 0000000..b8a0a97
--- /dev/null
+++ b/src/views/screenAdaptation/pages/teachingResource/index.vue
@@ -0,0 +1,68 @@
+<template>
+    <div class="iframe-box-style" style="width: 100%;height: 100%">
+        <!--<div class="back-style" title="回到首页" @click="toMainPage"><a-icon type="home" theme="filled" /></div>-->
+        <iframe class="iframe-style"
+                src="https://cloud.edusoa.com/DataCenter/ResourceCenter.html"
+                width="100%" height="100%"
+                frameborder="0"
+                scrolling="auto"
+                sandbox="allow-scripts allow-top-navigation allow-same-origin"
+        ></iframe>
+        <div class="content-right-style" style="pointer-events: none">
+            <MenuRight/>
+        </div>
+    </div>
+</template>
+<script>
+    import {Icon} from 'ant-design-vue';
+    import MenuRight from '../homePages/threeDimensionalSchoolModel/menuRight.vue';
+    //src="https://cloud.edusoa.com/DataCenter/TeachCenter.html"
+    //src="https://www.edusoa.com/dsideal_yy/pro_integration/reactProject/test/test.html"
+    export default{
+        data(){
+            return {}
+        },
+        methods:{},
+        components:{
+            AIcon:Icon,
+            MenuRight
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    @import "../../assets/scss/style";
+    .iframe-box-style{
+        position: relative;
+        .back-style{
+            width: 30px;
+            height: 30px;
+            border-radius: 30px;
+            background-color: $color-default-bright;
+            margin-left: 10px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #0a1f3f;
+            cursor: pointer;
+            position: absolute;
+            top: 10px;
+            left: 1805px;
+            z-index: 1000;
+        }
+        .iframe-style{
+            position: absolute;
+            top: 0;
+            left: 0;
+        }
+        .content-right-style{
+            width: auto;
+            height: 800px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            position: absolute;
+            right: 0;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/router/guards.js b/src/views/screenAdaptation/router/guards.js
index c190394..287a23d 100644
--- a/src/views/screenAdaptation/router/guards.js
+++ b/src/views/screenAdaptation/router/guards.js
@@ -23,16 +23,16 @@ const loginGuard = (to, from, next, options) => {
     const hasToken = getToken();
     //localStorage和cookie均校验
     if (hasToken && user && user.personId) {
-        if(toPath === "/teachingCenter"){
-            //跳转教学中心
-            window.location.href="https://cloud.edusoa.com/DataCenter/TeachCenter.html";
-            return;
-        }
-        if(toPath === "/resourcesCenter"){
-            //跳转教学中心
-            window.location.href="https://cloud.edusoa.com/DataCenter/ResourceCenter.html";
-            return;
-        }
+        // if(toPath === "/teachingCenter"){
+        //     //跳转教学中心
+        //     window.location.href="https://cloud.edusoa.com/DataCenter/TeachCenter.html";
+        //     return;
+        // }
+        // if(toPath === "/resourcesCenter"){
+        //     //跳转教学中心
+        //     window.location.href="https://cloud.edusoa.com/DataCenter/ResourceCenter.html";
+        //     return;
+        // }
         if(toPath === "/monitorCenter/information"){
             //跳转教学中心
             window.location.href="https://cloud.edusoa.com/DataCenter/DataCenter.html";