From 6b361adb316e882b1cae69717664bbae9fb06591 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 23 Aug 2021 12:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E6=88=96?=
 =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E4=B8=8B=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD=E4=BF=A1=E6=81=AF=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                   |  2 +-
 .env.test                         |  2 +-
 src/layout/components/AppMain.vue |  9 +++------
 src/permission.js                 | 12 ++++++------
 src/store/modules/user.js         |  2 +-
 vue.config.js                     |  9 +++++----
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.env.production b/.env.production
index 99b00d4..1953fee 100644
--- a/.env.production
+++ b/.env.production
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'
diff --git a/.env.test b/.env.test
index abe1fde..135c37a 100644
--- a/.env.test
+++ b/.env.test
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index c7a19c8..ad50e78 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,23 +1,21 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive v-if="!$route.meta.iframe" :include="cachedViews">
+      <keep-alive :include="cachedViews">
         <router-view :key="key" />
       </keep-alive>
     </transition>
-    <elFrame v-show="!!$route.meta.iframe" :src="oldURL" />
     <message :result="dialogFormVisible" :message-info="message" @dialogData="closeDialog" />
   </section>
 </template>
 
 <script>
 import Message from '../../components/Notice/message'
-import elFrame from '../../components/Iframe/index'
 import Utils from '../../utils/contact.js'
 import { transactionTable } from '@/api/dashboard'
 export default {
   name: 'AppMain',
-  components: { Message, elFrame },
+  components: { Message },
   data() {
     return {
       userId: this.$store.getters.userId,
@@ -35,8 +33,7 @@ export default {
         shebeizhonglei: '',
         shebeizhongleidaima: '',
         jianyanleibie: ''
-      },
-      oldURL: process.env.VUE_APP_OLD_API + 'user/index'
+      }
     }
   },
   computed: {
diff --git a/src/permission.js b/src/permission.js
index 626a9dd..3ec0733 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -2,20 +2,20 @@ import router from './router'
 import store from './store'
 import NProgress from 'nprogress' // Progress 进度条
 import 'nprogress/nprogress.css'// Progress 进度条样式
-import { getToken, getRememberMeToken } from '@/utils/auth' // 验权
+import { getToken } from '@/utils/auth' // 验权
 const whiteList = ['/login', '/remote', '/404', '/viewhzd', '/upload', '/xingshi', '/wenjian', '/fangwei', '/qiye'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
-  if (getToken() || getRememberMeToken()) {
+  if (getToken()) {
     if (to.path === '/login') {
       next({ path: '/' })
       NProgress.done() // 结束Progress
-    } else if (!store.getters.roles.length) {
+    } else if (store.getters.roles.length) {
+      next()
+    } else {
       store.dispatch('GetInfo').then(() => {
-        next({ ...to })
+        next({ ...to, replace: true })
       })
-    } else {
-      next()
     }
   } else {
     const ppath = to.path
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 523cae4..403032d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -22,7 +22,7 @@ const user = {
     allUser: [],
     allCategory: [],
     messageCount: [],
-    prodName: process.env.NODE_ENV === 'test' ? '/sdmaFront' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist)
+    prodName: process.env.NODE_ENV === 'development' ? '' : '/sdmaFront' // 开发环境下为空，生产环境下请设置为tomcat项目名称或者nginx代理项目名称。(例如：/dist)
   },
   mutations: {
     SET_USER: (state, userInfo) => {
diff --git a/vue.config.js b/vue.config.js
index 0ed2f6b..c9c0fcf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,13 +7,14 @@ function resolve(dir) {
 }
 
 const name = pkg.name || 'sdma-front' // page title
-const port = process.env.NODE_ENV === 'development' ? 9527 : 8090
-console.log(process.env.NODE_ENV === 'development')
+const isDev = process.env.NODE_ENV === 'development'
+const port = isDev ? 9527 : 8090
+console.log(isDev)
 module.exports = {
-  publicPath: process.env.NODE_ENV === 'test' ? '/sdmaFront' : './',
+  publicPath: isDev ? './' : '/sdmaFront',
   outputDir: 'sdmaFront',
   assetsDir: 'static',
-  lintOnSave: process.env.NODE_ENV === 'development' ? 'error' : false,
+  lintOnSave: isDev ? 'error' : false,
   productionSourceMap: false,
   runtimeCompiler: true,
   devServer: {