Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/public/index.html

@@ -28,10 +28,10 @@
      <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
-    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 包头
     // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
@@ -45,10 +45,10 @@
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';

front/public/static/config/location.js

@@ -1,13 +1,22 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
+<<<<<<< HEAD
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-07 17:30:10
+=======
  * @LastEditors: hisense.liangjunhua
  * @LastEditTime: 2022-07-07 17:41:25
+>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
  * @Description: 数据资源参数配置
  */
 const newLocation = 'qingdao'
 // const newLocation = 'baotou'
+<<<<<<< HEAD
 // const newLocation = 'xihaian'
+=======
+//  const newLocation = 'xihaian'
+>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
 
 // 数据资源数据
 const whoShow = {}

front/src/store/modules/user.js

@@ -113,31 +113,21 @@ const actions = {
    * @param {*} { commit, dispatch, state }
    * @returns
    */
-  async getUserInfo({ commit }) {
+  getUserInfo({ commit }) {
-    const { data } = await getUserInfo()
+    return new Promise((resolve, reject)=>{
+      getUserInfo().then( (res) =>{
+        console.log('res', res)
+        const data = res.data
         if (!data) {
           message.error(`验证失败，请重新登录...`)
-      return false
+          reject()
         }
-    // debugger
         commit('setUsername', data.data.username)
         commit('setRole', data.data.roleIdList.length)
         commit('setUserId', data.data.id)
-    // TODO 获取用户信息，后续执行部分操作
+        resolve()
-    // let { username, avatar, roles, ability } = data
+      })
-    // if (username && roles && Array.isArray(roles)) {
+    })
-    //   dispatch('acl/setRole', roles, {
-    //     root: true,
-    //   })
-    //   if (ability && ability.length > 0)
-    //     dispatch('acl/setAbility', ability, {
-    //       root: true,
-    //     })
-    //   commit('setUsername', username)
-    //   commit('setAvatar', avatar)
-    // } else {
-    //   message.error('用户信息接口异常')
-    // }
   },
 
   /**

front/src/utils/request.js

@@ -114,10 +114,14 @@ instance.interceptors.response.use(
         location.reload()
       }, 1000)
     }
+    debugger;
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
     if (response.headers.token) {
       setAccessToken(response.headers.token)
+      debugger
+      // setAccessToken(response.headers.token)
+      //  store.dispatch('user/getUserInfo')
     } else {
       if (response.headers.redirect) {
         // window.location.href = response.headers.redirect

front/src/vab/plugins/permissions.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-29 09:54:19
+ * @LastEditTime: 2022-07-07 18:15:38
  * @Description: 告诉大家这是什么
  */
 /**
@@ -20,6 +20,7 @@ import {
 } from '@/config'
 import { setAccessToken, getAccessToken } from '@/utils/accessToken'
 router.beforeEach(async (to, from, next) => {
+  // 初始化拦截
   // debugger
   // const SSOTOKEN = to.query.SSOToken
   // if (SSOTOKEN) {
@@ -29,11 +30,14 @@ router.beforeEach(async (to, from, next) => {
   // console.log('token', token)
   let hasToken = token || store.getters['user/accessToken']
   // debugger
+  // 未开启登录拦截状态
   if (!loginInterception) hasToken = true
   // console.log('hasToken存在巨大问题', hasToken)
+  debugger
   if (hasToken) {
-    setAccessToken(hasToken)
+    setAccessToken(token)
     await store.dispatch('user/getUserInfo')
+    debugger
     next()
   } else {
     let accessRoutes = []
@@ -44,11 +48,17 @@ router.beforeEach(async (to, from, next) => {
     if (routesWhiteList.indexOf(to.path) !== -1) {
       next()
     } else {
-      await store.dispatch('user/getUserInfo')
+      store.dispatch('user/getUserInfo').then((res)=>{
+        debugger
+        next()
+      })
       // if (recordRoute)
       //   next({ path: '/login', query: { redirect: to.path }, replace: true })
       // else next({ path: '/login', replace: true })
-      next()
+      // debugger
+      // setTimeout(()=>{
+      //   next()
+      // }, 500)
       // window.open('http://www.baidu.com', '_self')
     }
   }

front/src/views/home/infrastructurePage.vue

@@ -11,7 +11,11 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
+<<<<<<< HEAD
+          @click="tabClick(index, item.title)"
+=======
           @click="tabClick(index, itemContent, item)"
+>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1