Browse Source

Merge branch 'feature/v2.4.17_wky' of group3/qmx_page_admin into feature/v2.4.17

wangkaiyue 2 years ago
parent
commit
ea2625d93a
3 changed files with 55 additions and 3 deletions
  1. 6 1
      src/router.js
  2. 38 0
      src/views/outServer/outServer.vue
  3. 11 2
      vue.config.js

+ 6 - 1
src/router.js

@@ -91,6 +91,11 @@ const routes = [
         path: '/msgManage/boardManage/detail',
         name: 'boardDetail',
         component: () => import('./views/msgManage/boardDetail.vue')
+    },
+    {
+        path: '/outServer/*',
+        name: 'outServer',
+        component: () => import('./views/outServer/outServer.vue')
     }
 ];
 
@@ -149,4 +154,4 @@ router.afterEach(to => {
     window.scrollTo(0, 0);
 });
 
-export default router
+export default router

+ 38 - 0
src/views/outServer/outServer.vue

@@ -0,0 +1,38 @@
+<template>
+  <div class="content">
+    <iframe :src="src"></iframe>
+  </div>
+</template>
+<script>
+import qs from 'qs'
+
+export default {
+  name: 'iframe',
+  data: function () {
+    return {
+      src: ""
+    }
+  },
+  created() {
+    this.getUrlLink()
+  },
+  methods: {
+    getUrlLink() {
+      let newParam = this.$route.query
+      newParam["_token"] = localStorage.admin_token
+      this.src =  (this.$route.path.replace('/outServer', '')) + '?' + qs.stringify(newParam)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content{
+  height: calc(100vh - 145px);
+}
+iframe{
+  width: 100%;
+  height: 100%;
+  border: none;
+}
+</style>

+ 11 - 2
vue.config.js

@@ -26,14 +26,23 @@ module.exports = {
     // allowedHosts: 'all',
     proxy: {
       '^/dev-api': {
-        target: 'https://web-qmx_admin.jydev.jianyu360.com/api/admin/',
+        target: 'https://web2-qmx_admin.jydev.jianyu360.com/api/admin/',
         changeOrigin: true,
         ws: false,
         logLevel: 'debug',
         pathRewrite: {
           '^/dev-api': ''
         }
+      },
+      '^/succbi': {
+        target: 'https://web2-qmx_admin.jydev.jianyu360.com/succbi',
+        changeOrigin: true,
+        ws: false,
+        logLevel: 'debug',
+        pathRewrite: {
+          '^/succbi': ''
+        }
       }
     }
   }
-}
+}