From 362b39a1a81a866787f5c4d5ae74752a409c2bca Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 9 Sep 2022 00:38:57 +0800
Subject: [PATCH] clay commit : info

---
 ebts-ui/.env.development                           | 3 ++-
 ebts-ui/public/index.html                          | 2 +-
 ebts-ui/src/permission.js                          | 7 +++----
 ebts-ui/src/views/system/user/profile/userInfo.vue | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebts-ui/.env.development b/ebts-ui/.env.development
index 098b29a..5258357 100644
--- a/ebts-ui/.env.development
+++ b/ebts-ui/.env.development
@@ -3,7 +3,8 @@ ENV = 'development'
 
 # EBTS/开发环境
 #VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.190.67/dev-api'
+#VUE_APP_BASE_API = 'http://192.168.190.67/dev-api'
+VUE_APP_BASE_API = 'http://127.0.0.1:8085/dev-api'
 #VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api'
 
 # 路由懒加载
diff --git a/ebts-ui/public/index.html b/ebts-ui/public/index.html
index cb08685..24c7e86 100644
--- a/ebts-ui/public/index.html
+++ b/ebts-ui/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+<!--    <link rel="icon" href="<%= BASE_URL %>favicon.ico">-->
     <title>西南交大信息学院官网后台管理系统</title>
 	  <style>
     html,
diff --git a/ebts-ui/src/permission.js b/ebts-ui/src/permission.js
index dd9eeba..5052695 100644
--- a/ebts-ui/src/permission.js
+++ b/ebts-ui/src/permission.js
@@ -4,7 +4,6 @@ import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
-import axios from "axios";
 
 NProgress.configure({ showSpinner: false })
 
@@ -62,9 +61,9 @@ router.beforeEach((to, from, next) => {
       //
       // })
       // NProgress.done()
-      // if (!defaultSettings.casEnable) {
-      //   next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      // }
+      if (!defaultSettings.casEnable) {
+        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      }
       //开启cas
       if (defaultSettings.casEnable) {
         window.location.href = defaultSettings.casloginUrl // 否则全部重定向到登录页
diff --git a/ebts-ui/src/views/system/user/profile/userInfo.vue b/ebts-ui/src/views/system/user/profile/userInfo.vue
index 3627a28..d73015d 100644
--- a/ebts-ui/src/views/system/user/profile/userInfo.vue
+++ b/ebts-ui/src/views/system/user/profile/userInfo.vue
@@ -1,8 +1,8 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="用户昵称" prop="nickName">
-      <el-input v-model="user.nickName" />
-    </el-form-item> 
+      <el-input disabled v-model="user.nickName" />
+    </el-form-item>
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>