前台、后台搜索页搜索时重新请求各tab项总数、服务tab项下各项的数量

src/pages/homepage/components/searchPage.vue

@@ -155,6 +155,15 @@
 
 <script>
 import api from "@/api/homepage/search.js";
+const resourceTypeMap = {
+  first: 'theme',
+  second: 'specialSubject',
+  third: 'index',
+  fourth: 'service'
+}
+const tabNames = {
+  first: '主题库', second: '专题库',third: '指标', fourth: '服务'
+}
 export default {
   data() {
     return {
@@ -202,24 +211,22 @@ export default {
       this.getSearchData()
     },
     jumpToDetailPage(id) {
-      const resourceTypeMap = {
+      const resourceTypeMapA = {
         first: 'theme',
         second: 'special',
         third: 'target',
         fourth: this.serviceType === 'API' ? 'api' : 'message'
       }
-      let type = resourceTypeMap[this.activeName]
+      let type = resourceTypeMapA[this.activeName]
       this.$router.push({
         name: "entityDetail",
         path: "/entityDetail",
-        query: {
-          id: id,
-          type
-        }
+        query: {id: id, type}
       });
     },
     handleSearch() {
-      this.getSearchData()
+      this.initData()
+      this.getMenu()
     },
     getCardClass() {
       let ret = 'entity-card'
@@ -239,12 +246,6 @@ export default {
       this.cancelCollect([id])
     },
     cancelCollect(ids) {
-      const resourceTypeMap = {
-        first: 'theme',
-        second: 'specialSubject',
-        third: 'index',
-        fourth: 'service'
-      }
       const params = {resourceType: resourceTypeMap[this.activeName], resourceIds: ids,}
       api.deleteCollect(params).then(res => {
         if (res.success) {
@@ -272,14 +273,10 @@ export default {
     handleUp() {
       console.log('up')
     },
-    // 初始化tablist 数据，并请求每个tab项的总数
+    // 1.初始化tablist 数据，2.请求每个tab项包含数据的总数, 3.请求右侧列表数据
     initData() {
-      let tabList = [
-        {name: '主题库',id: 'first'},
-        {name: '专题库',id: 'second'},
-        {name: '指标',id: 'third'},
-        {name: '服务',id: 'fourth'}
-      ]
+      let tabList = [{name: '主题库',id: 'first'}, {name: '专题库',id: 'second'},
+        {name: '指标',id: 'third'}, {name: '服务',id: 'fourth'}]
       if (this.$route.query.pageType === 'theme') {
         tabList = [{ name: '主题库', id: 'first' }]
         this.activeName = 'first'
@@ -302,17 +299,10 @@ export default {
       }
       this.tabList = tabList
       if (this.pageType === 'all') {
-        api.esItemDataNum({resourceType: 'theme', shelvesType: '1'}).then(res => {
-          this.tabList[0].name = `主题库(${res.data})`
-        })
-        api.esItemDataNum({resourceType: 'specialSubject', shelvesType: '1'}).then(res => {
-          this.tabList[1].name = `专题库(${res.data})`
-        })
-        api.esItemDataNum({resourceType: 'index', shelvesType: '1'}).then(res => {
-          this.tabList[2].name = `指标(${res.data})`
-        })
-        api.esItemDataNum({resourceType: 'service', shelvesType: '1'}).then(res => {
-          this.tabList[3].name = `服务(${res.data})`
+        this.tabList.map((item, index) => {
+          api.esItemDataNum({resourceType: resourceTypeMap[item.id], shelvesType: '1', menuId: this.menuId, keyword: this.searchWords}).then(res => {
+            this.tabList[index].name = `${tabNames[item.id]}(${res.data})`
+          })
         })
       }
       if (this.pageType === 'collect') {
@@ -321,30 +311,15 @@ export default {
       this.getSearchData()
     },
     getCollectTabTotal() {
-      api.collectMenuDataNum({resourceType: 'theme'}).then(res => {
-        this.tabList[0].name = `主题库(${res.data})`
-      })
-      api.collectMenuDataNum({resourceType: 'specialSubject'}).then(res => {
-        this.tabList[1].name = `专题库(${res.data})`
-      })
-      api.collectMenuDataNum({resourceType: 'index'}).then(res => {
-        this.tabList[2].name = `指标(${res.data})`
-      })
-      api.collectMenuDataNum({resourceType: 'service'}).then(res => {
-        this.tabList[3].name = `服务(${res.data})`
+      this.tabList.map((item, index) => {
+        api.collectMenuDataNum({resourceType: resourceTypeMap[item.id], menuId: this.menuId, resourceName: this.searchWords}).then(res => {
+          this.tabList[index].name = `${tabNames[item.id]}(${res.data})`
+        })
       })
     },
+    // 获取树形列表数据，并在tab选项为服务时请求所有树形数据项对应包含的数据条数
     getMenu() {
-      const params = {resourceType: 'theme'}
-      if (this.activeName === 'second') {
-        params.resourceType = 'specialSubject'
-      }
-      if (this.activeName === 'third') {
-        params.resourceType = 'index'
-      }
-      if (this.activeName === 'fourth') {
-        params.resourceType = 'service'
-      }
+      const params = {resourceType: resourceTypeMap[this.activeName]}
       api.menuInfo(params).then(res => {
         if (res.success) {
           this.data = res.data
@@ -361,21 +336,18 @@ export default {
       this.getSearchData()
     },
     getSearchData() {
+      const resourceTypeMapB = {
+        first: 'theme',
+        second: 'specialSubject',
+        third: 'index',
+        fourth: this.serviceType === 'API' ? 'api' : 'mqs'
+      }
       const params = {
-        resourceType: 'theme', pageNum: this.currentPage, 
+        resourceType: resourceTypeMapB[this.activeName], pageNum: this.currentPage, 
         pageSize: this.pageSize, menuId: this.menuId,
         keyword: this.searchWords,
         shelvesType: '1'
       }
-      if (this.activeName === 'second') {
-        params.resourceType = 'specialSubject'
-      }
-      if (this.activeName === 'third') {
-        params.resourceType = 'index'
-      }
-      if (this.activeName === 'fourth') {
-        params.resourceType = this.serviceType === 'API' ? 'api' : 'mqs'
-      }
       if (this.pageType === 'collect') {
         params.shelvesType = undefined
         params.keyword = undefined
@@ -414,12 +386,14 @@ export default {
       }
     },
     getServiceStatNum() {
-      let params = {resourceType: 'api', shelvesType: '1'}
+      let params = {resourceType: 'api', shelvesType: '1', menuId: this.menuId, keyword: this.searchWords}
       if (this.serviceType === 'MQ') {
         params.resourceType = 'mqs'
       }
       if (this.pageType === 'collect') {
         params.shelvesType = undefined
+        params.keyword = undefined
+        params.resourceName = this.searchWords
         api.collectMenuStatNum(params).then(res => {
           this.handleMenuStatNumRes(res)
         })
@@ -448,22 +422,22 @@ export default {
       this.currentPage = 1
     },
     getThemeTotal() {
-      api.esItemDataNum({resourceType: 'theme', shelvesType: '1'}).then(res => {
+      api.esItemDataNum({resourceType: 'theme', shelvesType: '1', menuId: this.menuId, keyword: this.searchWords}).then(res => {
         this.tabList[0].name = `主题库(${res.data})`
       })
     },
     getSpecialTotal() {
-      api.esItemDataNum({resourceType: 'specialSubject', shelvesType: '1'}).then(res => {
+      api.esItemDataNum({resourceType: 'specialSubject', shelvesType: '1', menuId: this.menuId, keyword: this.searchWords}).then(res => {
         this.tabList[0].name = `专题库(${res.data})`
       })
     },
     getIndexTotal() {
-      api.esItemDataNum({resourceType: 'index', shelvesType: '1'}).then(res => {
+      api.esItemDataNum({resourceType: 'index', shelvesType: '1', menuId: this.menuId, keyword: this.searchWords}).then(res => {
         this.tabList[0].name = `指标(${res.data})`
       })
     },
     getServiceTotal() {
-      api.esItemDataNum({resourceType: 'service', shelvesType: '1'}).then(res => {
+      api.esItemDataNum({resourceType: 'service', shelvesType: '1', menuId: this.menuId, keyword: this.searchWords}).then(res => {
         this.tabList[0].name = `服务(${res.data})`
       })
     }

src/pages/index/components/searchPage.vue

@@ -258,17 +258,19 @@ export default {
       this.getSearchData()
     },
     getEveryTabTotal() {
-      api.esItemDataNum({resourceType: 'theme'}).then(res => {
-        this.tabList[0].name = `主题库(${res.data})`
-      })
-      api.esItemDataNum({resourceType: 'specialSubject'}).then(res => {
-        this.tabList[1].name = `专题库(${res.data})`
-      })
-      api.esItemDataNum({resourceType: 'index'}).then(res => {
-        this.tabList[2].name = `指标(${res.data})`
-      })
-      api.esItemDataNum({resourceType: 'service'}).then(res => {
-        this.tabList[3].name = `服务(${res.data})`
+      const resourceTypeMap = {
+        first: 'theme',
+        second: 'specialSubject',
+        third: 'index',
+        fourth: 'service'
+      }
+      const tabNames = {
+        first: '主题库', second: '专题库',third: '指标', fourth: '服务'
+      }
+      this.tabList.map((item, index) => {
+        api.esItemDataNum({resourceType: resourceTypeMap[item.id], menuId: this.menuId, keyword: this.searchWords}).then(res => {
+          this.tabList[index].name = `${tabNames[item.id]}(${res.data})`
+        })
       })
     },
     handleNodeClick(data) {
@@ -284,26 +286,22 @@ export default {
       this.getSearchData()
     },
     jumpToDetailPage(id) {
-      let type = 'theme'
-      if (this.activeName === 'second') {
-        type = 'special'
-      }
-      if (this.activeName === 'third') {
-        type = 'target'
-      }
-      if (this.activeName === 'fourth') {
-        type = this.serviceType === 'API' ? 'api' : 'message'
+      const resourceTypeMap = {
+        first: 'theme',
+        second: 'special',
+        third: 'target',
+        fourth: this.serviceType === 'API' ? 'api' : 'message'
       }
+      let type = resourceTypeMap[this.activeName]
       this.$router.push({
         name: "entityDetail",
         path: "/entityDetail",
-        query: {
-          id: id,
-          type
-        }
+        query: {id: id, type}
       });
     },
     handleSearch() {
+      this.getEveryTabTotal()
+      this.getMenu()
       this.getSearchData()
     },
     getCardClass() {
@@ -322,7 +320,7 @@ export default {
       } else {
         this.selectIds = this.selectIds.filter(item => item !== id)
       }
-      console.log('selectIds', this.selectIds)
+      // console.log('selectIds', this.selectIds)
     },
     handleDown(id) {
       const params = this.getListingParam()
@@ -345,16 +343,13 @@ export default {
       })
     },
     getMenu() {
-      const params = {resourceType: 'theme'}
-      if (this.activeName === 'second') {
-        params.resourceType = 'specialSubject'
-      }
-      if (this.activeName === 'third') {
-        params.resourceType = 'index'
-      }
-      if (this.activeName === 'fourth') {
-        params.resourceType = 'service'
+      const resourceTypeMap = {
+        first: 'theme',
+        second: 'specialSubject',
+        third: 'index',
+        fourth: 'service'
       }
+      const params = {resourceType: resourceTypeMap[this.activeName]}
       api.menuInfo(params).then(res => {
         if (res.success) {
           this.data = res.data
@@ -371,20 +366,17 @@ export default {
       this.getSearchData()
     },
     getSearchData() {
+      const resourceTypeMap = {
+        first: 'theme',
+        second: 'specialSubject',
+        third: 'index',
+        fourth: this.serviceType === 'API' ? 'api' : 'mqs'
+      }
       const params = {
-        resourceType: 'theme', pageNum: this.currentPage, 
+        resourceType: resourceTypeMap[this.activeName], pageNum: this.currentPage, 
         pageSize: this.pageSize, menuId: this.menuId,
         keyword: this.searchWords
       }
-      if (this.activeName === 'second') {
-        params.resourceType = 'specialSubject'
-      }
-      if (this.activeName === 'third') {
-        params.resourceType = 'index'
-      }
-      if (this.activeName === 'fourth') {
-        params.resourceType = this.serviceType === 'API' ? 'api' : 'mqs'
-      }
       api.searchData(params).then(res => {
         if(res.success) {
           this.total = res.data.total
@@ -403,7 +395,7 @@ export default {
       })
     },
     getServiceStatNum() {
-      let params = {resourceType: 'api'}
+      let params = {resourceType: 'api', menuId: this.menuId, keyword: this.searchWords}
       if (this.serviceType === 'MQ') {
         params.resourceType = 'mqs'
       }
@@ -422,16 +414,13 @@ export default {
       })
     },
     getListingParam() {
-      const params = {resourceType: 'theme', resourceIds: this.selectIds,}
-      if (this.activeName === 'second') {
-        params.resourceType = 'specialSubject'
-      }
-      if (this.activeName === 'third') {
-        params.resourceType = 'index'
-      }
-      if (this.activeName === 'fourth') {
-        params.resourceType = this.serviceType === 'API' ? 'api' : 'mqs'
+      const resourceTypeMap = {
+        first: 'theme',
+        second: 'specialSubject',
+        third: 'index',
+        fourth: this.serviceType === 'API' ? 'api' : 'mqs'
       }
+      const params = {resourceType: resourceTypeMap[this.activeName], resourceIds: this.selectIds}
       return params
     },
     // 批量上架