Merge branch 'hi-ucs-dev' into release

# Conflicts: # front/public/static/config/basicConfig.js
2022-10-22 11:10:07 +08:00 · 2022-10-22 11:10:07 +08:00 · 25763b72e3
parent 6da86d7340 30328e575d
commit 25763b72e3
4 changed files with 2346 additions and 2018 deletions
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@ -1,8 +1,13 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-20 16:20:17
+<<<<<<< HEAD
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-22 11:09:56
+=======
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-22 11:08:16
+>>>>>>> hi-ucs-dev
 * @Description: 系统静态参数配置
 */
 var _global = {}
@ -85,8 +90,8 @@ var CONFIGITEM = {
        userPwd: '',
      },
      backUrl: 'http://localhost:8001',
-      previewUrl: 'http://192.168.124.236:9796/',
-      websocketURL: '192.168.124.233:8888/renren-admin',
+      previewUrl: 'http://192.168.124.243:9796/',
+      websocketURL: '192.168.124.243:8888/renren-admin',
      // websocketURL: '10.18.1.99:8889/renren-admin',
      POI_URL:
        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
--- a/front/src/views/cimSpecialArea/components/algorithm.vue
+++ b/front/src/views/cimSpecialArea/components/algorithm.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-08-19 10:00:16
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-19 15:55:05
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-21 17:29:46
 * @Description: 告诉大家这是什么
 -->
 <template>
@ -42,46 +42,49 @@
  }
 </script>
 <style lang="less" scoped>
-  .algorithm {
-    padding: 0.7rem 1.05rem 0.5rem;
-    .header {
-      padding-bottom: 0.15rem;
-      border-bottom: 1px solid #bdbdbd;
-      font-size: 30px;
-      font-weight: 600;
-    }
-    .main {
-      padding: 0 0.93rem;
+.algorithm {
+  padding: 0.7rem 1.05rem 0.5rem;
+  .header {
+    padding-bottom: 0.15rem;
+    border-bottom: 1px solid #bdbdbd;
+    font-size: 30px;
+    font-weight: 600;
+  }
+  .main {
+    padding: 0 0.93rem;
+    display: flex;
+    flex-wrap: wrap;
+    .item {
+      width: 3.39rem;
+      height: 1rem;
+      border: 2px solid #7dbbff;
+      border-radius: 0.2rem;
+      margin: 0.3rem 0.2rem 0;
      display: flex;
-      flex-wrap: wrap;
-      .item {
-        width: 3.39rem;
-        height: 1rem;
-        border: 2px solid #7dbbff;
-        border-radius: 0.2rem;
-        margin: 0.3rem 0.2rem 0;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 0.41rem 0.4rem;
-        transition: all 0.5s;
-        .name {
-          font-size: 26px;
-          color: #7dbbff;
-        }
-        .img {
-          width: 0.57rem;
-          height: 0.57rem;
-          background: url('~@/assets/cimSpecialArea/zj.png') no-repeat;
-          background-size: 100%;
-        }
+      justify-content: space-between;
+      align-items: center;
+      padding: 0.41rem 0.4rem;
+      transition: all 0.5s;
+      .name {
+        font-size: 26px;
+        color: #7dbbff;
+        max-height: 26px;
+        line-height: 26px;
+        overflow: hidden;
      }
-      .item:hover {
-        cursor: pointer;
-        width: 3.45rem;
-        height: 1.1rem;
-        margin: 0.25rem 0.17rem -0.05rem;
+      .img {
+        width: 0.57rem;
+        height: 0.57rem;
+        background: url('~@/assets/cimSpecialArea/zj.png') no-repeat;
+        background-size: 100%;
      }
    }
+    .item:hover {
+      cursor: pointer;
+      width: 3.45rem;
+      height: 1.1rem;
+      margin: 0.25rem 0.17rem -0.05rem;
+    }
  }
+}
 </style>
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -262,7 +262,7 @@
        </div>
      </div>
      <div class="top-content-father">
-        <infrastructurePage ref="camera" :searchValue="searchValue" :searchType="searchType"  />
+        <infrastructurePage ref="camera" :searchValue="searchValue" :searchType="searchType" />
      </div>
    </div>
    <div class="top" v-else>
@ -320,6 +320,7 @@
        </div>
      </div>
      <div class="top-content-father" :key="listKey">
+        <!-- todo -->
        <template v-if="
          Cardsname == '组件服务' ||
          Cardsname == '应用资源' ||
@ -409,7 +410,7 @@
      <div class="resultListSearchInput-father" style="background: unset">
        <div class="resultListSearchInput-son">
          模糊搜索
-          <a-input-search v-model:value="searchValue"   placeholder="请输入关键词" enter-button="搜索" size="large"
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
          <button class="button-reset" @click="chongzhi()">重置</button>
        </div>
@ -493,12 +494,13 @@ export default defineComponent({
    const pageSizeOptions = ref(['5', '10', '20', '50'])
    const router = useRouter()
    let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
-    const select2 = router.currentRoute.value.query.select
-    const type2 = router.currentRoute.value.query.type
-    const queryName=ref('')
+    console.log('select------------>', select);
+    // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
+    const selectSubType = router.currentRoute.value.query.type || ''
+    const queryName = ref('')
    const str = router.currentRoute.value.query.str
    const searchValue = ref(str)
-    const searchType= ref(str)
+    const searchType = ref(str)
    let tecHnosphere = router.currentRoute.value.query.tecHnosphere
    let appLiCation = router.currentRoute.value.query.appLiCation
    const Cardsname = ref(select)
@ -588,7 +590,7 @@ export default defineComponent({
    const tagFlag = ref('')
    const current = ref(5)
    const chagneTag = (name) => {
-      console.log('name------------>', name)
+      console.log('name----chagneTag-------->', name)
      paramsGetResources.pageNum = 1
      currentPage.value = 1
      if (tagFlag.value == name) {
@ -685,7 +687,7 @@ export default defineComponent({
      }

      ListContent.records.forEach((val) => {
-       
+
        if (!val) {
          return
        }
@ -693,7 +695,7 @@ export default defineComponent({
          paramsGetResources.infoList = paramsGetResources.infoList.filter(
            (item) => item.attrType !== name
          )
-      
+
          if (
            val.selectedTags &&
            val.selectedTags.indexOf(tag.dict_label) == -1
@ -803,34 +805,35 @@ export default defineComponent({
        ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
        ListContent.records = []
        ListContent.records = JSON.parse(JSON.stringify(dataCopy))
-        if(select2=='组件服务'){
-            queryName.value='组件类型'
-           }else if(select2=='应用资源'){
-            queryName.value='应用领域'
-           }else{
-            queryName.value=''
-           }
+        if (select == '组件服务') {
+          queryName.value = '组件类型'
+        } else if (select == '应用资源') {
+          queryName.value = '应用领域'
+        } else {
+          queryName.value = ''
+        }
        ListContent.records.forEach((val) => {
-           
-           if (!val) {
-             return
-           }
-           if (val.name === queryName.value ) {
-             if (
-               val.selectedTags &&
-               val.selectedTags.indexOf(type2) == -1
-             ) {
-               val.selectedTags = [type2]
-             } else {
-               val.selectedTags &&
-                 val.selectedTags.splice(
-                   val.selectedTags.indexOf(type2),
-                   1
-                 )
-             }
-   
-           }
-         })
+
+          if (!val) {
+            return
+          }
+          // todo
+          if (val.name === queryName.value) {
+            if (
+              val.selectedTags &&
+              val.selectedTags.indexOf(selectSubType) == -1
+            ) {
+              val.selectedTags = [selectSubType]
+              // changeShrink(queryName.value)
+            } else {
+              val.selectedTags &&
+                val.selectedTags.splice(
+                  val.selectedTags.indexOf(selectSubType),
+                  1
+                )
+            }
+          }
+        })
        // 智能算法-特殊处理
        if (whoShow1.value.itShowXiHaiAn) {
          if (!storageSearchInfo) {
@ -891,7 +894,7 @@ export default defineComponent({
    // 校验
    const re = /^[0-9\u4E00-\u9FA5]*$/
    const getAppResources2 = () => {
- 
+
      globalFlag.value = false
      if (
        whoShow1.value.itShowQingDao &&
@ -1258,6 +1261,29 @@ export default defineComponent({
      )
    }

+
+    // 判断是否存在二级类型（首页-能力分类-图层服务）查询条件
+    const judgeHasSubSelectType = () => {
+      if (selectSubType) {
+            paramsGetResources.infoList = []
+          if (select == '组件服务') {
+            queryName.value = '组件类型'
+          } else if (select == '应用资源') {
+            queryName.value = '应用领域'
+          } else if (select == '基础设施') {
+            searchType.value = selectSubType
+          } else {
+            queryName.value = selectSubType
+            searchType.value = ''
+          }
+          let info = { attrType: queryName.value, attrValue: selectSubType }
+            paramsGetResources.infoList.push(info)
+          }
+          // changeShrink(queryName.value)
+          paramsGetResources.type = select
+          console.log('paramsGetResources---onMounted--------->', paramsGetResources);
+    }
+
    onMounted(() => {
      // 从本地读取查询条件，赋值
      handleSetSearchData()
@ -1266,27 +1292,12 @@ export default defineComponent({
      // 获取筛选条件
      getNewList()
      if (!tecHnosphere && !appLiCation) {
-        if (searchValue.value && !select2) {
+        if (searchValue.value && !select) {
          globalSearch()
        } else {
-           paramsGetResources.infoList=[]
-           if(select2=='组件服务'){
-            queryName.value='组件类型'
-           }else if(select2=='应用资源'){
-            queryName.value='应用领域'
-           }else if(select2=='基础设施'){
-            searchType.value=type2
-          }else{
-            queryName.value=type2
-            searchType.value=''
-           }
-           let info={attrType:queryName.value, attrValue: type2}
-          paramsGetResources.infoList.push(info)
-          paramsGetResources.type=select2
+          judgeHasSubSelectType()
          getAppResources2()
-         
-         
-      listKey.value++
+          listKey.value++
        }
      }
    })
@ -1316,6 +1327,7 @@ export default defineComponent({
    })

    const changeShrink = (name) => {
+      console.log('name---changeShrink--------->', name);
      ListContent.records.forEach((val) => {
        if (val.name === name) {
          console.log(val)
@ -1325,8 +1337,8 @@ export default defineComponent({
    }
    const changeCards = (name) => {
      // 西海岸-特殊处理
-      if(whoShow1.value.itShowXiHaiAn) {
-        if(name !== '基础设施' && !xhaHasPermissionUser.list.includes(user.value.username)) {
+      if (whoShow1.value.itShowXiHaiAn) {
+        if (name !== '基础设施' && !xhaHasPermissionUser.list.includes(user.value.username)) {
          return message.warn('暂无权限')
        }
      }
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue