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

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-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 = {}

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)=>{
-    if (!data) {
+      getUserInfo().then( (res) =>{
-      message.error(`验证失败，请重新登录...`)
+        console.log('res', res)
-      return false
+        const data = res.data
-    }
+        if (!data) {
-    // debugger
+          message.error(`验证失败，请重新登录...`)
-    commit('setUsername', data.data.username)
+          reject()
-    commit('setRole', data.data.roleIdList.length)
+        }
-    commit('setUserId', data.data.id)
+        commit('setUsername', data.data.username)
-    // TODO 获取用户信息，后续执行部分操作
+        commit('setRole', data.data.roleIdList.length)
-    // let { username, avatar, roles, ability } = data
+        commit('setUserId', data.data.id)
-    // if (username && roles && Array.isArray(roles)) {
+        resolve()
-    //   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/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([])

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('免批申请')"

front/src/views/home/components/searchResultList.vue

@@ -619,340 +619,340 @@
   }
 </script>
 <style scoped lang="less">
-#search-result-list-container {
+  #search-result-list-container {
-  width: 1088px;
+    width: 1088px;
-  padding: 0 20px;
+    padding: 0 20px;
-  background: #f3f5f9;
+    background: #f3f5f9;
 
-  .detail-content {
+    .detail-content {
-    // 超出
+      // 超出
-    white-space: nowrap;
+      white-space: nowrap;
-    overflow: hidden;
+      overflow: hidden;
-    text-overflow: ellipsis;
+      text-overflow: ellipsis;
-    width: 130px;
+      width: 130px;
-    display: inline-block;
+      display: inline-block;
-  }
-
-  .shai-xuan {
-    width: 1047px;
-    height: 36px;
-    // margin: 11px 0 20px;
-    // background: #e5f2ff;
-    // padding-left: 20px;
-    display: flex;
-    align-items: center;
-    position: relative;
-
-    .circle {
-      width: 16px;
-      height: 16px;
-      border-radius: 50%;
-      background-color: #0087ff;
-      text-align: center;
-      color: #fff;
-      line-height: 16px;
-      margin-right: 21px;
     }
 
-    .result {
+    .shai-xuan {
-      font-size: 14px;
+      width: 1047px;
-      font-weight: 500;
+      height: 36px;
-      color: #212121;
+      // margin: 11px 0 20px;
-
+      // background: #e5f2ff;
-      span {
+      // padding-left: 20px;
-        font-size: 18px;
-        color: #0087ff;
-      }
-    }
-
-    .condition {
-      position: absolute;
-      right: 20px;
-      top: 10px;
-
-      ul li {
-        list-style-type: none;
-      }
-
-      ul {
-        display: flex;
-
-        li {
-          width: 90px;
-          height: 12px;
-          text-align: center;
-          cursor: pointer;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-
-          .arrow {
-            display: inline-block;
-            width: 12px;
-            height: 12px;
-            background: url('~@/assets/newHome/arrow.png');
-            margin-left: 10px;
-          }
-
-          .down {
-            background: url('~@/assets/newHome/down.png');
-            margin-top: 6px;
-          }
-        }
-      }
-    }
-  }
-
-  .result-list {
-    width: 1048px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-    border-top: 1px rgba(150, 144, 144, 0.3) solid;
-    padding: 10px 0;
-
-    .item {
-      width: 100%;
-      margin-top: 10px;
       display: flex;
       align-items: center;
+      position: relative;
 
-      .left {
+      .circle {
-        display: inline-block;
+        width: 16px;
-        width: 120px;
+        height: 16px;
-        height: 110px;
+        border-radius: 50%;
-        margin-right: 16px;
+        background-color: #0087ff;
+        text-align: center;
+        color: #fff;
+        line-height: 16px;
+        margin-right: 21px;
       }
 
-      .right {
+      .result {
-        width: 100%;
+        font-size: 14px;
-      }
+        font-weight: 500;
-
+        color: #212121;
-      .yyzy {
-        background: url('~@/assets/home/yyzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .sjzy {
-        background: url('~@/assets/home/sjzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .znsf {
-        background: url('~@/assets/home/znsf_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .tcfw {
-        background: url('~@/assets/home/tcfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .kfzj {
-        background: url('~@/assets/home/kfzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .ywzj {
-        background: url('~@/assets/home/ywzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .header {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin: 0 10px 0 0;
-
-        .header-right {
-          display: flex;
-          font-size: 14px;
-          color: #212121;
-
-          span {
-            font-size: 14px;
-            color: #212121;
-          }
-
-          div {
-            margin-right: 24px;
-          }
-        }
-
-        .header-right:last-child {
-          div {
-            margin-right: 16px;
-          }
-        }
 
         span {
-          font-size: 20px;
+          font-size: 18px;
-          font-weight: 600;
+          color: #0087ff;
-          // color: #0087ff;
         }
       }
 
-      .dec {
+      .condition {
-        overflow: hidden;
+        position: absolute;
-        text-overflow: ellipsis;
+        right: 20px;
-        // white-space: nowrap;
+        top: 10px;
-        color: #0058e1;
-        display: flex;
-        margin-top: 10px;
 
-        div {
+        ul li {
-          margin-right: 10px;
+          list-style-type: none;
-          background: rgba(0, 88, 225, 0.1);
-          padding-left: 10px;
-          padding-right: 10px;
         }
 
-        div:nth-child(3) {
+        ul {
-          max-width: 200px;
-          display: -webkit-box;
-          /*设置为弹性盒子*/
-          -webkit-line-clamp: 1;
-          /*最多显示3行*/
-          overflow: hidden;
-          /*超出隐藏*/
-          text-overflow: ellipsis;
-          /*超出显示为省略号*/
-          -webkit-box-orient: vertical;
-        }
-      }
-
-      .btn {
-        display: flex;
-        justify-content: space-between;
-        font-size: 14px;
-        margin: 5px 0;
-
-        // .left {
-        //   width: 600px;
-        //   display: flex;
-        //   justify-content: space-between;
-        //   flex-wrap: wrap;
-        //   & > div {
-        //     width: 300px;
-        //     & > span {
-        //       color: #0087ff;
-        //       font-weight: 600;
-        //     }
-        //   }
-        // }
-        .right {
-          flex: 1;
           display: flex;
-          justify-content: flex-end;
-          margin: 0 10px;
-          align-items: center;
 
-          .shopping {
+          li {
+            width: 90px;
+            height: 12px;
+            text-align: center;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            .arrow {
+              display: inline-block;
+              width: 12px;
+              height: 12px;
+              background: url('~@/assets/newHome/arrow.png');
+              margin-left: 10px;
+            }
+
+            .down {
+              background: url('~@/assets/newHome/down.png');
+              margin-top: 6px;
+            }
+          }
+        }
+      }
+    }
+
+    .result-list {
+      width: 1048px;
+      display: flex;
+      flex-direction: column;
+      flex-wrap: wrap;
+      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+      border-top: 1px rgba(150, 144, 144, 0.3) solid;
+      padding: 10px 0;
+
+      .item {
+        width: 100%;
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+
+        .left {
+          display: inline-block;
+          width: 120px;
+          height: 110px;
+          margin-right: 16px;
+        }
+
+        .right {
+          width: 100%;
+        }
+
+        .yyzy {
+          background: url('~@/assets/home/yyzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .sjzy {
+          background: url('~@/assets/home/sjzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .znsf {
+          background: url('~@/assets/home/znsf_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .tcfw {
+          background: url('~@/assets/home/tcfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .kfzj {
+          background: url('~@/assets/home/kfzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+        .ywzj {
+          background: url('~@/assets/home/ywzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .header {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin: 0 10px 0 0;
+
+          .header-right {
+            display: flex;
+            font-size: 14px;
+            color: #212121;
+
             span {
+              font-size: 14px;
+              color: #212121;
+            }
+
+            div {
+              margin-right: 24px;
+            }
+          }
+
+          .header-right:last-child {
+            div {
+              margin-right: 16px;
+            }
+          }
+
+          span {
+            font-size: 20px;
+            font-weight: 600;
+            // color: #0087ff;
+          }
+        }
+
+        .dec {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          // white-space: nowrap;
+          color: #0058e1;
+          display: flex;
+          margin-top: 10px;
+
+          div {
+            margin-right: 10px;
+            background: rgba(0, 88, 225, 0.1);
+            padding-left: 10px;
+            padding-right: 10px;
+          }
+
+          div:nth-child(3) {
+            max-width: 200px;
+            display: -webkit-box;
+            /*设置为弹性盒子*/
+            -webkit-line-clamp: 1;
+            /*最多显示3行*/
+            overflow: hidden;
+            /*超出隐藏*/
+            text-overflow: ellipsis;
+            /*超出显示为省略号*/
+            -webkit-box-orient: vertical;
+          }
+        }
+
+        .btn {
+          display: flex;
+          justify-content: space-between;
+          font-size: 14px;
+          margin: 5px 0;
+
+          // .left {
+          //   width: 600px;
+          //   display: flex;
+          //   justify-content: space-between;
+          //   flex-wrap: wrap;
+          //   & > div {
+          //     width: 300px;
+          //     & > span {
+          //       color: #0087ff;
+          //       font-weight: 600;
+          //     }
+          //   }
+          // }
+          .right {
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+            margin: 0 10px;
+            align-items: center;
+
+            .shopping {
+              span {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                margin-right: 10px;
+                margin-top: 5px;
+              }
+
+              .shopping-on {
+                background: url('~@/assets/newHome/shopping-on.png');
+                cursor: pointer;
+              }
+
+              .shopping-down {
+                background: url('~@/assets/newHome/shopping-down.png');
+              }
+            }
+
+            .pk-on {
               display: inline-block;
               height: 32px;
               width: 32px;
+              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-            }
+              background: url('~@/assets/newHome/pk-on.png');
-
-            .shopping-on {
-              background: url('~@/assets/newHome/shopping-on.png');
               cursor: pointer;
             }
 
-            .shopping-down {
+            .sc {
-              background: url('~@/assets/newHome/shopping-down.png');
+              // margin-top: 4px;
-            }
+              cursor: pointer;
-          }
-
-          .pk-on {
-            display: inline-block;
-            height: 32px;
-            width: 32px;
-            margin-left: 10px;
-            margin-right: 10px;
-            margin-top: 5px;
-            background: url('~@/assets/newHome/pk-on.png');
-            cursor: pointer;
-          }
-
-          .sc {
-            // margin-top: 4px;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-
-            .sc-down {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-down.png');
-            }
-
-            .sc-on {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-on.png');
-            }
-          }
-
-          .ant-btn {
-            background: transparent;
-            background: #0058e1;
-            color: white;
-            width: 80px;
-            height: 32px;
-            font-weight: 600;
-            border-radius: 2px;
-            text-align: center;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-left: 10px;
-          }
-
-          .ant-btn:last-child {
-            background: #0058e1;
-            color: white;
-          }
-        }
-      }
-
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 10px;
-        align-items: center;
-
-        & > div {
-          display: flex;
-          align-items: center;
-
-          & > div {
-            margin: 0 10px;
-          }
-        }
-
-        .pingfen {
-          :deep(span) {
-            display: flex;
-            align-items: center;
-
-            :deep(ul) {
               display: flex;
               align-items: center;
 
-              :deep(.ant-rate-star:not(:last-child)) {
+              .sc-down {
-                margin-right: 4px;
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-down.png');
+              }
+
+              .sc-on {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-on.png');
+              }
+            }
+
+            .ant-btn {
+              background: transparent;
+              background: #0058e1;
+              color: white;
+              width: 80px;
+              height: 32px;
+              font-weight: 600;
+              border-radius: 2px;
+              text-align: center;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-left: 10px;
+            }
+
+            .ant-btn:last-child {
+              background: #0058e1;
+              color: white;
+            }
+          }
+        }
+
+        .bottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 10px;
+          align-items: center;
+
+          & > div {
+            display: flex;
+            align-items: center;
+
+            & > div {
+              margin: 0 10px;
+            }
+          }
+
+          .pingfen {
+            :deep(span) {
+              display: flex;
+              align-items: center;
+
+              :deep(ul) {
+                display: flex;
+                align-items: center;
+
+                :deep(.ant-rate-star:not(:last-child)) {
+                  margin-right: 4px;
+                }
               }
             }
           }
         }
       }
-    }
 
-    .item:nth-of-type(1) {
+      .item:nth-of-type(1) {
-      margin-top: 0;
+        margin-top: 0;
+      }
     }
   }
-}
 </style>

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -162,7 +162,7 @@
     } else {
       let type = paramsGetResources.type
       if (type == '基础设施') {
-        selectInfrastructureList().then((res) => {
+          selectInfrastructureList().then((res) => {
           console.log('基础设施==========>', res.data.data)
           for (const key in res.data.data) {
             jcList.value.push({