Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/router/index.js

@@ -793,6 +793,14 @@ export const constantRoutes = [{
           title: '选科报告'
         }
       },
+      {
+        path: '/elective/report/test',
+        component: (resolve) => require(['@/views/career/bigdataSelectCourse/iframePaper'], resolve),
+        name: '',
+        meta: {
+          title: 'ceshi'
+        }
+      },
     ]
   }
 ]

src/views/bigdatastudy/study/report.vue

@@ -130,8 +130,9 @@ export default {
       window.open(path)
     },
     goStudyReportDemoOnline() {
-      const path = 'https://online.fliphtml5.com/jkrou/hjig/'
-      window.open(path)
+      this.$router.push({ path:'/elective/report/test',query:{path:'https://online.fliphtml5.com/jkrou/hjig/'} })
+      // const path = 'https://online.fliphtml5.com/jkrou/hjig/'
+      // window.open(path)
     },
   }
 }

src/views/career/bigdataSelectCourse/iframePaper.vue

@@ -0,0 +1,20 @@
+<template>
+  <div style="position: absolute;height: 100%;width: 100%">
+    <iframe style="width: 100%; height: 100%;" :src="path" allowfullscreen="allowfullscreen" frameborder="0" data-id="1"></iframe>
+  </div>
+</template>
+<script>
+  export default {
+    created() {
+      this.path = this.$route.query.path
+    },
+    data() {
+      return {
+        path: ''
+      }
+    }
+  }
+</script>
+<style>
+
+</style>

src/views/career/bigdataSelectCourse/personalSelectCourseReport.vue

@@ -126,8 +126,9 @@ export default {
   },
   methods:{
     goReportDemoOnline() {
-      const path = 'https://online.fliphtml5.com/jkrou/ybov/'
-      window.open(path)
+      this.$router.push({ path:'/elective/report/test',query:{path:'https://online.fliphtml5.com/jkrou/ybov/'} })
+      // const path = 'https://online.fliphtml5.com/jkrou/ybov/'
+      // window.open(path)
     },
     goStudyReportDemoOnline() {
       const path = 'https://online.fliphtml5.com/jkrou/hjig/'