zc

.env.development

@@ -9,7 +9,7 @@ VUE_APP_ENV = 'development'
 # 1.8
 # VUE_APP_BASE_API =  '192.168.1.8:8080'
 # 韩
-VUE_APP_BASE_API =  '192.168.1.20:8080'
+# VUE_APP_BASE_API =  '192.168.1.20:8080'
 # 飞
 # VUE_APP_BASE_API =  '192.168.1.17:8080'
 # 高升
@@ -17,7 +17,7 @@ VUE_APP_BASE_API =  '192.168.1.20:8080'
 # 88服务器
 # VUE_APP_BASE_API = '192.168.1.88/labSystem'
 # 43服务器
-# VUE_APP_BASE_API = '192.168.1.43/labSystem/'
+VUE_APP_BASE_API = '192.168.1.43/api'
 # 柴
 # VUE_APP_BASE_API = '192.168.1.9:8080'
 # 暨大
@@ -34,7 +34,7 @@ VUE_APP_BASE_API =  '192.168.1.20:8080'
 
 # ####################内网接口配置####################
 
-VUE_APP_BASE_LOCAL_API = '192.168.1.39:8080'
+VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 
 
 

src/api/login.js

@@ -45,3 +45,11 @@ export function configInfo(data) {
         params: data
     })
 }
+
+// 获取用户详细信息
+export function getInfo() {
+    return request({
+        url: '/system/user/permission',
+        method: 'get'
+    })
+}

src/utils/request.js

@@ -101,7 +101,7 @@ serviceAxios.interceptors.response.use(res => {
         }else if (code != 200) {
             if(!messageData){
                 messageData = Message({
-                    message: '系统未知错误,请联系管理员',
+                    message: res.data.message,
                     type: 'error',
                     offset:100
                 })
@@ -109,7 +109,8 @@ serviceAxios.interceptors.response.use(res => {
                     messageData = null
                 },1000);
             }
-            return Promise.reject(new Error('系统未知错误,请联系管理员'))
+            return res.data
+            // return Promise.reject(new Error('系统未知错误,请联系管理员'))
         } else {
             return res.data
         }

src/views/courtyardManage/courtyardHome.vue

@@ -2,11 +2,12 @@
   <div class="main">
     <img class="bg_img" src="@/assets/image/bg.png"/>
     <div class="header">
-      <img class="header_l" src="" />
+      <p class="header_l" ></p>
+      <img class="header_l-position" src="@/assets/image/logo@1x.png" />
       <div class="header_c">实验室安全智能监测与控制系统</div>
       <div class="header_r1">
         <img class="header_r1_l" src="@/assets/image/index_icon3.png"/>
-        <i class="schoolName">****</i>
+        <i class="schoolName">{{deptName?deptName:'****'}}</i>
         <img class="header_r1_r" src="@/assets/image/index_icon4.png" @click="openBackManageUrl()"/>
       </div>
     </div>
@@ -325,6 +326,7 @@ export default {
   },
   data(){
     return {
+      deptName:localStorage.getItem('deptName'),
       mtopicTwo:"manage/work"+localStorage.getItem('userId'),
       timer: null,//定时器
       chartReload: null,//定时器
@@ -1588,6 +1590,14 @@ export default {
         height: 44px;
         margin: 10px 0 0 40px;
       }
+      .header_l-position{
+        z-index: 10;
+        position: absolute;
+        top:10px;
+        left:20px;
+        width: 260px;
+        height: 37px;
+      }
       .header_c{
         width: 1180px;
         height: 152px;

src/views/login.vue

@@ -48,7 +48,7 @@
 <script>
     import md5 from 'js-md5';
     import Cookies from "js-cookie";
-    import { login,authInfo,getCodeImg,getConfigByType,configInfo} from "@/api/login";
+    import { login,authInfo,getCodeImg,getConfigByType,configInfo,getInfo } from "@/api/login";
     import {Decrypt} from "@/utils/secret";
 
     export default {
@@ -168,6 +168,11 @@
                     }
                 });
             },
+            getInfo() {
+                getInfo().then(res => {
+                    localStorage.setItem('deptName',res.data.userInfo.deptName)
+                });
+            },
             handleLogin() {
                 let self = this;
                 //账号登录
@@ -217,6 +222,7 @@
                             localStorage.setItem('userType',res.data.userType==0||res.data.userType==1?'1':'2')
                             this.getExploitConfig();
                             this.fullScreen();
+                            this.getInfo();
                             this.$router.push({path:'/home'});
                         }else{
                             this.text = '该账号没有相关权限,请联系管理员.';