diff --git a/front/src/global/GlobalConfig.js b/front/src/global/GlobalConfig.js
index dcee9c52..b3d218e3 100644
--- a/front/src/global/GlobalConfig.js
+++ b/front/src/global/GlobalConfig.js
@@ -505,3 +505,6 @@ export const RECOURCE_G_ICON = {
   resourceProtection:
     '/src/assets/resourceManageMap/pic/point-resettlement-circle.png',
 }
+
+// 能力集市-默认选中tab
+export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = '应用资源'
diff --git a/front/src/views/capacitySquare/index.vue b/front/src/views/capacitySquare/index.vue
index dddb0bb7..8f3d993e 100644
--- a/front/src/views/capacitySquare/index.vue
+++ b/front/src/views/capacitySquare/index.vue
@@ -26,6 +26,8 @@
   import layer from './components/layer.vue'
   import application from './components/application.vue'
   import { useRouter } from 'vue-router'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  
   const router = useRouter()
   const abilityToType = router.currentRoute.value.query.abilityToType
   const show = ref('algorithm')
@@ -47,7 +49,8 @@
     const newpage = router.resolve({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
     window.location.href = newpage.href
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 5279f043..f7cc45a0 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -787,528 +787,428 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
-  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-  import {
-    selectDicStoreAll,
-    pageWithAttrs,
-    getDataResource,
-    getIntegrationServicesList,
-    getCountByFuzzyQuery,
-  } from '@/api/home.js'
-  import { getSgcList } from '@/api/personalCenter'
-  import { useRouter } from 'vue-router'
-  import HomeHeader from '@/views/home/components/header'
-  import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
-  import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
-  // 数据资源引用
-  import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
-  // 基础设施引用
-  import infrastructurePage from '@/views/home/infrastructurePage.vue'
-  import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
-  import { message } from 'ant-design-vue'
-  import {
-    titleNameArray,
-    keyongziyuanqingkaungArray,
-    shujuziyuanqingkuangArray,
-  } from './constantData/showData.js'
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+import {
+  selectDicStoreAll,
+  pageWithAttrs,
+  getDataResource,
+  getIntegrationServicesList,
+  getCountByFuzzyQuery,
+} from '@/api/home.js'
+import { getSgcList } from '@/api/personalCenter'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
+// 数据资源引用
+import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
+// 基础设施引用
+import infrastructurePage from '@/views/home/infrastructurePage.vue'
+import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
+import { message } from 'ant-design-vue'
+import {
+  titleNameArray,
+  keyongziyuanqingkaungArray,
+  shujuziyuanqingkuangArray,
+} from './constantData/showData.js'
 
-  export default defineComponent({
-    setup() {
-      //会议室传的标识6
-      const flag = ref('')
+export default defineComponent({
+  setup() {
+    //会议室传的标识6
+    const flag = ref('')
 
-      const handleAdd = (value) => {
-        flag.value = value
+    const handleAdd = (value) => {
+      flag.value = value
+    }
+    const titleName = ref(titleNameArray)
+
+    const openMonitor = () => {
+      window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
+    }
+    // 模糊查询
+    const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
+    const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
+
+    // 西海岸数据资源页
+    // const dataShowbt = ref(whoShow.itshow)
+    // 青岛数据资源页
+    const whoShow1 = ref(whoShow)
+    // 分页
+    const loading = ref(true)
+    const currentPage = ref(1)
+    const currentPageSize = ref(5)
+    const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const router = useRouter()
+    let select = router.currentRoute.value.query.select || '组件服务'
+    const select2 = router.currentRoute.value.query.select
+    const str = router.currentRoute.value.query.str
+    const searchValue = ref(str)
+    let tecHnosphere = router.currentRoute.value.query.tecHnosphere
+    let appLiCation = router.currentRoute.value.query.appLiCation
+    const Cardsname = ref(select)
+    // 刷新筛选条件组件
+    let listKey = ref(0)
+    // 刷新筛选列表信息组件
+    const listKey2 = ref(0)
+    // 储存筛选条件状态
+    const state = reactive({
+      selectedTags: [],
+      diyici: [],
+    })
+    // 查询参数
+    const paramsGetResources = {
+      districtId: '',
+      deptIds: [],
+      pageNum: 1,
+      pageSize: currentPageSize.value,
+      type: Cardsname.value,
+      name: '',
+      infoList: [],
+      orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      orderType: 'DESC', // ASC 升序  DESC 降序
+    }
+    //西海岸查询参数
+    let paramsGetResources2 = ref({
+      regionId: '70be8c5b664f4bcf869d82f2e8335051',
+      pageNum: 1,
+      pageSize: currentPageSize.value,
+      name: '',
+    })
+    // 查询
+    const onSearch = () => {
+      loading.value = true
+      paramsGetResources.name = searchValue.value
+      currentPage.value = 1
+    }
+    // 免批
+    const tagFlag = ref('')
+    // 视频资源
+    const stateTags = ref(['在线', '离线'])
+    const selStateTags = ref([])
+    const handleChangeStateTag = (tag, checked) => {
+      loading.value = true
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      paramsGetResources.infoList = paramsGetResources.infoList.filter(
+        (item) => item.attrType !== 'status'
+      )
+      if (checked) {
+        selStateTags.value = [tag]
+        paramsGetResources.infoList.push({
+          attrType: 'status',
+          attrValue: tag == '在线' ? 1 : 0,
+        })
+      } else {
+        selStateTags.value = selStateTags.value.filter((t) => t !== tag)
       }
-      const titleName = ref(titleNameArray)
-
-      const openMonitor = () => {
-        window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
+      getAppResources()
+      console.log(tag, checked)
+    }
+    const selBqTags = ref([])
+    const handleChangeBqTags = (tag, checked) => {
+      loading.value = true
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      paramsGetResources.infoList = paramsGetResources.infoList.filter(
+        (item) => item.attrType !== 'labelName'
+      )
+      if (checked) {
+        selBqTags.value = [tag]
+        paramsGetResources.infoList.push({
+          attrType: 'labelName',
+          attrValue: tag,
+        })
+      } else {
+        selBqTags.value = selBqTags.value.filter((t) => t !== tag)
       }
-      // 模糊查询
-      const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
-      const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
+      getAppResources()
+    }
+    const current = ref(5)
+    const chagneTag = (name) => {
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      if (tagFlag.value == name) {
+        tagFlag.value = ''
+        paramsGetResources.shareCondition = ''
+      } else {
+        tagFlag.value = name
+        paramsGetResources.shareCondition = name
+      }
+      listKey.value++
+      getAppResources()
+    }
 
-      // 西海岸数据资源页
-      // const dataShowbt = ref(whoShow.itshow)
-      // 青岛数据资源页
-      const whoShow1 = ref(whoShow)
-      // 分页
-      const loading = ref(true)
-      const currentPage = ref(1)
-      const currentPageSize = ref(5)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
-      const router = useRouter()
-      let select = router.currentRoute.value.query.select || '组件服务'
-      const select2 = router.currentRoute.value.query.select
-      const str = router.currentRoute.value.query.str
-      const searchValue = ref(str)
-      let tecHnosphere = router.currentRoute.value.query.tecHnosphere
-      let appLiCation = router.currentRoute.value.query.appLiCation
-      const Cardsname = ref(select)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-      // 储存筛选条件状态
-      const state = reactive({
-        selectedTags: [],
-        diyici: [],
+    // 重置数据
+    const chongzhi = (flag) => {
+      loading.value = true
+      // 重置模糊查字段
+      if (!flag) {
+        searchValue.value = ''
+        globalFlag.value = false
+        globalData.data = []
+      }
+      paramsGetResources.name = searchValue.value
+      // 重置筛选条件
+      ListContent.records.forEach((val) => {
+        val.selectedTags = []
       })
-      // 查询参数
-      const paramsGetResources = {
-        districtId: '',
-        deptIds: [],
-        pageNum: 1,
-        pageSize: currentPageSize.value,
-        type: Cardsname.value,
-        name: '',
-        infoList: [],
-        orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-        orderType: 'DESC', // ASC 升序  DESC 降序
-      }
-      //西海岸查询参数
-      let paramsGetResources2 = ref({
+      // 分页
+      currentPage.value = 1
+      currentPageSize.value = 5
+      // 重置查询条件
+      paramsGetResources2.value = {
         regionId: '70be8c5b664f4bcf869d82f2e8335051',
         pageNum: 1,
         pageSize: currentPageSize.value,
         name: '',
-      })
-      // 查询
-      const onSearch = () => {
-        loading.value = true
-        paramsGetResources.name = searchValue.value
-        currentPage.value = 1
-      }
-      // 免批
-      const tagFlag = ref('')
-      // 视频资源
-      const stateTags = ref(['在线', '离线'])
-      const selStateTags = ref([])
-      const handleChangeStateTag = (tag, checked) => {
-        loading.value = true
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        paramsGetResources.infoList = paramsGetResources.infoList.filter(
-          (item) => item.attrType !== 'status'
-        )
-        if (checked) {
-          selStateTags.value = [tag]
-          paramsGetResources.infoList.push({
-            attrType: 'status',
-            attrValue: tag == '在线' ? 1 : 0,
-          })
-        } else {
-          selStateTags.value = selStateTags.value.filter((t) => t !== tag)
-        }
-        getAppResources()
-        console.log(tag, checked)
-      }
-      const selBqTags = ref([])
-      const handleChangeBqTags = (tag, checked) => {
-        loading.value = true
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        paramsGetResources.infoList = paramsGetResources.infoList.filter(
-          (item) => item.attrType !== 'labelName'
-        )
-        if (checked) {
-          selBqTags.value = [tag]
-          paramsGetResources.infoList.push({
-            attrType: 'labelName',
-            attrValue: tag,
-          })
-        } else {
-          selBqTags.value = selBqTags.value.filter((t) => t !== tag)
-        }
-        getAppResources()
-      }
-      const current = ref(5)
-      const chagneTag = (name) => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        if (tagFlag.value == name) {
-          tagFlag.value = ''
-          paramsGetResources.shareCondition = ''
-        } else {
-          tagFlag.value = name
-          paramsGetResources.shareCondition = name
-        }
-        listKey.value++
-        getAppResources()
       }
+      paramsGetResources.districtId = ''
+      paramsGetResources.deptIds = []
+      paramsGetResources.pageNum = 1
+      paramsGetResources.pageSize = 5
+      paramsGetResources.name = ''
+      paramsGetResources.shareCondition = ''
+      paramsGetResources.infoList = []
+      paramsGetResources.orderField = ''
+      paramsGetResources.orderType = 'DESC'
+      mybus.emit('chongzhi')
+      getAppResources()
+    }
 
-      // 重置数据
-      const chongzhi = (flag) => {
-        loading.value = true
-        // 重置模糊查字段
-        if (!flag) {
-          searchValue.value = ''
-          globalFlag.value = false
-          globalData.data = []
+    //跳转链接
+    function dianjitiaozhaun(name) {
+      switch (name) {
+        case '青岛市政务资源管理平台':
+          window.open('http://15.72.158.81/web/root/homepage.aspx')
+          console.log('name', name)
+          break
+        case '青岛市视频资源管理平台':
+          window.open('http://15.72.183.88:8760/yzy/main')
+          console.log('name', name)
+          break
+      }
+    }
+
+    // 点击筛选条件回调
+    const handleChange = (tag, checked, name) => {
+      loading.value = true
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      console.log('点击筛选条件=================>', tag, checked, name)
+      ListContent.records.forEach((val) => {
+        if (val.name === name) {
+          paramsGetResources.infoList = paramsGetResources.infoList.filter(
+            (item) => item.attrType !== name
+          )
+          if (val.selectedTags.indexOf(tag.dict_label) == -1) {
+            val.selectedTags = [tag.dict_label]
+            paramsGetResources.infoList.push({
+              attrType: name,
+              attrValue: tag.dict_label,
+            })
+          } else {
+            val.selectedTags.splice(val.selectedTags.indexOf(tag.dict_label), 1)
+          }
         }
-        paramsGetResources.name = searchValue.value
-        // 重置筛选条件
+      })
+      listKey.value++
+      getAppResources()
+    }
+    const getNewList = () => {
+      tecHnosphere = router.currentRoute.value.query.tecHnosphere
+      appLiCation = router.currentRoute.value.query.appLiCation
+      const params = {
+        topCategoryName: Cardsname.value,
+      }
+      selectDicStoreAll(params).then((res) => {
+        console.log('selectDicStoreAll============>', res)
+        const { data } = res.data
+        ListContent.records = []
+        ListContent.records = data
+        tecHnosphere = router.currentRoute.value.query.tecHnosphere
+        appLiCation = router.currentRoute.value.query.appLiCation
+        mybus.emit('getDeptList')
         ListContent.records.forEach((val) => {
           val.selectedTags = []
-        })
-        // 分页
-        currentPage.value = 1
-        currentPageSize.value = 5
-        // 重置查询条件
-        paramsGetResources2.value = {
-          regionId: '70be8c5b664f4bcf869d82f2e8335051',
-          pageNum: 1,
-          pageSize: currentPageSize.value,
-          name: '',
-        }
-        paramsGetResources.districtId = ''
-        paramsGetResources.deptIds = []
-        paramsGetResources.pageNum = 1
-        paramsGetResources.pageSize = 5
-        paramsGetResources.name = ''
-        paramsGetResources.shareCondition = ''
-        paramsGetResources.infoList = []
-        paramsGetResources.orderField = ''
-        paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi')
-        getAppResources()
-      }
-
-      //跳转链接
-      function dianjitiaozhaun(name) {
-        switch (name) {
-          case '青岛市政务资源管理平台':
-            window.open('http://15.72.158.81/web/root/homepage.aspx')
-            console.log('name', name)
-            break
-          case '青岛市视频资源管理平台':
-            window.open('http://15.72.183.88:8760/yzy/main')
-            console.log('name', name)
-            break
-        }
-      }
-
-      // 点击筛选条件回调
-      const handleChange = (tag, checked, name) => {
-        loading.value = true
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        console.log('点击筛选条件=================>', tag, checked, name)
-        ListContent.records.forEach((val) => {
-          if (val.name === name) {
-            paramsGetResources.infoList = paramsGetResources.infoList.filter(
-              (item) => item.attrType !== name
-            )
-            if (val.selectedTags.indexOf(tag.dict_label) == -1) {
-              val.selectedTags = [tag.dict_label]
-              paramsGetResources.infoList.push({
-                attrType: name,
-                attrValue: tag.dict_label,
-              })
-            } else {
-              val.selectedTags.splice(
-                val.selectedTags.indexOf(tag.dict_label),
-                1
-              )
+          if (val.name == '应用领域' && appLiCation) {
+            val.selectedTags[0] = []
+            val.selectedTags[0] = appLiCation
+            paramsGetResources.infoList.push({
+              attrType: '应用领域',
+              attrValue: appLiCation,
+            })
+            if (searchValue.value) {
+              paramsGetResources.name = searchValue.value
             }
+            pageWithAttrs(paramsGetResources).then((res) => {
+              resourceList.data = []
+              resourceList.data = res.data.data.records || []
+              resourceTotal.value = res.data.data.total || ''
+            })
+          }
+          tecHnosphere = router.currentRoute.value.query.tecHnosphere
+          appLiCation = router.currentRoute.value.query.appLiCation
+          if (val.name == '技术领域' && tecHnosphere) {
+            val.selectedTags[1] = tecHnosphere
+            paramsGetResources.infoList.push({
+              attrType: '技术领域',
+              attrValue: tecHnosphere,
+            })
+            if (searchValue.value) {
+              paramsGetResources.name = searchValue.value
+            }
+            pageWithAttrs(paramsGetResources).then((res) => {
+              resourceList.data = []
+              resourceList.data = res.data.data.records || []
+              resourceTotal.value = res.data.data.total || ''
+            })
+            console.log('paramsGetResources', paramsGetResources)
+          }
+          tecHnosphere = router.currentRoute.value.query.tecHnosphere
+          appLiCation = router.currentRoute.value.query.appLiCation
+          if (val.typeList && val.typeList.length > 8) {
+            val.showShrink = true
+            val.shrinkFlag = true
           }
         })
         listKey.value++
+        listKey2.value++
+      })
+      console.log('selectDicStoreAll', ListContent)
+    }
+    // 筛选条件
+    let ListContent = reactive({
+      records: [],
+    })
+    const resourceList = reactive({ data: [] })
+    const videoList = reactive({ data: [] })
+    const resourceTotal = ref('')
+    // 全局搜索
+    const camera = ref(null)
+    const globalData = reactive({ data: [] })
+    const globalFlag = ref(false)
+    const globalSearch = () => {
+      if (searchValue.value) {
+        globalFlag.value = true
+        getCountByFuzzyQuery(searchValue.value || '').then((res) => {
+          console.log('全局搜索==========》', res.data.data)
+          globalData.data = res.data.data
+          let mapFlag = true
+          res.data.data.map((val) => {
+            if (mapFlag && val.count != 0) {
+              mapFlag = false
+              changeCards(val.type)
+            }
+          })
+          if (!mapFlag) {
+            return
+          }
+          if (paramsGetResources.type == '基础设施') {
+            console.log('camera1', camera.value)
+            camera.value.getCamera(true, searchValue.value)
+          } else {
+            getAppResources()
+          }
+        })
+      } else {
+        message.warning('全局搜索必须输入关键词！')
+      }
+    }
+    // 校验
+    const re = /^[0-9\u4E00-\u9FA5]*$/
+    const getAppResources2 = () => {
+      globalFlag.value = false
+      if (
+        whoShow1.value.itShowQingDao &&
+        paramsGetResources.type == '基础设施'
+      ) {
+        console.log('camera2', camera)
+        camera.value.getCamera(true, searchValue.value)
+      } else {
         getAppResources()
       }
-      const getNewList = () => {
-        tecHnosphere = router.currentRoute.value.query.tecHnosphere
-        appLiCation = router.currentRoute.value.query.appLiCation
-        const params = {
-          topCategoryName: Cardsname.value,
-        }
-        selectDicStoreAll(params).then((res) => {
-          console.log('selectDicStoreAll============>', res)
-          const { data } = res.data
-          ListContent.records = []
-          ListContent.records = data
-          tecHnosphere = router.currentRoute.value.query.tecHnosphere
-          appLiCation = router.currentRoute.value.query.appLiCation
-          mybus.emit('getDeptList')
-          ListContent.records.forEach((val) => {
-            val.selectedTags = []
-            if (val.name == '应用领域' && appLiCation) {
-              val.selectedTags[0] = []
-              val.selectedTags[0] = appLiCation
-              paramsGetResources.infoList.push({
-                attrType: '应用领域',
-                attrValue: appLiCation,
-              })
-              if (searchValue.value) {
-                paramsGetResources.name = searchValue.value
-              }
-              pageWithAttrs(paramsGetResources).then((res) => {
-                resourceList.data = []
-                resourceList.data = res.data.data.records || []
-                resourceTotal.value = res.data.data.total || ''
-              })
-            }
-            tecHnosphere = router.currentRoute.value.query.tecHnosphere
-            appLiCation = router.currentRoute.value.query.appLiCation
-            if (val.name == '技术领域' && tecHnosphere) {
-              val.selectedTags[1] = tecHnosphere
-              paramsGetResources.infoList.push({
-                attrType: '技术领域',
-                attrValue: tecHnosphere,
-              })
-              if (searchValue.value) {
-                paramsGetResources.name = searchValue.value
-              }
-              pageWithAttrs(paramsGetResources).then((res) => {
-                resourceList.data = []
-                resourceList.data = res.data.data.records || []
-                resourceTotal.value = res.data.data.total || ''
-              })
-              console.log('paramsGetResources', paramsGetResources)
-            }
-            tecHnosphere = router.currentRoute.value.query.tecHnosphere
-            appLiCation = router.currentRoute.value.query.appLiCation
-            if (val.typeList && val.typeList.length > 8) {
-              val.showShrink = true
-              val.shrinkFlag = true
-            }
-          })
-          listKey.value++
-          listKey2.value++
-        })
-        console.log('selectDicStoreAll', ListContent)
+    }
+    const getAppResources = (switchIndex) => {
+      if (!globalFlag.value) {
+        globalData.data = []
       }
-      // 筛选条件
-      let ListContent = reactive({
-        records: [],
-      })
-      const resourceList = reactive({ data: [] })
-      const videoList = reactive({ data: [] })
-      const resourceTotal = ref('')
-      // 全局搜索
-      const camera = ref(null)
-      const globalData = reactive({ data: [] })
-      const globalFlag = ref(false)
-      const globalSearch = () => {
-        if (searchValue.value) {
-          globalFlag.value = true
-          getCountByFuzzyQuery(searchValue.value || '').then((res) => {
-            console.log('全局搜索==========》', res.data.data)
-            globalData.data = res.data.data
-            let mapFlag = true
-            res.data.data.map((val) => {
-              if (mapFlag && val.count != 0) {
-                mapFlag = false
-                changeCards(val.type)
-              }
-            })
-            if (!mapFlag) {
-              return
-            }
-            if (paramsGetResources.type == '基础设施') {
-              console.log('camera1', camera.value)
-              camera.value.getCamera(true, searchValue.value)
-            } else {
-              getAppResources()
-            }
-          })
-        } else {
-          message.warning('全局搜索必须输入关键词！')
-        }
-      }
-      // 校验
-      const re = /^[0-9\u4E00-\u9FA5]*$/
-      const getAppResources2 = () => {
-        globalFlag.value = false
-        if (
-          whoShow1.value.itShowQingDao &&
-          paramsGetResources.type == '基础设施'
-        ) {
-          console.log('camera2', camera)
-          camera.value.getCamera(true, searchValue.value)
-        } else {
-          getAppResources()
-        }
-      }
-      const getAppResources = (switchIndex) => {
-        if (!globalFlag.value) {
-          globalData.data = []
-        }
-        select = router.currentRoute.value.query.select
-        console.log(
-          'url中的select',
-          router.currentRoute.value.query.select,
-          select == '应用资源' &&
-            (paramsGetResources.orderField == '' ||
-              paramsGetResources.orderField == 'deptSort' ||
-              paramsGetResources.orderField == 'pin_top'),
+      select = router.currentRoute.value.query.select
+      console.log(
+        'url中的select',
+        router.currentRoute.value.query.select,
+        select == '应用资源' &&
+          (paramsGetResources.orderField == '' ||
+            paramsGetResources.orderField == 'deptSort' ||
+            paramsGetResources.orderField == 'pin_top'),
+        paramsGetResources.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0] &&
           paramsGetResources.infoList.filter(
             (val) => val.attrType == '组件类型'
-          )[0] &&
-            paramsGetResources.infoList.filter(
-              (val) => val.attrType == '组件类型'
-            )[0].attrValue == '图层服务' &&
-            (paramsGetResources.orderField == '' ||
-              paramsGetResources.orderField == 'deptSort' ||
-              paramsGetResources.orderField == 'pin_top')
-        )
-        if (
-          (select == '应用资源' &&
-            (paramsGetResources.orderField == '' ||
-              paramsGetResources.orderField == 'deptSort' ||
-              paramsGetResources.orderField == 'pin_top')) ||
-          (paramsGetResources.infoList.filter(
-            (val) => val.attrType == '组件类型'
-          )[0] &&
-            paramsGetResources.infoList.filter(
-              (val) => val.attrType == '组件类型'
-            )[0].attrValue == '图层服务' &&
-            (paramsGetResources.orderField == '' ||
-              paramsGetResources.orderField == 'deptSort' ||
-              paramsGetResources.orderField == 'pin_top'))
-        ) {
-          paramsGetResources.orderField = 'deptSort'
-        } else if (
-          paramsGetResources.infoList.filter(
-            (val) => val.attrType == '组件类型'
-          )[0] &&
-          paramsGetResources.infoList.filter(
-            (val) => val.attrType == '组件类型'
-          )[0].attrValue == '智能算法' &&
+          )[0].attrValue == '图层服务' &&
           (paramsGetResources.orderField == '' ||
             paramsGetResources.orderField == 'deptSort' ||
             paramsGetResources.orderField == 'pin_top')
-        ) {
-          paramsGetResources.orderField = 'pin_top'
-        } else if (
-          paramsGetResources.orderField == '' ||
+      )
+      if (
+        (select == '应用资源' &&
+          (paramsGetResources.orderField == '' ||
+            paramsGetResources.orderField == 'deptSort' ||
+            paramsGetResources.orderField == 'pin_top')) ||
+        (paramsGetResources.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0] &&
+          paramsGetResources.infoList.filter(
+            (val) => val.attrType == '组件类型'
+          )[0].attrValue == '图层服务' &&
+          (paramsGetResources.orderField == '' ||
+            paramsGetResources.orderField == 'deptSort' ||
+            paramsGetResources.orderField == 'pin_top'))
+      ) {
+        paramsGetResources.orderField = 'deptSort'
+      } else if (
+        paramsGetResources.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0] &&
+        paramsGetResources.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0].attrValue == '智能算法' &&
+        (paramsGetResources.orderField == '' ||
           paramsGetResources.orderField == 'deptSort' ||
-          paramsGetResources.orderField == 'pin_top'
+          paramsGetResources.orderField == 'pin_top')
+      ) {
+        paramsGetResources.orderField = 'pin_top'
+      } else if (
+        paramsGetResources.orderField == '' ||
+        paramsGetResources.orderField == 'deptSort' ||
+        paramsGetResources.orderField == 'pin_top'
+      ) {
+        paramsGetResources.orderField = ''
+      }
+      if (searchValue.value) {
+        let str = ''
+        let r = null
+        console.log(
+          '2222222222222222222222222222',
+          searchValue.value,
+          searchValue.value.length
+        )
+        if (
+          searchValue.value.length >= 2 &&
+          paramsGetResources.type !== '基础设施'
         ) {
-          paramsGetResources.orderField = ''
+          str = searchValue.value.substring(0, 2)
+          console.log('str================>', str)
+          r = re.test(str)
         }
-        if (searchValue.value) {
-          let str = ''
-          let r = null
-          console.log(
-            '2222222222222222222222222222',
-            searchValue.value,
-            searchValue.value.length
-          )
-          if (
-            searchValue.value.length >= 2 &&
-            paramsGetResources.type !== '基础设施'
-          ) {
-            str = searchValue.value.substring(0, 2)
-            console.log('str================>', str)
-            r = re.test(str)
-          }
-          if (
-            (searchValue.value.length > 1 && r) ||
-            paramsGetResources.type === '基础设施'
-          ) {
-            //switchIndex这个参数是下面的分页传过来的参数
-            paramsGetResources.name = searchValue.value
-            paramsGetResources.type = Cardsname.value
-            console.log(
-              '执行getAppResources====================》',
-              paramsGetResources
-            )
-            if (
-              !whoShow1.value.itShowBaoTou &&
-              paramsGetResources.type === '数据资源'
-            ) {
-              if (switchIndex != '分页查询') {
-                paramsGetResources.pageNum = 1
-              }
-              let dataResourceParams = {
-                serviceName: paramsGetResources.name || '', //资源名称
-                orderField: whoShow1.value.itShowQingDao
-                  ? paramsGetResources.orderField == 'applyCount'
-                    ? 'syqk'
-                    : 'fbrq'
-                  : paramsGetResources.orderField == 'applyCount'
-                  ? 'requestCount'
-                  : 'createTime', //排序字段
-                orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-                pageNum: paramsGetResources.pageNum, //页码
-                pageSize: paramsGetResources.pageSize, //分页大小
-              }
-              getDataResource(dataResourceParams).then((res) => {
-                if (whoShow1.value.itShowQingDao) {
-                  res.data.data.data.forEach((val) => {
-                    val.id = val.guid // id
-                    val.name = val.zyname // 名字
-                    val.sjlCount = val.sjcczl // 数据量
-                    val.applyCount = val.syqk // 申请量
-                    val.deptName = val.TGBM // 部门
-                    val.createDate = val.fbrq // 发布时间
-                    val.description = val.xgxt // 描述
-                  })
-                  resourceList.data = res.data.data.data || []
-                  resourceTotal.value = res.data.data.rows || ''
-                  loading.value = false
-                } else if (whoShow1.value.itShowXiHaiAn) {
-                  res.data.data.list.forEach((val) => {
-                    val.id = val.serviceId // id
-                    val.name = val.serviceName // 名字
-                    val.sjlCount = val.requestQuantity // 数据量
-                    val.applyCount = val.requestCount // 申请量
-                    val.deptName = val.departmentName // 部门
-                    val.createTime = val.createTime.split('.')[0]
-                    val.createDate = val.createTime // 发布时间
-                  })
-                  resourceList.data = res.data.data.list || []
-                  resourceTotal.value = res.data.data.total || ''
-                  loading.value = false
-                }
-              })
-            } else if (
-              paramsGetResources.type !== '数据资源' &&
-              (paramsGetResources.type !== '基础设施' ||
-                !whoShow1.value.itShowXiHaiAn)
-            ) {
-              if (switchIndex != '分页查询') {
-                paramsGetResources.pageNum = 1
-              }
-              pageWithAttrs(paramsGetResources).then((res) => {
-                console.log(
-                  '查询列表============>',
-                  resourceList,
-                  res.data.data
-                )
-                resourceList.data = []
-                videoList.data = []
-                if (Cardsname.value === '基础设施') {
-                  resourceList.data = res.data.data.records || []
-                  resourceTotal.value = res.data.data.total || ''
-                  loading.value = false
-                } else {
-                  resourceTotal.value = res.data.data.total || ''
-                  resourceList.data = res.data.data.records || []
-                  // getShoppingCartList(res.data.data.records)
-                }
-              })
-            } else if (
-              paramsGetResources.type === '基础设施' &&
-              whoShow1.value.itShowXiHaiAn
-            ) {
-              if (switchIndex != '分页查询') {
-                paramsGetResources.pageNum = 1
-              }
-              paramsGetResources2.value.pageNum = paramsGetResources.pageNum
-              paramsGetResources2.value.pageSize = paramsGetResources.pageSize
-              paramsGetResources2.value.name = paramsGetResources.name
-            }
-          } else {
-            message.error('请以两位以上汉字或数字开头')
-          }
-        } else {
+        if (
+          (searchValue.value.length > 1 && r) ||
+          paramsGetResources.type === '基础设施'
+        ) {
           //switchIndex这个参数是下面的分页传过来的参数
           paramsGetResources.name = searchValue.value
           paramsGetResources.type = Cardsname.value
@@ -1388,7 +1288,7 @@
               }
             })
           } else if (
-            paramsGetResources.type === '基础设施' ||
+            paramsGetResources.type === '基础设施' &&
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -1396,901 +1296,992 @@
             }
             paramsGetResources2.value.pageNum = paramsGetResources.pageNum
             paramsGetResources2.value.pageSize = paramsGetResources.pageSize
+            paramsGetResources2.value.name = paramsGetResources.name
           }
-        }
-      }
-
-      let shoppingCartList = ref([])
-      // 获取申购车列表
-      const getShoppingCartList = (list) => {
-        getSgcList({
-          pageNum: 1,
-          pageSize: 500,
-          name: '',
-          type: '',
-        }).then((res) => {
-          console.log('申购车列表================>', res.data.data.records)
-          shoppingCartList.value = res.data.data.records
-          // list.map((item) => {
-          //   item.isInShoppingCart = false
-          //   item.isInShoppingCart = shoppingCartList.value.some((item2) => {
-          //     return item.id === item2.resourceId
-          //   })
-          // })
-          console.log('经过过滤后的列表信息', list)
-          resourceList.data = list
-        })
-      }
-      mybus.on('getCameraByParentId', (ids) => {
-        paramsGetResources2.value.regionId = ids
-        getAppResources()
-      })
-      mybus.on('paramsGetResources', (ids) => {
-        if (ids && ids.length > 0) {
-          paramsGetResources.deptIds = ids
         } else {
-          delete paramsGetResources.deptIds
+          message.error('请以两位以上汉字或数字开头')
         }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
-        console.log('changePage', paramsGetResources.pageNum)
-        getAppResources('分页查询')
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changeSelcted', () => {
-        // 添加申购车后，返回第一页
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        getAppResources()
-      })
-      mybus.on('changeInfo', (info) => {
-        paramsGetResources.pageNum = 1
-        console.log('paramsGetResources.infoList', paramsGetResources.infoList)
-        paramsGetResources.infoList = paramsGetResources.infoList.filter(
-          (item) => item.attrType !== '文件类型'
-        )
-        if (info) {
-          paramsGetResources.infoList.push(info)
-        }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        getAppResources()
-      })
-      mybus.on('changeCondition', (condition) => {
-        // 回到第一页，分页页码为1
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-        // orderType: 'ASC'  ASC 升序  DESC 降序
-        paramsGetResources.orderField = condition.orderField
-        paramsGetResources.orderType = condition.orderType
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
-        currentPage.value = val
-        paramsGetResources.pageNum = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
-      }
-
-      onMounted(() => {
-        listKey2.value++
-
-        // 获取筛选条件
-        getNewList()
-
-        if (!tecHnosphere && !appLiCation) {
-          if (searchValue.value && !select2) {
-            globalSearch()
-          } else {
-            getAppResources2()
-          }
-        }
-      })
-      // 全部申请
-      const applyAll = () => {
-        router.push({
-          path: '/apply',
-          query: {
-            applyAll: true,
-          },
-        })
-      }
-      // 分页
-      const onShowSizeChange = (current, pageSize) => {
-        currentPage.value = current
-        currentPageSize.value = pageSize
-        paramsGetResources.pageNum = current
-        paramsGetResources.pageSize = pageSize
-        console.log('执行onShowSizeChange', paramsGetResources)
-        getAppResources()
-      }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
-      })
-
-      const changeShrink = (name) => {
-        ListContent.records.forEach((val) => {
-          if (val.name === name) {
-            console.log(val)
-            val.shrinkFlag = !val.shrinkFlag
-          }
-        })
-      }
-      const changeCards = (name) => {
-        resourceList.data = []
-        videoList.data = []
-        resourceTotal.value = ''
-        router.currentRoute.value.query.tecHnosphere = ''
-        router.currentRoute.value.query.appLiCation = ''
-        tecHnosphere = router.currentRoute.value.query.tecHnosphere
-        appLiCation = router.currentRoute.value.query.appLiCation
-        let newQuery = JSON.parse(
-          JSON.stringify(router.currentRoute.value.query)
-        )
-        Cardsname.value = name
+      } else {
+        //switchIndex这个参数是下面的分页传过来的参数
+        paramsGetResources.name = searchValue.value
+        paramsGetResources.type = Cardsname.value
         console.log(
-          '更改前url中的select=====================>',
-          router.currentRoute.value.query.select
+          '执行getAppResources====================》',
+          paramsGetResources
         )
-        newQuery.select = Cardsname.value
-        router
-          .replace({
-            query: newQuery,
+        if (
+          !whoShow1.value.itShowBaoTou &&
+          paramsGetResources.type === '数据资源'
+        ) {
+          if (switchIndex != '分页查询') {
+            paramsGetResources.pageNum = 1
+          }
+          let dataResourceParams = {
+            serviceName: paramsGetResources.name || '', //资源名称
+            orderField: whoShow1.value.itShowQingDao
+              ? paramsGetResources.orderField == 'applyCount'
+                ? 'syqk'
+                : 'fbrq'
+              : paramsGetResources.orderField == 'applyCount'
+              ? 'requestCount'
+              : 'createTime', //排序字段
+            orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+            pageNum: paramsGetResources.pageNum, //页码
+            pageSize: paramsGetResources.pageSize, //分页大小
+          }
+          getDataResource(dataResourceParams).then((res) => {
+            if (whoShow1.value.itShowQingDao) {
+              res.data.data.data.forEach((val) => {
+                val.id = val.guid // id
+                val.name = val.zyname // 名字
+                val.sjlCount = val.sjcczl // 数据量
+                val.applyCount = val.syqk // 申请量
+                val.deptName = val.TGBM // 部门
+                val.createDate = val.fbrq // 发布时间
+                val.description = val.xgxt // 描述
+              })
+              resourceList.data = res.data.data.data || []
+              resourceTotal.value = res.data.data.rows || ''
+              loading.value = false
+            } else if (whoShow1.value.itShowXiHaiAn) {
+              res.data.data.list.forEach((val) => {
+                val.id = val.serviceId // id
+                val.name = val.serviceName // 名字
+                val.sjlCount = val.requestQuantity // 数据量
+                val.applyCount = val.requestCount // 申请量
+                val.deptName = val.departmentName // 部门
+                val.createTime = val.createTime.split('.')[0]
+                val.createDate = val.createTime // 发布时间
+              })
+              resourceList.data = res.data.data.list || []
+              resourceTotal.value = res.data.data.total || ''
+              loading.value = false
+            }
           })
-          .then(() => {
-            console.log(
-              '更改后url中的select=====================>',
-              router.currentRoute.value.query.select
-            )
-            // router.currentRoute.value.query.select
-            tagFlag.value = false
-            chongzhi(true)
-            getNewList()
+        } else if (
+          paramsGetResources.type !== '数据资源' &&
+          (paramsGetResources.type !== '基础设施' ||
+            !whoShow1.value.itShowXiHaiAn)
+        ) {
+          if (switchIndex != '分页查询') {
+            paramsGetResources.pageNum = 1
+          }
+          pageWithAttrs(paramsGetResources).then((res) => {
+            console.log('查询列表============>', resourceList, res.data.data)
+            resourceList.data = []
+            videoList.data = []
+            if (Cardsname.value === '基础设施') {
+              resourceList.data = res.data.data.records || []
+              resourceTotal.value = res.data.data.total || ''
+              loading.value = false
+            } else {
+              resourceTotal.value = res.data.data.total || ''
+              resourceList.data = res.data.data.records || []
+              // getShoppingCartList(res.data.data.records)
+            }
           })
+        } else if (
+          paramsGetResources.type === '基础设施' ||
+          whoShow1.value.itShowXiHaiAn
+        ) {
+          if (switchIndex != '分页查询') {
+            paramsGetResources.pageNum = 1
+          }
+          paramsGetResources2.value.pageNum = paramsGetResources.pageNum
+          paramsGetResources2.value.pageSize = paramsGetResources.pageSize
+        }
       }
-      // 监听地址栏变化
-      window.addEventListener('hashchange', () => {
-        location.reload()
-        console.log('URL发生变化了')
+    }
+
+    let shoppingCartList = ref([])
+    // 获取申购车列表
+    const getShoppingCartList = (list) => {
+      getSgcList({
+        pageNum: 1,
+        pageSize: 500,
+        name: '',
+        type: '',
+      }).then((res) => {
+        console.log('申购车列表================>', res.data.data.records)
+        shoppingCartList.value = res.data.data.records
+        // list.map((item) => {
+        //   item.isInShoppingCart = false
+        //   item.isInShoppingCart = shoppingCartList.value.some((item2) => {
+        //     return item.id === item2.resourceId
+        //   })
+        // })
+        console.log('经过过滤后的列表信息', list)
+        resourceList.data = list
       })
-      // 能力广场
-      const visibleAbilitySquare = ref(false)
-      let abilitySquare = ref(['应用广场', '算法广场', 'GIS广场'])
-      const showAbilitySquareNum = ref(0)
-      const showAbilitySquare = () => {
-        if (showAbilitySquareNum.value === 0) {
-          showAbilitySquareNum.value = 1
-          visibleAbilitySquare.value = true
-        } else if (showAbilitySquareNum.value === 1) {
-          showAbilitySquareNum.value = 0
-          visibleAbilitySquare.value = false
+    }
+    mybus.on('getCameraByParentId', (ids) => {
+      paramsGetResources2.value.regionId = ids
+      getAppResources()
+    })
+    mybus.on('paramsGetResources', (ids) => {
+      if (ids && ids.length > 0) {
+        paramsGetResources.deptIds = ids
+      } else {
+        delete paramsGetResources.deptIds
+      }
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('changePage', (page) => {
+      paramsGetResources.pageNum = page
+      console.log('changePage', paramsGetResources.pageNum)
+      getAppResources('分页查询')
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('changeSelcted', () => {
+      // 添加申购车后，返回第一页
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      getAppResources()
+    })
+    mybus.on('changeInfo', (info) => {
+      paramsGetResources.pageNum = 1
+      console.log('paramsGetResources.infoList', paramsGetResources.infoList)
+      paramsGetResources.infoList = paramsGetResources.infoList.filter(
+        (item) => item.attrType !== '文件类型'
+      )
+      if (info) {
+        paramsGetResources.infoList.push(info)
+      }
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('refresh', () => {
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      getAppResources()
+    })
+    mybus.on('changeCondition', (condition) => {
+      // 回到第一页，分页页码为1
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      // orderType: 'ASC'  ASC 升序  DESC 降序
+      paramsGetResources.orderField = condition.orderField
+      paramsGetResources.orderType = condition.orderType
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    const pageChange = (val) => {
+      console.log(val)
+      loading.value = true
+      currentPage.value = val
+      paramsGetResources.pageNum = val
+      let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      getAppResources(params)
+    }
+
+    onMounted(() => {
+      listKey2.value++
+
+      // 获取筛选条件
+      getNewList()
+
+      if (!tecHnosphere && !appLiCation) {
+        if (searchValue.value && !select2) {
+          globalSearch()
+        } else {
+          getAppResources2()
         }
       }
-      let abilitySquareFunctionData = ref('智能算法')
-      const abilitySquareFunction = (e) => {
-        let snumSquare = ref({})
-        if (e === '应用广场') {
-          abilitySquareFunctionData.value = '应用资源'
-        } else if (e === '算法广场') {
-          abilitySquareFunctionData.value = '智能算法'
-        } else if (e === 'GIS广场') {
-          abilitySquareFunctionData.value = '图层服务'
+    })
+    // 全部申请
+    const applyAll = () => {
+      router.push({
+        path: '/apply',
+        query: {
+          applyAll: true,
+        },
+      })
+    }
+    // 分页
+    const onShowSizeChange = (current, pageSize) => {
+      currentPage.value = current
+      currentPageSize.value = pageSize
+      paramsGetResources.pageNum = current
+      paramsGetResources.pageSize = pageSize
+      console.log('执行onShowSizeChange', paramsGetResources)
+      getAppResources()
+    }
+    watch(currentPageSize, () => {
+      console.log('pageSize', currentPageSize.value)
+    })
+
+    const changeShrink = (name) => {
+      ListContent.records.forEach((val) => {
+        if (val.name === name) {
+          console.log(val)
+          val.shrinkFlag = !val.shrinkFlag
         }
-        snumSquare.value = {
-          abilityToType: abilitySquareFunctionData.value,
-        }
-        const applypage = router.resolve({
-          path: '/capacitySquare', // 跳转的页面路由
-          query: snumSquare.value,
+      })
+    }
+    const changeCards = (name) => {
+      resourceList.data = []
+      videoList.data = []
+      resourceTotal.value = ''
+      router.currentRoute.value.query.tecHnosphere = ''
+      router.currentRoute.value.query.appLiCation = ''
+      tecHnosphere = router.currentRoute.value.query.tecHnosphere
+      appLiCation = router.currentRoute.value.query.appLiCation
+      let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
+      Cardsname.value = name
+      console.log(
+        '更改前url中的select=====================>',
+        router.currentRoute.value.query.select
+      )
+      newQuery.select = Cardsname.value
+      router
+        .replace({
+          query: newQuery,
         })
-        window.open(applypage.href, '_blank')
+        .then(() => {
+          console.log(
+            '更改后url中的select=====================>',
+            router.currentRoute.value.query.select
+          )
+          // router.currentRoute.value.query.select
+          tagFlag.value = false
+          chongzhi(true)
+          getNewList()
+        })
+    }
+    // 监听地址栏变化
+    window.addEventListener('hashchange', () => {
+      location.reload()
+      console.log('URL发生变化了')
+    })
+    // 能力广场
+    const visibleAbilitySquare = ref(false)
+    let abilitySquare = ref(['应用广场', '算法广场', 'GIS广场'])
+    const showAbilitySquareNum = ref(0)
+    const showAbilitySquare = () => {
+      if (showAbilitySquareNum.value === 0) {
+        showAbilitySquareNum.value = 1
+        visibleAbilitySquare.value = true
+      } else if (showAbilitySquareNum.value === 1) {
+        showAbilitySquareNum.value = 0
         visibleAbilitySquare.value = false
+      }
+    }
+    let abilitySquareFunctionData = ref('智能算法')
+    const abilitySquareFunction = (e) => {
+      let snumSquare = ref({})
+      if (e === '应用广场') {
+        abilitySquareFunctionData.value = '应用资源'
+      } else if (e === '算法广场') {
         abilitySquareFunctionData.value = '智能算法'
+      } else if (e === 'GIS广场') {
+        abilitySquareFunctionData.value = '图层服务'
       }
-      return {
-        listKey,
-        ListContent,
-        searchValue,
-        currentPage,
-        ...toRefs(state),
-        changeCards,
-        handleChange,
-        resourceList,
-        videoList,
-        resourceTotal,
-        pageChange,
-        listKey2,
-        Cardsname,
-        getNewList,
-        getAppResources,
-        getAppResources2,
-        chongzhi,
-        onSearch,
-        onShowSizeChange,
-        currentPageSize,
-        pageSizeOptions,
-        changeShrink,
-        titleName,
-        keyongziyuanqingkaung,
-        shujuziyuanqingkuang,
-        dianjitiaozhaun,
-        chagneTag,
-        tagFlag,
-        current,
-        openMonitor,
-        stateTags,
-        selStateTags,
-        handleChangeStateTag,
-        // bqTags,
-        selBqTags,
-        handleChangeBqTags,
-        loading,
-        getShoppingCartList,
-        whoShow1,
-        applyAll,
-        handleAdd,
-        flag,
-        abilitySquare,
-        visibleAbilitySquare,
-        showAbilitySquare,
-        abilitySquareFunction,
-        abilitySquareFunctionData,
-        showAbilitySquareNum,
-        globalData,
-        globalSearch,
-        camera,
+      snumSquare.value = {
+        abilityToType: abilitySquareFunctionData.value,
       }
-    },
-    components: {
-      HomeHeader,
-      HomeFooter,
-      detailsPageconetentTree,
-      searchResultList,
-      UpOutlined,
-      DownOutlined,
-      KnowledgeBase,
-      // VideoCameraOutlined,
-      // VideoSurveillance,
-      DetailsPageResource,
-      infrastructurePage,
-      detailsPageInfrastructureTree,
-    },
-    beforeUnmount() {
-      mybus.off('getCameraByParentId')
-      mybus.off('selectCardsitem')
-      mybus.off('paramsGetResources')
-      mybus.off('changeCondition')
-      mybus.off('refresh')
-      mybus.off('changePage')
-      mybus.off('changeInfo')
-    },
-  })
+      const applypage = router.resolve({
+        path: '/capacitySquare', // 跳转的页面路由
+        query: snumSquare.value,
+      })
+      window.open(applypage.href, '_blank')
+      visibleAbilitySquare.value = false
+      abilitySquareFunctionData.value = '智能算法'
+    }
+    return {
+      listKey,
+      ListContent,
+      searchValue,
+      currentPage,
+      ...toRefs(state),
+      changeCards,
+      handleChange,
+      resourceList,
+      videoList,
+      resourceTotal,
+      pageChange,
+      listKey2,
+      Cardsname,
+      getNewList,
+      getAppResources,
+      getAppResources2,
+      chongzhi,
+      onSearch,
+      onShowSizeChange,
+      currentPageSize,
+      pageSizeOptions,
+      changeShrink,
+      titleName,
+      keyongziyuanqingkaung,
+      shujuziyuanqingkuang,
+      dianjitiaozhaun,
+      chagneTag,
+      tagFlag,
+      current,
+      openMonitor,
+      stateTags,
+      selStateTags,
+      handleChangeStateTag,
+      // bqTags,
+      selBqTags,
+      handleChangeBqTags,
+      loading,
+      getShoppingCartList,
+      whoShow1,
+      applyAll,
+      handleAdd,
+      flag,
+      abilitySquare,
+      visibleAbilitySquare,
+      showAbilitySquare,
+      abilitySquareFunction,
+      abilitySquareFunctionData,
+      showAbilitySquareNum,
+      globalData,
+      globalSearch,
+      camera,
+    }
+  },
+  components: {
+    HomeHeader,
+    HomeFooter,
+    detailsPageconetentTree,
+    searchResultList,
+    UpOutlined,
+    DownOutlined,
+    KnowledgeBase,
+    // VideoCameraOutlined,
+    // VideoSurveillance,
+    DetailsPageResource,
+    infrastructurePage,
+    detailsPageInfrastructureTree,
+  },
+  beforeUnmount() {
+    mybus.off('getCameraByParentId')
+    mybus.off('selectCardsitem')
+    mybus.off('paramsGetResources')
+    mybus.off('changeCondition')
+    mybus.off('refresh')
+    mybus.off('changePage')
+    mybus.off('changeInfo')
+  },
+})
 </script>
 <style lang="less" scoped>
-  @font-face {
-    font-family: 'webfont';
-    src: url('~@/assets/capacitySquare/webfont.ttf');
-  }
-  .resultListSearchInput-father {
-    background: #f3f5f9;
-    padding: 0.2rem;
+@font-face {
+  font-family: 'webfont';
+  src: url('~@/assets/capacitySquare/webfont.ttf');
+}
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
 
-    // padding-left: 0.2rem;
-    // padding-top: 0.2rem;
-    .resultListSearchInput-son {
-      background: #fff;
-      padding: 0.2rem 0.2rem 0rem 0.3rem;
+  // padding-left: 0.2rem;
+  // padding-top: 0.2rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
 
-      .hengxian {
-        width: 100%;
-        height: 0.01rem;
-        background: rgba(150, 144, 144, 0.3);
-        margin-top: 0.2rem;
-      }
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
     }
   }
+}
 
-  .resultListSearchInput {
-    margin-left: 0.1rem;
+.resultListSearchInput {
+  margin-left: 0.1rem;
 
-    :deep(.ant-input) {
-      width: 4rem;
-      height: 0.36rem;
-      background: #fff;
-      border-radius: 0.04rem;
-    }
-
-    :deep(.ant-input-search-button) {
-      width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
-      font-size: 0.14rem;
-      font-weight: 400;
-      color: #fff;
-      line-height: 0.34rem;
-      margin-left: 0.1rem;
-    }
-
-    :deep(.ant-input-group-addon) {
-      left: 0 !important;
-    }
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
   }
 
-  .button-reset {
-    border: 0;
-    outline: none;
+  :deep(.ant-input-search-button) {
     width: 0.8rem;
     height: 0.36rem;
-    background: #e1edfa;
-    border-radius: 0.04rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    color: #fff;
     line-height: 0.34rem;
-    margin-left: 2.5rem;
-    cursor: pointer;
+    margin-left: 0.1rem;
   }
 
-  .details-pageconetent {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 0.67rem;
-    position: relative;
-    background: rgba(245, 243, 243, 0.3);
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
 
-    .details-pageconetent-left {
-      max-height: 6.9rem;
-      position: absolute;
-      width: 2.5rem;
-      top: 0.17rem;
-      left: 2.5rem;
-      margin-right: 0.17rem;
-      overflow: auto;
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
+    position: relative;
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    margin-left: 2.5rem;
+    background: #f3f5f9;
+
+    .pagination {
+      background: #f3f5f9;
+      padding-bottom: 0.6rem;
     }
 
-    .top {
-      min-height: 7.2rem;
-      position: relative;
-      width: 11.5rem;
-      display: flex;
-      padding-top: 0.2rem;
-      flex-direction: column;
-      font-size: 0.16rem;
-      justify-content: left;
-      margin-left: 2.5rem;
-      background: #f3f5f9;
+    .jichusheshi {
+      height: 4.45rem;
 
-      .pagination {
-        background: #f3f5f9;
-        padding-bottom: 0.6rem;
-      }
+      .yunziyuan {
+        width: 100%;
+        position: relative;
 
-      .jichusheshi {
-        height: 4.45rem;
-
-        .yunziyuan {
-          width: 100%;
-          position: relative;
-
-          .shuoming {
-            position: absolute;
-            right: 0.2rem;
-            top: 0.15rem;
-            font-size: 0.12rem;
-          }
-
-          .yunziyuan-title {
-            display: flex;
-            align-items: center;
-
-            .tupian {
-            }
-
-            .title {
-              margin-left: 0.1rem;
-              font-weight: 600;
-              text-decoration: underline;
-              cursor: pointer;
-            }
-          }
-
-          .fenlei {
-            display: flex;
-            margin-left: 0.2rem;
-            margin-right: 0.3rem;
-            justify-content: space-between;
-          }
-
-          .keyongziyuan {
-            display: flex;
-            justify-content: space-between;
-            margin-left: 0.3rem;
-            margin-right: 0.3rem;
-
-            div {
-              display: flex;
-
-              div:last-child {
-                font-weight: 600;
-              }
-            }
-          }
+        .shuoming {
+          position: absolute;
+          right: 0.2rem;
+          top: 0.15rem;
+          font-size: 0.12rem;
         }
 
-        .yunziyuan > div {
-          margin-bottom: 0.1rem;
-        }
-
-        .shipin {
-          width: 100%;
-
-          .shipin-title {
-            display: flex;
-            align-items: center;
-
-            .tupian {
-            }
-
-            .title {
-              margin-left: 0.1rem;
-              font-weight: 600;
-              text-decoration: underline;
-              cursor: pointer;
-            }
-          }
-
-          .fenlei {
-            display: flex;
-            margin-left: 0.2rem;
-
-            div {
-              margin-right: 0.6rem;
-            }
-
-            .shuzi {
-              font-weight: 600;
-            }
-          }
-        }
-
-        .shipin > div {
-          margin-bottom: 0.1rem;
-        }
-      }
-
-      .jichusheshi > div {
-        padding-top: 0.1rem;
-        border-radius: 0.04rem;
-        margin-bottom: 0.2rem;
-        padding-bottom: 0.4rem;
-      }
-
-      .shujuziyuan {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        padding-top: 0.4rem;
-
-        .yunziyuan {
-          width: 100%;
-          position: relative;
-
-          .shuoming {
-            position: absolute;
-            right: 0.2rem;
-            top: 0.15rem;
-            font-size: 0.12rem;
-          }
-
-          .yunziyuan-title {
-            display: flex;
-            align-items: center;
-            margin-left: 0.2rem;
-
-            .tupian {
-            }
-
-            .title {
-              margin-left: 0.1rem;
-              font-weight: 600;
-              text-decoration: underline;
-              cursor: pointer;
-            }
-          }
-
-          .fenlei {
-            display: flex;
-            margin-left: 0.2rem;
-            margin-right: 0.3rem;
-            justify-content: space-between;
-          }
-
-          .keyongziyuan {
-            display: flex;
-            justify-content: space-between;
-            margin-left: 0.3rem;
-            margin-right: 0.3rem;
-
-            div {
-              display: flex;
-
-              div:last-child {
-                font-weight: 600;
-              }
-            }
-          }
-        }
-
-        .yunziyuan > div {
-          margin-bottom: 0.1rem;
-        }
-      }
-
-      .shujuziyuan > div {
-        background: #eaf4ff;
-        padding-top: 0.1rem;
-        border-radius: 0.04rem;
-        margin-bottom: 0.2rem;
-        padding-bottom: 0.4rem;
-      }
-
-      .top-title {
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        font-size: 0.2rem;
-        font-family: 'Alibaba PuHuiTi';
-        color: #000000;
-        line-height: 0.34rem;
-        margin-bottom: 0.2rem;
-        .photo {
-          display: inline-block;
-          height: 0.44rem;
-          width: 0.44rem;
-          margin-right: 0.1rem;
-        }
-
-        div {
-          // margin: 0 0.2rem;
-          padding: 0 0.1rem;
-          cursor: pointer;
+        .yunziyuan-title {
           display: flex;
           align-items: center;
+
+          .tupian {
+          }
+
+          .title {
+            margin-left: 0.1rem;
+            font-weight: 600;
+            text-decoration: underline;
+            cursor: pointer;
+          }
         }
 
-        div:hover {
-          color: #0087ff;
+        .fenlei {
+          display: flex;
+          margin-left: 0.2rem;
+          margin-right: 0.3rem;
+          justify-content: space-between;
         }
 
-        .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
+        .keyongziyuan {
+          display: flex;
+          justify-content: space-between;
+          margin-left: 0.3rem;
+          margin-right: 0.3rem;
+
+          div {
+            display: flex;
+
+            div:last-child {
+              font-weight: 600;
+            }
+          }
         }
       }
 
-      .top-content-father {
-        width: 100%;
-        padding: 0 0.2rem 0.2rem 0.2rem;
-        background: #f3f5f9;
-        margin-bottom: 0.2rem;
+      .yunziyuan > div {
+        margin-bottom: 0.1rem;
+      }
 
-        .top-content-son {
-          background: #fff;
-          padding: 0.2rem 0;
+      .shipin {
+        width: 100%;
+
+        .shipin-title {
+          display: flex;
+          align-items: center;
+
+          .tupian {
+          }
+
+          .title {
+            margin-left: 0.1rem;
+            font-weight: 600;
+            text-decoration: underline;
+            cursor: pointer;
+          }
         }
 
-        .top-content {
+        .fenlei {
           display: flex;
-          margin-top: 0rem;
+          margin-left: 0.2rem;
 
-          span:nth-child(1) {
-            display: inline-block;
-            position: relative;
-            line-height: 0.3614rem;
-            white-space: normal;
-            text-align: center;
-            vertical-align: middle;
+          div {
+            margin-right: 0.6rem;
           }
 
-          .leixingsumfather {
-            width: 8.1rem;
-            display: inline-block;
-            height: 0.3014rem;
-            overflow: hidden;
+          .shuzi {
+            font-weight: 600;
+          }
+        }
+      }
+
+      .shipin > div {
+        margin-bottom: 0.1rem;
+      }
+    }
+
+    .jichusheshi > div {
+      padding-top: 0.1rem;
+      border-radius: 0.04rem;
+      margin-bottom: 0.2rem;
+      padding-bottom: 0.4rem;
+    }
+
+    .shujuziyuan {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      padding-top: 0.4rem;
+
+      .yunziyuan {
+        width: 100%;
+        position: relative;
+
+        .shuoming {
+          position: absolute;
+          right: 0.2rem;
+          top: 0.15rem;
+          font-size: 0.12rem;
+        }
+
+        .yunziyuan-title {
+          display: flex;
+          align-items: center;
+          margin-left: 0.2rem;
+
+          .tupian {
           }
 
-          .leixingsumfather2 {
-            width: 9.2rem;
-          }
-
-          .leixingsum {
-            display: inline-block;
+          .title {
+            margin-left: 0.1rem;
+            font-weight: 600;
+            text-decoration: underline;
             cursor: pointer;
-            text-align: center;
-            margin-top: 0.05rem;
+          }
+        }
 
-            .ant-tag-checkable {
-              width: 0.83rem;
-              height: 0.25rem;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              padding-left: 0.05rem;
-              padding-right: 0.05rem;
-              float: left;
-              margin: 0 0.15rem;
-              font-family: 'AlibabaPuHuiTiR';
-              font-size: 0.14rem;
-              color: #333333;
-              font-weight: 500;
-              text-align: center;
-              line-height: 0.14rem;
-            }
+        .fenlei {
+          display: flex;
+          margin-left: 0.2rem;
+          margin-right: 0.3rem;
+          justify-content: space-between;
+        }
 
-            :deep(.ant-tag-checkable-checked) {
-              margin-left: 0.15rem;
-              margin-right: 0.15rem;
-              text-align: center;
-            }
+        .keyongziyuan {
+          display: flex;
+          justify-content: space-between;
+          margin-left: 0.3rem;
+          margin-right: 0.3rem;
 
-            .ant-tag-checkable:active,
-            .ant-tag-checkable-checked {
-              width: 0.85rem;
-              font-family: 'Alibaba PuHuiTi';
-              font-weight: 500;
-              background-color: #0087ff;
-              color: #ffffff;
-              border-radius: 0.16rem;
+          div {
+            display: flex;
+
+            div:last-child {
+              font-weight: 600;
             }
           }
+        }
+      }
 
-          .active {
-            font-family: Alibaba PuHuiTi;
+      .yunziyuan > div {
+        margin-bottom: 0.1rem;
+      }
+    }
+
+    .shujuziyuan > div {
+      background: #eaf4ff;
+      padding-top: 0.1rem;
+      border-radius: 0.04rem;
+      margin-bottom: 0.2rem;
+      padding-bottom: 0.4rem;
+    }
+
+    .top-title {
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      font-size: 0.2rem;
+      font-family: 'Alibaba PuHuiTi';
+      color: #000000;
+      line-height: 0.34rem;
+      margin-bottom: 0.2rem;
+      .photo {
+        display: inline-block;
+        height: 0.44rem;
+        width: 0.44rem;
+        margin-right: 0.1rem;
+      }
+
+      div {
+        // margin: 0 0.2rem;
+        padding: 0 0.1rem;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+      }
+
+      div:hover {
+        color: #0087ff;
+      }
+
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
+      }
+    }
+
+    .top-content-father {
+      width: 100%;
+      padding: 0 0.2rem 0.2rem 0.2rem;
+      background: #f3f5f9;
+      margin-bottom: 0.2rem;
+
+      .top-content-son {
+        background: #fff;
+        padding: 0.2rem 0;
+      }
+
+      .top-content {
+        display: flex;
+        margin-top: 0rem;
+
+        span:nth-child(1) {
+          display: inline-block;
+          position: relative;
+          line-height: 0.3614rem;
+          white-space: normal;
+          text-align: center;
+          vertical-align: middle;
+        }
+
+        .leixingsumfather {
+          width: 8.1rem;
+          display: inline-block;
+          height: 0.3014rem;
+          overflow: hidden;
+        }
+
+        .leixingsumfather2 {
+          width: 9.2rem;
+        }
+
+        .leixingsum {
+          display: inline-block;
+          cursor: pointer;
+          text-align: center;
+          margin-top: 0.05rem;
+
+          .ant-tag-checkable {
+            width: 0.83rem;
+            height: 0.25rem;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding-left: 0.05rem;
+            padding-right: 0.05rem;
+            float: left;
+            margin: 0 0.15rem;
+            font-family: 'AlibabaPuHuiTiR';
+            font-size: 0.14rem;
+            color: #333333;
+            font-weight: 500;
+            text-align: center;
+            line-height: 0.14rem;
+          }
+
+          :deep(.ant-tag-checkable-checked) {
+            margin-left: 0.15rem;
+            margin-right: 0.15rem;
+            text-align: center;
+          }
+
+          .ant-tag-checkable:active,
+          .ant-tag-checkable-checked {
+            width: 0.85rem;
+            font-family: 'Alibaba PuHuiTi';
             font-weight: 500;
             background-color: #0087ff;
             color: #ffffff;
+            border-radius: 0.16rem;
           }
         }
 
-        .top-content:nth-child(1) {
-          margin-top: 0rem !important;
-        }
-      }
-    }
-  }
-
-  .shrinkTag {
-    width: 0.5rem;
-    display: flex;
-    justify-content: center;
-    align-items: flex-end;
-    margin-bottom: 0.05rem;
-
-    span {
-      cursor: pointer;
-    }
-  }
-
-  .shrink {
-    height: unset !important;
-    overflow: unset !important;
-  }
-
-  .talk-monitor {
-    position: fixed;
-    bottom: 0.5rem;
-    right: 0.1rem;
-    z-index: 9999;
-    cursor: pointer;
-
-    i {
-      width: 0.64rem;
-      height: 0.64rem;
-      display: inline-block;
-      background: url('~@/assets/home/icon-talk.png');
-      background-size: cover;
-    }
-  }
-  .abilitySquare {
-    width: 0.7rem;
-    height: 0.7rem;
-    border-radius: 0.04rem;
-    border: 0.01rem #94aac9 solid;
-    display: flex;
-    flex-direction: column;
-    // justify-content: center;
-    align-items: center;
-    padding-top: 0.05rem;
-    position: fixed;
-    z-index: 10;
-    bottom: 1.56rem;
-    right: 0.1rem;
-    cursor: pointer;
-    background: #e3edfc;
-    p {
-      margin: 0;
-    }
-    p:nth-child(1) {
-      height: 0.35rem;
-      width: 0.36rem;
-      background: url('~@/assets/home/abilitysquare.png') no-repeat;
-      background-size: 100% 100%;
-      background-position: center;
-    }
-    ul {
-      background: #ffffff;
-      font-family: webfont;
-      width: 1.35rem;
-      height: 1rem;
-      border-radius: 0.03rem;
-      border: 0.01rem solid #dfd9d9;
-      position: absolute;
-      bottom: 0.9rem;
-      left: -0.62rem;
-      padding: 0;
-      margin: 0;
-      li {
-        list-style: none;
-        color: #0061ec;
-        font-size: 0.18rem;
-        padding: 0.02rem;
-        padding-left: 0.4rem;
-        border-bottom: 0.01rem solid #dfd9d9;
-      }
-      li:nth-of-type(1) {
-        background: url('~@/assets/home/appIcon.png') no-repeat;
-        background-position: 0.18rem center;
-      }
-      li:nth-of-type(2) {
-        background: url('~@/assets/home/AiIcon.png') no-repeat;
-        background-position: 0.18rem center;
-      }
-      li:nth-of-type(3) {
-        border-bottom: none;
-        background: url('~@/assets/home/GisIcon.png') no-repeat;
-        background-position: 0.18rem center;
-      }
-    }
-    ul::after {
-      content: '';
-      position: absolute;
-      top: 0.98rem;
-      right: 0.12rem;
-      width: 0;
-      height: 0;
-      border: 0.13rem solid;
-      border-color: #fff transparent transparent transparent;
-    }
-    ul::before {
-      content: '';
-      position: absolute;
-      top: 0.99rem;
-      right: 0.12rem;
-      width: 0;
-      height: 0;
-      border: 0.13rem solid;
-      border-color: #dfd9d9 transparent transparent transparent;
-    }
-    @keyframes ulShowTime {
-      0% {
-        transform: scale(0);
-      }
-      100% {
-        transform: scale(0);
-      }
-    }
-  }
-
-  .top-content-father {
-    width: 10.87rem;
-    padding-left: 0.2rem;
-
-    // margin-bottom: .2rem;
-    .top-content {
-      display: flex;
-      margin-top: 0.23rem;
-
-      span:nth-child(1) {
-        display: inline-block;
-        position: relative;
-        width: 0.68rem;
-        font-weight: 600;
-        white-space: normal;
-        text-align: center;
-        vertical-align: middle;
-        font-size: 0.16rem;
-        margin-left: 0.3rem;
-      }
-
-      // .top-content-title {
-      //   top: -0.2rem;
-      // }
-      .leixingsumfather {
-        width: 7.7rem;
-        display: inline-block;
-        height: 0.3014rem;
-        overflow: hidden;
-        // width: 7.18rem;
-      }
-
-      .leixingsum {
-        width: 0.93rem;
-        display: inline-block;
-        cursor: pointer;
-        text-align: center;
-        margin-top: 0.05rem;
-
-        // margin-bottom: .1rem;
-        .ant-tag-checkable {
-          width: 0.85rem;
-          height: 0.25rem;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          padding-left: 0.05rem;
-          padding-right: 0.05rem;
-          float: left;
-          margin: 0 0.15rem;
-          font-family: 'AlibabaPuHuiTiR';
-          font-size: 0.14rem;
-          color: #333333;
-          font-weight: 500;
-          text-align: center;
-          line-height: 0.14rem;
-        }
-
-        :deep(.ant-tag-checkable-checked) {
-          // width: .67rem;
-          margin-left: 0.15rem;
-          margin-right: 0.15rem;
-          text-align: center;
-        }
-
-        .ant-tag-checkable:active,
-        .ant-tag-checkable-checked {
-          width: 0.85rem;
-          font-family: 'Alibaba PuHuiTi';
+        .active {
+          font-family: Alibaba PuHuiTi;
           font-weight: 500;
           background-color: #0087ff;
           color: #ffffff;
-          border-radius: 0.16rem;
         }
       }
 
-      .active {
-        font-family: Alibaba PuHuiTi;
+      .top-content:nth-child(1) {
+        margin-top: 0rem !important;
+      }
+    }
+  }
+}
+
+.shrinkTag {
+  width: 0.5rem;
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  margin-bottom: 0.05rem;
+
+  span {
+    cursor: pointer;
+  }
+}
+
+.shrink {
+  height: unset !important;
+  overflow: unset !important;
+}
+
+.talk-monitor {
+  position: fixed;
+  bottom: 0.5rem;
+  right: 0.1rem;
+  z-index: 9999;
+  cursor: pointer;
+
+  i {
+    width: 0.64rem;
+    height: 0.64rem;
+    display: inline-block;
+    background: url('~@/assets/home/icon-talk.png');
+    background-size: cover;
+  }
+}
+.abilitySquare {
+  width: 0.7rem;
+  height: 0.7rem;
+  border-radius: 0.04rem;
+  border: 0.01rem #94aac9 solid;
+  display: flex;
+  flex-direction: column;
+  // justify-content: center;
+  align-items: center;
+  padding-top: 0.05rem;
+  position: fixed;
+  z-index: 10;
+  bottom: 1.56rem;
+  right: 0.1rem;
+  cursor: pointer;
+  background: #e3edfc;
+  p {
+    margin: 0;
+  }
+  p:nth-child(1) {
+    height: 0.35rem;
+    width: 0.36rem;
+    background: url('~@/assets/home/abilitysquare.png') no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+  }
+  ul {
+    background: #ffffff;
+    font-family: webfont;
+    width: 1.35rem;
+    height: 1rem;
+    border-radius: 0.03rem;
+    border: 0.01rem solid #dfd9d9;
+    position: absolute;
+    bottom: 0.9rem;
+    left: -0.62rem;
+    padding: 0;
+    margin: 0;
+    li {
+      list-style: none;
+      color: #0061ec;
+      font-size: 0.18rem;
+      padding: 0.02rem;
+      padding-left: 0.4rem;
+      border-bottom: 0.01rem solid #dfd9d9;
+    }
+    li:nth-of-type(1) {
+      background: url('~@/assets/home/appIcon.png') no-repeat;
+      background-position: 0.18rem center;
+    }
+    li:nth-of-type(2) {
+      background: url('~@/assets/home/AiIcon.png') no-repeat;
+      background-position: 0.18rem center;
+    }
+    li:nth-of-type(3) {
+      border-bottom: none;
+      background: url('~@/assets/home/GisIcon.png') no-repeat;
+      background-position: 0.18rem center;
+    }
+  }
+  ul::after {
+    content: '';
+    position: absolute;
+    top: 0.98rem;
+    right: 0.12rem;
+    width: 0;
+    height: 0;
+    border: 0.13rem solid;
+    border-color: #fff transparent transparent transparent;
+  }
+  ul::before {
+    content: '';
+    position: absolute;
+    top: 0.99rem;
+    right: 0.12rem;
+    width: 0;
+    height: 0;
+    border: 0.13rem solid;
+    border-color: #dfd9d9 transparent transparent transparent;
+  }
+  @keyframes ulShowTime {
+    0% {
+      transform: scale(0);
+    }
+    100% {
+      transform: scale(0);
+    }
+  }
+}
+
+.top-content-father {
+  width: 10.87rem;
+  padding-left: 0.2rem;
+
+  // margin-bottom: .2rem;
+  .top-content {
+    display: flex;
+    margin-top: 0.23rem;
+
+    span:nth-child(1) {
+      display: inline-block;
+      position: relative;
+      width: 0.68rem;
+      font-weight: 600;
+      white-space: normal;
+      text-align: center;
+      vertical-align: middle;
+      font-size: 0.16rem;
+      margin-left: 0.3rem;
+    }
+
+    // .top-content-title {
+    //   top: -0.2rem;
+    // }
+    .leixingsumfather {
+      width: 7.7rem;
+      display: inline-block;
+      height: 0.3014rem;
+      overflow: hidden;
+      // width: 7.18rem;
+    }
+
+    .leixingsum {
+      width: 0.93rem;
+      display: inline-block;
+      cursor: pointer;
+      text-align: center;
+      margin-top: 0.05rem;
+
+      // margin-bottom: .1rem;
+      .ant-tag-checkable {
+        width: 0.85rem;
+        height: 0.25rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding-left: 0.05rem;
+        padding-right: 0.05rem;
+        float: left;
+        margin: 0 0.15rem;
+        font-family: 'AlibabaPuHuiTiR';
+        font-size: 0.14rem;
+        color: #333333;
+        font-weight: 500;
+        text-align: center;
+        line-height: 0.14rem;
+      }
+
+      :deep(.ant-tag-checkable-checked) {
+        // width: .67rem;
+        margin-left: 0.15rem;
+        margin-right: 0.15rem;
+        text-align: center;
+      }
+
+      .ant-tag-checkable:active,
+      .ant-tag-checkable-checked {
+        width: 0.85rem;
+        font-family: 'Alibaba PuHuiTi';
         font-weight: 500;
         background-color: #0087ff;
         color: #ffffff;
+        border-radius: 0.16rem;
       }
     }
 
-    .top-content:nth-child(1) {
-      margin-top: 0.41rem !important;
+    .active {
+      font-family: Alibaba PuHuiTi;
+      font-weight: 500;
+      background-color: #0087ff;
+      color: #ffffff;
     }
   }
 
-  :deep(.ant-card-grid) {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 1;
-    word-break: break-all;
+  .top-content:nth-child(1) {
+    margin-top: 0.41rem !important;
   }
+}
+
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+}
 </style>
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 4305c07b..d47f4091 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -199,6 +199,8 @@ import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
 import mybus from '@/myplugins/mybus'
 import { sgcDel, getApplyForm } from '@/api/personalCenter'
 import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
 export default {
   name: '',
   props: {},
@@ -336,6 +338,17 @@ export default {
     const resetFields = () => {
       window.history.go(-1)
     }
+
+    // 跳转到能力集市
+    const jumpToDetailsPageconetent = () => {
+      router.push({
+        path: '/DetailsPageconetent',
+        query: {
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        },
+      })
+    }
+
     const processStartHandle = () => {
       debugger
       formRef.value.validate().then(() => {
@@ -408,12 +421,7 @@ export default {
                               sxt = false
                             }
                             mybus.emit('getSgcNum')
-                            router.push({
-                              path: '/DetailsPageconetent',
-                              query: {
-                                select: '组件服务',
-                              },
-                            })
+                            jumpToDetailsPageconetent()
                           }
                         })
                       } else {
@@ -421,12 +429,7 @@ export default {
                           message.success('申请提交成功，请到消息中心查看！')
                           sxt = false
                         }
-                        router.push({
-                          path: '/DetailsPageconetent',
-                          query: {
-                            select: '组件服务',
-                          },
-                        })
+                        jumpToDetailsPageconetent()
                       }
                     })
                   }
@@ -450,12 +453,7 @@ export default {
                       sgcDel({ ids: ids }).then((res) => {
                         if (res.data.msg === 'success') {
                           mybus.emit('getSgcNum')
-                          router.push({
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
+                          jumpToDetailsPageconetent()
                         }
                       })
                     } else {
@@ -463,12 +461,7 @@ export default {
                       if (Object.keys(integrationServicesItemInfo).length > 0) {
                         updateIntegrationServiceAction()
                       }
-                      router.push({
-                        path: '/DetailsPageconetent',
-                        query: {
-                          select: '组件服务',
-                        },
-                      })
+                      jumpToDetailsPageconetent()
                     }
                   } else {
                     message.error('申请失败！')
@@ -483,12 +476,7 @@ export default {
             // 单兵设备为了演示 添加  不做处理
             if (list.value[0].arr[0].type == '单兵设备') {
               message.success('单兵设备申请提交成功！')
-              router.push({
-                path: '/DetailsPageconetent',
-                query: {
-                  select: '组件服务',
-                },
-              })
+              jumpToDetailsPageconetent()
             } else {
               let ids = []
               let falgNum = 0
@@ -550,12 +538,7 @@ export default {
                               sxt = false
                             }
                             mybus.emit('getSgcNum')
-                            router.push({
-                              path: '/DetailsPageconetent',
-                              query: {
-                                select: '组件服务',
-                              },
-                            })
+                            jumpToDetailsPageconetent()
                           }
                         })
                       } else {
@@ -563,12 +546,7 @@ export default {
                           message.success('申请提交成功，请到消息中心查看！')
                           sxt = false
                         }
-                        router.push({
-                          path: '/DetailsPageconetent',
-                          query: {
-                            select: '组件服务',
-                          },
-                        })
+                        jumpToDetailsPageconetent()
                       }
                     })
                   }
@@ -588,12 +566,7 @@ export default {
                       sgcDel({ ids: ids }).then((res) => {
                         if (res.data.msg === 'success') {
                           mybus.emit('getSgcNum')
-                          router.push({
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
+                          jumpToDetailsPageconetent()
                         }
                       })
                     } else {
@@ -601,12 +574,7 @@ export default {
                       if (Object.keys(integrationServicesItemInfo).length > 0) {
                         updateIntegrationServiceAction()
                       }
-                      router.push({
-                        path: '/DetailsPageconetent',
-                        query: {
-                          select: '组件服务',
-                        },
-                      })
+                      jumpToDetailsPageconetent()
                     }
                   } else {
                     message.error('申请失败！')
@@ -619,12 +587,7 @@ export default {
             applyAllApplication(formName).then((res) => {
               if (res.data.code == 0) {
                 message.success('申请提交成功，请到消息中心查看！')
-                router.push({
-                  path: '/DetailsPageconetent',
-                  query: {
-                    select: '组件服务',
-                  },
-                })
+                jumpToDetailsPageconetent()
               } else {
                 message.error('申请失败！')
               }
@@ -663,9 +626,7 @@ export default {
               processDefinitionKey: processDefinitionKey,
               businessKey: businessKey,
             })
-            updateInstanceId(params).then(
-              () => {}
-            )
+            updateInstanceId(params).then(() => {})
           }
         })
         .catch(() => {})
@@ -779,14 +740,15 @@ export default {
         }
       }
     }
- 
+
     onBeforeUnmount(() => {
       mybus.off('reomveOldData')
     })
 
     // 融合服务-更新 todo
     const updateIntegrationServiceAction = () => {
-      let _applyCount = Number(integrationServicesItemInfo.value.applyCount || 0) + 1
+      let _applyCount =
+        Number(integrationServicesItemInfo.value.applyCount || 0) + 1
       let _data = Object.assign({}, integrationServicesItemInfo.value, {
         applyCount: _applyCount,
       })
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 0096d28f..dcb4585f 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -131,43 +131,28 @@
   import { getSgcTotal } from '@/api/home'
   import Cookies from 'js-cookie'
   import mybus from '@/myplugins/mybus'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
   const store = useStore()
   const router = useRouter()
   const route = useRoute()
-  // const navListManagement = ref([
-  //   { name: '共享门户', key: 'home' },
-  //   { name: '能力集市', key: 'DetailsPageconetent' },
-  //   { name: '能力云图', key: 'capabilityCloud' },
-  //   { name: '能力统计', key: 'abilityStatistics' },
-  //   { name: '开发指南', key: 'developmentGuide' },
-  //   { name: '需求中心', key: 'demandCenter' },
-  //   // { name: '个人中心', key: 'personalCenter' },
-  //   { name: '区市站点', key: 'mapTest' },
-  //   // { name: '后台管理', key: 'houtaiguanli' },
-  //   { name: '赋能案例', key: 'assignCase' },
-  // ])
+
   const whoShow1 = whoShow
   const user = ref({
     username: store.getters['user/username'],
   })
-  // user.username.value = store.getters(['user/username'])
   const select = ref(router.currentRoute.value.name)
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
   console.log('navListManagement------------>', navListManagement)
 
-  // eslint-disable-next-line no-undef
   const navList = ref(navListManagement.navList)
   console.log('navList------------>', navList)
 
   const props = defineProps({
     showView: { type: String, default: '' },
   })
-  // // 获取用户信息
-  // getUser().then((res) => {
-  //   user.value = res.data.data
-  //   // console.log('user===============>', user.value)
-  // })
+  
   // 退出登录
   const logout = async () => {
     await store.dispatch('user/logout')
@@ -208,7 +193,8 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            select: '组件服务',
+            // select: '组件服务',
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
         break
@@ -217,11 +203,6 @@
           path: '/capabilityCloud',
         })
         break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
       case '技术文档':
         router.push({
           path: '/instructionManual',
diff --git a/front/src/views/home/constantData/showData.js b/front/src/views/home/constantData/showData.js
index 4c344a63..85602f8a 100644
--- a/front/src/views/home/constantData/showData.js
+++ b/front/src/views/home/constantData/showData.js
@@ -1,12 +1,12 @@
 export const titleNameArray = [
-  {
-    photo: require('@/assets/newHome/banner-zj.png'),
-    name: '组件服务',
-  },
   {
     photo: require('@/assets/newHome/banner-yy.png'),
     name: '应用资源',
   },
+  {
+    photo: require('@/assets/newHome/banner-zj.png'),
+    name: '组件服务',
+  },
   {
     photo: require('@/assets/newHome/banner-jc.png'),
     name: '基础设施',
diff --git a/front/src/views/home/latestAbility.vue b/front/src/views/home/latestAbility.vue
index f31415d9..028afcf1 100644
--- a/front/src/views/home/latestAbility.vue
+++ b/front/src/views/home/latestAbility.vue
@@ -35,6 +35,8 @@
   import { useRouter } from 'vue-router'
   import { ref } from 'vue'
   import { selectNewest } from '@/api/home'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
   export default {
     name: 'latestAbility',
     components: {},
@@ -45,7 +47,8 @@
         router.push({
           path: '/DetailsPageconetent',
           query: {
-            select: '组件服务',
+            // select: '组件服务',
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
           },
         })
       }
diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue
index e03dfdd5..548ad4fe 100644
--- a/front/src/views/instructionManual/components/menuBook.vue
+++ b/front/src/views/instructionManual/components/menuBook.vue
@@ -118,6 +118,7 @@
   import TheOverallProcess from './TheOverallProcess.vue'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const router = useRouter()
   const seviceList = ref([
     {
@@ -255,7 +256,8 @@
       const newpage = router.resolve({
         path: '/DetailsPageconetent',
         query: {
-          select: '组件服务',
+          // select: '组件服务',
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
         },
       })
       window.location.href = newpage.href
diff --git a/front/src/views/newHome/components/LatestCapabilities.vue b/front/src/views/newHome/components/LatestCapabilities.vue
index 59ab9956..a51403f2 100644
--- a/front/src/views/newHome/components/LatestCapabilities.vue
+++ b/front/src/views/newHome/components/LatestCapabilities.vue
@@ -32,6 +32,7 @@
   import { ref } from 'vue'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   const productServiceData = ref([])
@@ -76,7 +77,8 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }
diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue
index 0ec931e8..f9b7ef49 100644
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@@ -61,6 +61,7 @@
   import { pageWithAttrs } from '@/api/home.js'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   const select = ref('浏览量')
@@ -134,11 +135,11 @@
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
-    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        // select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }
diff --git a/front/src/views/newHome/components/RecommendationAbility.vue b/front/src/views/newHome/components/RecommendationAbility.vue
index 4b772bb5..3b87a72d 100644
--- a/front/src/views/newHome/components/RecommendationAbility.vue
+++ b/front/src/views/newHome/components/RecommendationAbility.vue
@@ -47,6 +47,7 @@
   import { selectRecommend } from '@/api/home.js'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   const store = useStore()
   const router = useRouter()
   let dataList = ref([])
@@ -94,7 +95,7 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: '组件服务',
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
       },
     })
   }
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index 4f609744..6013b08d 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -255,24 +255,14 @@
   const toView = () => {
     window.open(newpage.href, '_blank')
   }
-  // const toApply = () => {
-  //   window.open(applypage.href, '_blank')
-  // }
+  
   getList()
-  // dataList.value.map((item, index) => {
-  //   dataList.value[index].tupian = tupain.value[index]
-  //   console.log('item', item, dataList.value)
-  // })
+ 
   function jumpPage() {
-    // 点击内存入store
-    // store.commit('WorkDynList', {
-    //   selectCardsnum: '组件服务',
-    // })
     console.log(
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
-    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/WorkDynList',
     })