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

# Conflicts: # front/src/views/home/infrastructurePage.vue
2022-07-07 19:56:25 +08:00 · 2022-07-07 19:56:25 +08:00 · 251231ebb8
parent 74187e4623 2ffb67b235
commit 251231ebb8
9 changed files with 366 additions and 343 deletions
--- a/front/public/index.html
+++ b/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['previewUrl'] = 'http://15.72.183.90:7008/';
-    // 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['backUrl'] = 'http://15.72.183.90:8001';
+    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['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['previewUrl'] = 'http://15.2.21.238:9796/';
-    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['backUrl'] = 'http://15.2.21.238:9797';
+    // 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['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';
--- a/front/public/static/config/location.js
+++ b/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-05 20:08:53
+ * @LastEditTime: 2022-07-07 17:30:10
+=======
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-07 17:41:25
+>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
 * @Description: 数据资源参数配置
 */
-//const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
- const newLocation = 'xihaian'
+<<<<<<< HEAD
+// const newLocation = 'xihaian'
+=======
+//  const newLocation = 'xihaian'
+>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1

 // 数据资源数据
 const whoShow = {}
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@ -113,31 +113,21 @@ const actions = {
   * @param {*} { commit, dispatch, state }
   * @returns
   */
-  async getUserInfo({ commit }) {
-    const { data } = await getUserInfo()
+  getUserInfo({ commit }) {
+    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 获取用户信息，后续执行部分操作
-    // 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('用户信息接口异常')
-    // }
+        resolve()
+      })
+    })
  },

  /**
--- a/front/src/utils/request.js
+++ b/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
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@ -1,8 +1,8 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-01 17:23:11
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 09:54:19
+ * @LastEditors: hisense.wuhongjian
+ * @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')
    }
  }
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@ -147,6 +147,10 @@
          break
      }
    })
+    let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+    dataList.value.dataList.sort((a, b) => {
+      return arr.indexOf(a.type) - arr.indexOf(b.type)
+    })
  })
  let datas = ref([])
  let laiyuanDataList = ref([])
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -96,7 +96,7 @@
                />
              </div>
            </div>
-            <div class="top-content">
+            <div class="top-content" v-if="Cardsname == '组件服务'">
              <span class="top-content-title">共享条件</span>
              <div class="leixingsumfather">
                <div class="leixingsum">
@ -106,6 +106,8 @@
                  >
                    申请
                  </a-checkable-tag>
+                </div>
+                <div class="leixingsum">
                  <a-checkable-tag
                    :checked="tagFlag == '免批申请'"
                    @change="() => chagneTag('免批申请')"
@ -312,7 +314,7 @@
                />
              </div>
            </div>
-            <div class="top-content">
+            <div class="top-content" v-if="Cardsname == '组件服务'">
              <span class="top-content-title">共享条件</span>
              <div class="leixingsumfather">
                <div class="leixingsum">
@ -322,6 +324,8 @@
                  >
                    申请
                  </a-checkable-tag>
+                </div>
+                <div class="leixingsum">
                  <a-checkable-tag
                    :checked="tagFlag == '免批申请'"
                    @change="() => chagneTag('免批申请')"
@ -508,7 +512,7 @@
                />
              </div>
            </div>
-            <div class="top-content">
+            <div class="top-content" v-if="Cardsname == '组件服务'">
              <span class="top-content-title">共享条件</span>
              <div class="leixingsumfather">
                <div class="leixingsum">
@ -518,6 +522,8 @@
                  >
                    申请
                  </a-checkable-tag>
+                </div>
+                <div class="leixingsum">
                  <a-checkable-tag
                    :checked="tagFlag == '免批申请'"
                    @change="() => chagneTag('免批申请')"