From 44da94a71eafdb22f13127bad2e4c5c5c6088a83 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Fri, 21 Oct 2022 16:35:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=80=E5=B1=9E=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/AbilityToApplyFor.vue | 13 ++++++++-----
 front/src/views/home/apply.vue             |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index eedf7caf..a5741a02 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -126,7 +126,13 @@
     title="已申请摄像头列表"
     @ok="videoVisible = false"
   >
-  <a-select placeholder="请选择归属部门"  v-model:value="deptName" :getPopupContainer="(triggerNode) => triggerNode.parentNode" show-search  option-filter-prop="children" :filterOption="filterOption" @change="deptIdChangeFunction">
+  <a-select placeholder="请选择归属部门" 
+                  style="width: 200px" 
+                  v-model:value="deptName" 
+                   :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
+                     show-search 
+                     :filterOption="true"  
+                     @change="deptIdChangeFunction">
                     <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
                       {{ item.name }}
                     </a-select-option>
@@ -204,6 +210,7 @@
   const showItem = (id, type, delFlag, note1) => {
     if (type == '基础设施') {
       let arr = JSON.parse(note1);
+      //console.log('arrarr====',arr);
       xVideoList.value = []
       arr.map((val) => {
         xVideoList.value.push({
@@ -244,10 +251,6 @@
         })
     } 
       getDeptAllData(); 
-    //select搜索过滤
-    const filterOption = (input, option) => {
-    return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  }
 </script>
 
 <style scoped lang="less">
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 1c1b8e18..149a45e9 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -88,6 +88,9 @@
                     v-else
                     placeholder="请选择归属部门"
                     v-model:value="formName.unit"
+                    :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
+                    show-search 
+                     :filterOption="true" 
                     @change="deptIdChangeFunction"
                   >
                     <a-select-option

From 67574732c76a55e6f8a09a000e752f6624923241 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Fri, 21 Oct 2022 16:45:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/utils/request.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index 03239f01..dfcce28a 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -161,14 +161,14 @@ instance.interceptors.response.use(
     console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
 
-    const { response, message } = error
+    const { response, myMessage } = error
     if (error.response) {
       console.log('接口返回', response)
       console.log('接口返回headers', response.headers)
       console.log('接口返回REDIRECT', response.headers.redirect)
       const { status, data } = response
 
-      handleCode(status, data.msg || message, response.headers.redirect)
+      handleCode(status, data.msg || myMessage, response.headers.redirect)
       if (response.headers.token) {
         setAccessToken(response.headers.token)
       }
@@ -179,18 +179,18 @@ instance.interceptors.response.use(
 
       return Promise.reject(error)
     } else {
-      let { message } = error
-      if (message === 'Network Error') {
-        message = '后端接口连接异常'
+      // let { message } = error
+      if (error.message === 'Network Error') {
+        error.message = '后端接口连接异常'
       }
-      if (message.includes('timeout')) {
-        message = '后端接口请求超时'
+      if (error.message.includes('timeout')) {
+        error.message = '后端接口请求超时'
       }
-      if (message.includes('Request failed with status code')) {
-        const code = message.substr(message.length - 3)
-        message = '后端接口' + code + '异常'
+      if (error.message.includes('Request failed with status code')) {
+        const code = error.message.substr(error.message.length - 3)
+        error.message = '后端接口' + code + '异常'
       }
-      message.error(message || `后端接口未知异常`)
+      message.error(error.message || `后端接口未知异常`)
       return Promise.reject(error)
     }
   }

From f4a53c91b149058db05c0199581c392984bac6e3 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 21 Oct 2022 17:00:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 126 ++++++++++---------
 1 file changed, 69 insertions(+), 57 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 49d2ed6f..b4bfc172 100644
--- 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('暂无权限')
         }
       }