From 11b42afde3b2e7600114e6b25dbde3ac0fd9a50c Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 25 Oct 2022 09:21:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=BB=84=E4=BC=9A?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 2cdfd140..a4e7809d 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -858,7 +858,7 @@
 
   const videoList = ref([])
   const initMeeting = () => {
-    let str = ''
+    let str = '青岛市一网统揽项目组/'
     meetingSelect.value.map((val) => (str += val + '/'))
     initiateMeet(str).then((res) => {
       console.log('组会=========>', res)

From b30a72555f67389d46a312af4b990cc146c23bab Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 25 Oct 2022 09:48:40 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/user.js                      |  15 +-
 front/src/views/home/components/header.vue | 993 +++++++++++----------
 2 files changed, 526 insertions(+), 482 deletions(-)

diff --git a/front/src/api/user.js b/front/src/api/user.js
index a8e05e59..c8167d56 100644
--- a/front/src/api/user.js
+++ b/front/src/api/user.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 16:42:22
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-25 09:37:05
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -23,6 +23,13 @@ export async function socialLogin(data) {
   })
 }
 
+export function getRole(params) {
+  return request({
+    url: '/sys/role/' + params,
+    method: 'get',
+    params,
+  })
+}
 export function getUserInfo(redict) {
   //此处为了兼容mock.js使用data传递accessToken，如果使用mock可以走headers
   // debugger
@@ -30,8 +37,8 @@ export function getUserInfo(redict) {
     url: '/sys/user/info',
     method: 'get',
     headers: {
-      REQUESTURI:redict
-    }
+      REQUESTURI: redict,
+    },
   })
 }
 export function getDeptAll() {
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 8c67bc87..8bc1e908 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -1,8 +1,11 @@
 <template>
-  <div class="home-header" :class="[
-    select !== 'home' || scrollTop > 500 ? 'white' : '',
-    props.showView === 'algorithm-details' ? '' : '',
-  ]">
+  <div
+    class="home-header"
+    :class="[
+      select !== 'home' || scrollTop > 500 ? 'white' : '',
+      props.showView === 'algorithm-details' ? '' : '',
+    ]"
+  >
     <div class="name" @click="goToHome">
       <div class="name-bg" v-if="!itShowXiHaiAn"></div>
       <div class="name-bg-xihaian" v-else></div>
@@ -11,26 +14,52 @@
         <p>(United Capacity System)</p>
       </div>
     </div>
-    <div v-for="item in navList" :key="item.key" @click="jumpPage(item)" class="nav"
-      :class="item.key == select ? 'select' : ''">
+    <div
+      v-for="item in navList"
+      :key="item.key"
+      @click="jumpPage(item)"
+      class="nav"
+      :class="item.key == select ? 'select' : ''"
+    >
       {{ item.name }}
     </div>
     <!-- 购物车 -->
     <a-badge :count="sgcNum">
-      <svg t="1650455446850" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-        p-id="2069" width="0.4rem" height="0.4rem" @click="goToSgc">
+      <svg
+        t="1650455446850"
+        class="icon"
+        viewBox="0 0 1024 1024"
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        p-id="2069"
+        width="0.4rem"
+        height="0.4rem"
+        @click="goToSgc"
+      >
         <path
           d="M384 832v85.333333h-85.333333v-85.333333h85.333333z m405.333333 0v85.333333h-85.333333v-85.333333h85.333333zM240.32 185.002667l24.149333 140.928h633.173334L835.285333 746.666667h-563.626666l-85.333334-497.685334H94.485333v-64h145.834667z m583.104 204.928H275.434667L325.632 682.666667h454.464l43.328-292.736z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2070"></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
+          p-id="2070"
+        ></path>
       </svg>
     </a-badge>
     <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
       <!-- 消息提醒 -->
-      <svg t="1654051054113" class="icon2" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-        p-id="2187" width="0.35rem" height="0.35rem">
+      <svg
+        t="1654051054113"
+        class="icon2"
+        viewBox="0 0 1024 1024"
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        p-id="2187"
+        width="0.35rem"
+        height="0.35rem"
+      >
         <path
           d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2188"></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
+          p-id="2188"
+        ></path>
       </svg>
       <!-- <a-avatar shape="square" size="large" /> -->
     </a-badge>
@@ -59,246 +88,193 @@
         <template #title>
           <span>{{ user.realName }}</span>
         </template>
-        <span class="name" @click="jumpPage({ name: '个人中心', key: 'personalCenter' })">
+        <span
+          class="name"
+          @click="jumpPage({ name: '个人中心', key: 'personalCenter' })"
+        >
           {{ user.realName }}
         </span>
       </a-tooltip>
       <span @click="logout" class="out">退出</span>
-      <i @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })" class="iconTo" v-show="backFlag"></i>
+      <i
+        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })"
+        class="iconTo"
+        v-show="backFlag"
+      ></i>
       <!-- <i class="img1" @click="jumpWaibu"></i> -->
     </div>
     <div class="info1">
-    <i class="img1"  @click="jumpWaibu"></i>
-  </div>
+      <i class="img1" @click="jumpWaibu"></i>
+    </div>
   </div>
 </template>
 <script setup>
-import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
-import { getUserInfo } from '@/api/user'
-import { recordRoute } from '@/config'
-import { useRoute, useRouter } from 'vue-router'
-import { mynotice } from '@/api/home'
-import { useStore } from 'vuex'
-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'
-import { message } from 'ant-design-vue'
+  import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
+  import { getUserInfo, getRole } from '@/api/user'
+  import { recordRoute } from '@/config'
+  import { useRoute, useRouter } from 'vue-router'
+  import { mynotice } from '@/api/home'
+  import { useStore } from 'vuex'
+  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'
+  import { message } from 'ant-design-vue'
 
-const store = useStore()
-const router = useRouter()
-const route = useRoute()
-const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
+  const store = useStore()
+  const router = useRouter()
+  const route = useRoute()
+  const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
 
-// 用户信息
-const user = ref({
-  username: store.getters['user/username'],
-  realName: store.getters['user/realName'],
-})
-const select = ref(router.currentRoute.value.name)
-const mynoticeFlag = ref(false)
-const mynoticeData = ref([])
-const navList = ref(navListManagement.navList)
-const backFlag = ref(true)
-getUserInfo().then((res) => {
-  if (
-    res.data.data.roleIdList.length == 0 &&
-    res.data.data.superAdmin === 0
-  ) {
-    backFlag.value = false
-  }
-})
-console.log('navList------------>', navList)
+  // 用户信息
+  const user = ref({
+    username: store.getters['user/username'],
+    realName: store.getters['user/realName'],
+  })
+  const select = ref(router.currentRoute.value.name)
+  const mynoticeFlag = ref(false)
+  const mynoticeData = ref([])
+  const navList = ref(navListManagement.navList)
+  const backFlag = ref(false)
+  getUserInfo().then((res) => {
+    res.data.data.roleIdList.map((val) => {
+      getRole(val).then((role) => {
+        if (role.data.data.name === '后台管理员') {
+          backFlag.value = true
+        }
+      })
+    })
+  })
+  console.log('navList------------>', navList)
 
-const props = defineProps({
-  showView: { type: String, default: '' },
-})
+  const props = defineProps({
+    showView: { type: String, default: '' },
+  })
 
-// 退出登录
-const logout = async () => {
-  await store.dispatch('user/logout')
-  window.sessionStorage.setItem('visits', JSON.stringify([]))
-  // 西海岸不返回登录页
-  if (!itShowXiHaiAn.value) {
-    if (recordRoute) {
-      const fullPath = route.fullPath
-      router.push(`/login?redirect=${fullPath}`)
-    } else {
-      router.push('/login')
+  // 退出登录
+  const logout = async () => {
+    await store.dispatch('user/logout')
+    window.sessionStorage.setItem('visits', JSON.stringify([]))
+    // 西海岸不返回登录页
+    if (!itShowXiHaiAn.value) {
+      if (recordRoute) {
+        const fullPath = route.fullPath
+        router.push(`/login?redirect=${fullPath}`)
+      } else {
+        router.push('/login')
+      }
     }
   }
-}
-// 返回首页
-const goToHome = () => {
-  // 西海岸
-  if (itShowXiHaiAn.value) {
-    if (
-      !xhaHasPermissionUser.list.includes(user.value.username)
-    ) {
-      return message.warn('暂无权限')
+  // 返回首页
+  const goToHome = () => {
+    // 西海岸
+    if (itShowXiHaiAn.value) {
+      if (!xhaHasPermissionUser.list.includes(user.value.username)) {
+        return message.warn('暂无权限')
+      }
+    }
+    router.push({
+      path: '/home',
+    })
+  }
+  const jumpWaibu = () => {
+    window.open('http://15.72.177.175:18460/analystrunner/tonglan', '_blank')
+  }
+  // 跳转页面
+  const jumpPage = (item) => {
+    // 西海岸
+    if (itShowXiHaiAn.value) {
+      let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
+      if (
+        _arr.includes(item.name) &&
+        !xhaHasPermissionUser.list.includes(user.value.username)
+      ) {
+        return message.warn('暂无权限')
+      }
+    }
+    select.value = item.key
+    switch (item.name) {
+      case '个人中心':
+        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+        router.push({
+          path: '/personalCenter',
+        })
+        break
+      case '能力统计':
+        router.push({
+          path: '/abilityStatistics',
+        })
+        break
+      case '能力集市':
+        router.push({
+          path: '/DetailsPageconetent',
+          query: {
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+          },
+        })
+        break
+      case '能力云图':
+        router.push({
+          path: '/capabilityCloud',
+        })
+        break
+      // case '技术文档':
+      //   router.push({
+      //     path: '/developmentGuide',
+      //   })
+      //   break
+      case '新手指南':
+        router.push({
+          path: '/instructionManual',
+        })
+        break
+      case '需求中心':
+        router.push({
+          path: '/demandCenter',
+        })
+        break
+      case '区市站点':
+        router.push({
+          path: '/mapTest',
+        })
+        break
+      case '后台管理':
+        Cookies.remove('JSESSIONID')
+        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+        // window.reload('http://15.2.21.238:9797')
+        break
+      case '赋能案例':
+        router.push({
+          path: '/assignCase',
+        })
+        break
+      case '典型赋能案例':
+        router.push({
+          path: '/assignCase',
+        })
+        break
+      case '融合服务':
+        router.push({
+          path: '/integrationServices',
+        })
+        break
+      case 'CIM专区':
+        router.push({
+          path: '/cimSpecialArea',
+        })
+        break
+      default:
+        router.push('/home')
+        break
     }
   }
-  router.push({
-    path: '/home',
-  })
-}
-const jumpWaibu=()=>{
-  window.open('http://15.72.177.175:18460/analystrunner/tonglan', "_blank");
-}
-// 跳转页面
-const jumpPage = (item) => {
-  // 西海岸
-  if (itShowXiHaiAn.value) {
-    let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
-    if (
-      _arr.includes(item.name) &&
-      !xhaHasPermissionUser.list.includes(user.value.username)
-    ) {
-      return message.warn('暂无权限')
-    }
-  }
-  select.value = item.key
-  switch (item.name) {
-    case '个人中心':
-      window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-      router.push({
-        path: '/personalCenter',
-      })
-      break
-    case '能力统计':
-      router.push({
-        path: '/abilityStatistics',
-      })
-      break
-    case '能力集市':
-      router.push({
-        path: '/DetailsPageconetent',
-        query: {
-          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-        },
-      })
-      break
-    case '能力云图':
-      router.push({
-        path: '/capabilityCloud',
-      })
-      break
-    // case '技术文档':
-    //   router.push({
-    //     path: '/developmentGuide',
-    //   })
-    //   break
-    case '新手指南':
-      router.push({
-        path: '/instructionManual',
-      })
-      break
-    case '需求中心':
-      router.push({
-        path: '/demandCenter',
-      })
-      break
-    case '区市站点':
-      router.push({
-        path: '/mapTest',
-      })
-      break
-    case '后台管理':
-      Cookies.remove('JSESSIONID')
-      window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
-      // window.reload('http://15.2.21.238:9797')
-      break
-    case '赋能案例':
-      router.push({
-        path: '/assignCase',
-      })
-      break
-    case '典型赋能案例':
-      router.push({
-        path: '/assignCase',
-      })
-      break
-    case '融合服务':
-      router.push({
-        path: '/integrationServices',
-      })
-      break
-    case 'CIM专区':
-      router.push({
-        path: '/cimSpecialArea',
-      })
-      break
-    default:
-      router.push('/home')
-      break
-  }
-}
-const scrollTop = ref(0)
-window.onscroll = function () {
-  //为了保证兼容性，这里取两个值，哪个有值取哪一个
-  //scrollTop就是触发滚轮事件时滚轮的高度
-  scrollTop.value =
-    document.documentElement.scrollTop || document.body.scrollTop
-  // console.log('滚动距离' + scrollTop.value)
-}
-mybus.on('getSgcNum', () => {
-  getSgcTotal().then((res) => {
-    sgcNum.value = res.data.data.count
-    // console.log('申购车总数========================>', res.data.data.count)
-  })
-})
-
-const sgcNum = ref(0)
-const goToSgc = () => {
-  window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-  router.push('/personalCenter')
-}
-const mynoticeNum = ref(0)
-// 我的消息
-const getMynotice = () => {
-  mynotice({ page: 1, limit: 3, readStatus: 0 }).then((res) => {
-    // console.log('我的消息', res.data.data)
-    mynoticeNum.value = res.data.data.total
-    mynoticeData.value = res.data.data.list
-  })
-}
-const goToView = () => {
-  router.push({
-    path: '/mynoticeView',
-  })
-}
-// const read = (item) => {
-//   mynoticeRead(item.id).then((res) => {
-//     console.log('已读', res)
-//     getMynotice()
-//   })
-// }
-// 建立链接 -- 携带cookie参数
-
-onMounted(() => {
-  getSgcTotal().then((res) => {
-    // console.log('初始化========================>', res.data.data.count)
-    sgcNum.value = res.data.data.count
-  })
-  getMynotice()
-  // 解决
-  const mynoticeDom = document.querySelector('.icon2')
-  const mynotice = document.querySelector('.mynotice')
-  if (mynoticeDom) {
-    mynoticeDom.addEventListener('mouseover', () => {
-      mynoticeFlag.value = true
-    })
-    mynoticeDom.addEventListener('mouseout', () => {
-      mynoticeFlag.value = false
-    })
-  }
-  if (mynotice) {
-    mynotice.addEventListener('mouseover', () => {
-      mynoticeFlag.value = true
-    })
-    mynotice.addEventListener('mouseout', () => {
-      mynoticeFlag.value = false
-    })
+  const scrollTop = ref(0)
+  window.onscroll = function () {
+    //为了保证兼容性，这里取两个值，哪个有值取哪一个
+    //scrollTop就是触发滚轮事件时滚轮的高度
+    scrollTop.value =
+      document.documentElement.scrollTop || document.body.scrollTop
+    // console.log('滚动距离' + scrollTop.value)
   }
   mybus.on('getSgcNum', () => {
     getSgcTotal().then((res) => {
@@ -306,286 +282,347 @@ onMounted(() => {
       // console.log('申购车总数========================>', res.data.data.count)
     })
   })
-  mybus.on('getMynotice', () => {
+
+  const sgcNum = ref(0)
+  const goToSgc = () => {
+    window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+    router.push('/personalCenter')
+  }
+  const mynoticeNum = ref(0)
+  // 我的消息
+  const getMynotice = () => {
+    mynotice({ page: 1, limit: 3, readStatus: 0 }).then((res) => {
+      // console.log('我的消息', res.data.data)
+      mynoticeNum.value = res.data.data.total
+      mynoticeData.value = res.data.data.list
+    })
+  }
+  const goToView = () => {
+    router.push({
+      path: '/mynoticeView',
+    })
+  }
+  // const read = (item) => {
+  //   mynoticeRead(item.id).then((res) => {
+  //     console.log('已读', res)
+  //     getMynotice()
+  //   })
+  // }
+  // 建立链接 -- 携带cookie参数
+
+  onMounted(() => {
+    getSgcTotal().then((res) => {
+      // console.log('初始化========================>', res.data.data.count)
+      sgcNum.value = res.data.data.count
+    })
     getMynotice()
+    // 解决
+    const mynoticeDom = document.querySelector('.icon2')
+    const mynotice = document.querySelector('.mynotice')
+    if (mynoticeDom) {
+      mynoticeDom.addEventListener('mouseover', () => {
+        mynoticeFlag.value = true
+      })
+      mynoticeDom.addEventListener('mouseout', () => {
+        mynoticeFlag.value = false
+      })
+    }
+    if (mynotice) {
+      mynotice.addEventListener('mouseover', () => {
+        mynoticeFlag.value = true
+      })
+      mynotice.addEventListener('mouseout', () => {
+        mynoticeFlag.value = false
+      })
+    }
+    mybus.on('getSgcNum', () => {
+      getSgcTotal().then((res) => {
+        sgcNum.value = res.data.data.count
+        // console.log('申购车总数========================>', res.data.data.count)
+      })
+    })
+    mybus.on('getMynotice', () => {
+      getMynotice()
+    })
+  })
+  onBeforeUnmount(() => {
+    mybus.off('getSgcNum')
+    mybus.off('getMynotice')
   })
-})
-onBeforeUnmount(() => {
-  mybus.off('getSgcNum')
-  mybus.off('getMynotice')
-})
 </script>
 <style lang="less" scoped>
-@font-face {
-  font-family: 'header-typeface';
-  src: url('~@/assets/newHome/font/header-typeface.ttf');
-}
-
-.home-header {
-  height: 0.64rem;
-  width: 100%;
-  max-width: 1920px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  // padding: 0 1rem;
-  background-color: rgba(0, 0, 25, 0.7);
-  position: fixed;
-  z-index: 1000;
-  top: 0;
-
-  div {
-    color: #fff;
-    font-size: 0.16rem;
+  @font-face {
+    font-family: 'header-typeface';
+    src: url('~@/assets/newHome/font/header-typeface.ttf');
   }
 
-  .name {
-    cursor: pointer;
-    font-size: 0.22rem;
-    font-family: header-typeface;
-    margin-right: 0.2rem;
-    display: flex;
-    align-items: center;
-
-    .name-bg {
-      height: 0.6rem;
-      width: 0.6rem;
-      background: url('~@/assets/newHome/ucs-2.png') no-repeat;
-      background-size: 100%;
-      margin-right: 0.15rem;
-    }
-
-    .name-bg-xihaian {
-      height: 0.6rem;
-      width: 0.6rem;
-      background: url('~@/assets/newHome/newHome-title-bg-xihaian.png') no-repeat;
-      background-size: 100%;
-      margin-right: 0.15rem;
-    }
-
-    .name-content {
-      padding-top: 0.14rem;
-
-      p {
-        font-size: 0.2rem;
-        margin-bottom: 0;
-
-        &:nth-of-type(2) {
-          font-size: 0.12rem;
-        }
-      }
-    }
-  }
-
-  .nav {
-    width: 1.2rem;
+  .home-header {
     height: 0.64rem;
-    line-height: 0.64rem;
-    text-align: center;
-  }
-
-  .nav:hover {
-    background: #0058e1;
-    color: #fff;
-    cursor: pointer;
-  }
-
-  .select {
-    background: #0058e1;
-    color: #fff !important;
-  }
-  .info1 {
-     margin-left: 0.1rem;
-    display: flex;
-    .img1{
-      height: 0.3rem;
-      width: 1.4rem;
-      margin-left: 0.1rem;
-      background: url('~@/assets/newHome/yiwang.png') no-repeat;
-   }
-  }
-
-  .info {
-    // width: 2rem;
-    margin-left: 0.2rem;
+    width: 100%;
+    max-width: 1920px;
     display: flex;
     justify-content: center;
+    align-items: center;
+    // padding: 0 1rem;
+    background-color: rgba(0, 0, 25, 0.7);
+    position: fixed;
+    z-index: 1000;
+    top: 0;
 
-    .img {
-      width: 0.3rem;
-      height: 0.3rem;
-      border-radius: 0.1rem;
-      background: url('~@/assets/newHome/user.png') no-repeat;
-      background-size: 100%;
-    }
-    .img1 {
-      margin-left: 0.08rem;
-      height: 0.3rem;
-      width: 0.8rem;
-      border-radius: 0.1rem;
-      background: url('~@/assets/newHome/yiwang.png') no-repeat;
-      background-size: 100%;
-    }
-   
-    span {
-      height: 0.3rem;
-      line-height: 0.3rem;
-      margin-left: 0.08rem;
-      margin-right: 0.06rem;
+    div {
+      color: #fff;
       font-size: 0.16rem;
     }
 
     .name {
-      max-width: 2.3rem;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 1;
-      -webkit-box-orient: vertical;
-      overflow: hidden;
-      word-break: break-all;
+      cursor: pointer;
+      font-size: 0.22rem;
+      font-family: header-typeface;
+      margin-right: 0.2rem;
+      display: flex;
+      align-items: center;
+
+      .name-bg {
+        height: 0.6rem;
+        width: 0.6rem;
+        background: url('~@/assets/newHome/ucs-2.png') no-repeat;
+        background-size: 100%;
+        margin-right: 0.15rem;
+      }
+
+      .name-bg-xihaian {
+        height: 0.6rem;
+        width: 0.6rem;
+        background: url('~@/assets/newHome/newHome-title-bg-xihaian.png')
+          no-repeat;
+        background-size: 100%;
+        margin-right: 0.15rem;
+      }
+
+      .name-content {
+        padding-top: 0.14rem;
+
+        p {
+          font-size: 0.2rem;
+          margin-bottom: 0;
+
+          &:nth-of-type(2) {
+            font-size: 0.12rem;
+          }
+        }
+      }
     }
 
-    .out {
+    .nav {
+      width: 1.2rem;
+      height: 0.64rem;
+      line-height: 0.64rem;
+      text-align: center;
+    }
+
+    .nav:hover {
+      background: #0058e1;
+      color: #fff;
       cursor: pointer;
-      // padding: 0 0.16rem;
-      padding: 0 0.04rem 0 0.1rem;
-      border-left: 0.01rem solid #666;
+    }
+
+    .select {
+      background: #0058e1;
+      color: #fff !important;
+    }
+    .info1 {
+      margin-left: 0.1rem;
+      display: flex;
+      .img1 {
+        height: 0.3rem;
+        width: 1.4rem;
+        margin-left: 0.1rem;
+        background: url('~@/assets/newHome/yiwang.png') no-repeat;
+      }
+    }
+
+    .info {
+      // width: 2rem;
+      margin-left: 0.2rem;
+      display: flex;
+      justify-content: center;
+
+      .img {
+        width: 0.3rem;
+        height: 0.3rem;
+        border-radius: 0.1rem;
+        background: url('~@/assets/newHome/user.png') no-repeat;
+        background-size: 100%;
+      }
+      .img1 {
+        margin-left: 0.08rem;
+        height: 0.3rem;
+        width: 0.8rem;
+        border-radius: 0.1rem;
+        background: url('~@/assets/newHome/yiwang.png') no-repeat;
+        background-size: 100%;
+      }
+
+      span {
+        height: 0.3rem;
+        line-height: 0.3rem;
+        margin-left: 0.08rem;
+        margin-right: 0.06rem;
+        font-size: 0.16rem;
+      }
+
+      .name {
+        max-width: 2.3rem;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
+        overflow: hidden;
+        word-break: break-all;
+      }
+
+      .out {
+        cursor: pointer;
+        // padding: 0 0.16rem;
+        padding: 0 0.04rem 0 0.1rem;
+        border-left: 0.01rem solid #666;
+      }
+
+      .icon {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .white {
+    background-color: #fff;
+    box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
+
+    .name {
+      color: #0058e1;
+
+      .name-bg {
+        height: 0.6rem;
+        width: 0.6rem;
+        background: url('~@/assets/newHome/ucs-1.png') no-repeat;
+        background-size: 100%;
+        margin-right: 0.15rem;
+      }
+
+      p {
+        color: #0058e1;
+      }
     }
 
     .icon {
       cursor: pointer;
     }
-  }
-}
 
-.white {
-  background-color: #fff;
-  box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
-
-  .name {
-    color: #0058e1;
-
-    .name-bg {
-      height: 0.6rem;
-      width: 0.6rem;
-      background: url('~@/assets/newHome/ucs-1.png') no-repeat;
-      background-size: 100%;
-      margin-right: 0.15rem;
-    }
-
-    p {
-      color: #0058e1;
-    }
-  }
-
-  .icon {
-    cursor: pointer;
-  }
-
-  .nav {
-    color: #000;
-  }
-
-  .info {
-    span {
+    .nav {
       color: #000;
     }
-  }
-}
 
-.blue {
-  position: absolute;
-  background: linear-gradient(to right,
+    .info {
+      span {
+        color: #000;
+      }
+    }
+  }
+
+  .blue {
+    position: absolute;
+    background: linear-gradient(
+      to right,
       rgba(15, 90, 253, 0.8),
-      rgba(36, 25, 248, 0.8));
+      rgba(36, 25, 248, 0.8)
+    );
 
-  .name {
-    color: #fff;
-  }
-
-  .nav {
-    color: #fff;
-  }
-
-  .nav:hover {
-    background: #fff;
-    color: #0058e1;
-  }
-
-  .info {
-    span {
+    .name {
       color: #fff;
     }
-  }
-}
 
-.mynotice {
-  width: 4rem;
-  height: 3rem;
-  background: #eee;
-  border-radius: 0.05rem;
-  position: absolute;
-  top: 0.45rem;
-  right: 2.4rem;
-  overflow-y: scroll;
+    .nav {
+      color: #fff;
+    }
 
-  .bottom {
-    cursor: pointer;
-    width: 100%;
-    text-align: center;
-    color: #000;
-    font-size: 0.16rem;
-  }
-}
+    .nav:hover {
+      background: #fff;
+      color: #0058e1;
+    }
 
-.mynotice::-webkit-scrollbar {
-  display: none;
-}
-
-:deep(.ant-list-item) {
-  border-bottom: 0.01rem solid #ccc;
-  padding: 0.1rem;
-}
-
-:deep(.ant-list-item-meta-title) {
-
-  // display: flex;
-  // justify-content: space-around;
-  // align-items: center;
-  // padding: 0 0.05rem;
-  a {
-    width: 3.8rem;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    word-break: break-all;
-    -webkit-box-orient: vertical;
-  }
-
-  button {
-    width: 0.7rem;
-    height: 0.25rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    span {
-      font-size: 0.1rem;
+    .info {
+      span {
+        color: #fff;
+      }
     }
   }
-}
 
-.iconTo {
-  display: block;
-  width: 0.35rem;
-  height: 0.35rem;
-  background: url('~@/assets/newHome/iconTo.png') no-repeat;
-  cursor: pointer;
-}
+  .mynotice {
+    width: 4rem;
+    height: 3rem;
+    background: #eee;
+    border-radius: 0.05rem;
+    position: absolute;
+    top: 0.45rem;
+    right: 2.4rem;
+    overflow-y: scroll;
+
+    .bottom {
+      cursor: pointer;
+      width: 100%;
+      text-align: center;
+      color: #000;
+      font-size: 0.16rem;
+    }
+  }
+
+  .mynotice::-webkit-scrollbar {
+    display: none;
+  }
+
+  :deep(.ant-list-item) {
+    border-bottom: 0.01rem solid #ccc;
+    padding: 0.1rem;
+  }
+
+  :deep(.ant-list-item-meta-title) {
+    // display: flex;
+    // justify-content: space-around;
+    // align-items: center;
+    // padding: 0 0.05rem;
+    a {
+      width: 3.8rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      word-break: break-all;
+      -webkit-box-orient: vertical;
+    }
+
+    button {
+      width: 0.7rem;
+      height: 0.25rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      span {
+        font-size: 0.1rem;
+      }
+    }
+  }
+
+  .iconTo {
+    display: block;
+    width: 0.35rem;
+    height: 0.35rem;
+    background: url('~@/assets/newHome/iconTo.png') no-repeat;
+    cursor: pointer;
+  }
 </style>
 <style>
-html::-webkit-scrollbar {
-  display: none;
-}
+  html::-webkit-scrollbar {
+    display: none;
+  }
 </style>

From 5cbeba19b82991e9f689e9faf8c634f1978b2e76 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 25 Oct 2022 10:58:25 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                       |  9 ++-
 front/src/views/home/infrastructurePage.vue | 75 ++++++++++++++-------
 2 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index e97c9400..c065a0eb 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-10-24 10:36:56
+ * @LastEditTime: 2022-10-25 09:51:56
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -110,6 +110,13 @@ export function initiateMeet(data) {
     data: data,
   })
 }
+export function getEnkeUsers(params) {
+  return request({
+    url: '/enke/getEnkeUsers',
+    method: 'get',
+    params: params,
+  })
+}
 
 // 组件服务
 export function ApplicationServe(data) {
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index a4e7809d..6aff800a 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -544,18 +544,19 @@
       >
         <a-table
           class="ant-table-striped"
-          :dataSource="meetingName"
+          :dataSource="meetingList"
           :columns="meetingColumns"
           :scroll="{ y: tableHeight }"
           rowKey="key"
           :rowClassName="
             (record, index) => (index % 2 === 1 ? 'table-striped' : null)
           "
-          :showSizeChanger="false"
+          :pagination="meetingPagination"
           :row-selection="{
-            selectedRowKeys: meetingSelect,
+            selectedRowKeys: meetingSelect.data,
             onChange: meetingOnSelectChange,
           }"
+          @change="handleMeeting"
         ></a-table>
       </div>
       <!-- 西海岸-无人机、单兵设备 -->
@@ -782,7 +783,7 @@
     defineExpose,
     computed,
   } from 'vue'
-  import { getUser, initiateMeet } from '@/api/home'
+  import { getUser, initiateMeet, getEnkeUsers } from '@/api/home'
   import {
     getCameraByParentId,
     getStreamByChannelCode,
@@ -846,24 +847,66 @@
           'fullScreen',
         ], //显示所有按钮,
   })
-  const meetingSelect = ref([])
+  const meetingList = ref([])
+  const meetingPagination = ref({
+    total: 0,
+    current: 1,
+    pageSize: 5, //每页中显示5条数据
+    showSizeChanger: false,
+  })
+  const meetingSelect = reactive({ data: [] })
+  const meetingSelectOld = reactive({ data: [] })
   const meetingOnSelectChange = (selectedRowKeys) => {
     console.log(
       'selectedRowKeys changed: ',
       selectedRowKeys,
-      meetingSelect.value
+      meetingSelect.data
     )
-    meetingSelect.value = selectedRowKeys
+    meetingSelect.data = selectedRowKeys
+    meetingSelectOld.data[meetingPagination.value.current - 1] =
+      meetingSelect.data
   }
-
   const videoList = ref([])
   const initMeeting = () => {
     let str = '青岛市一网统揽项目组/'
-    meetingSelect.value.map((val) => (str += val + '/'))
+    // meetingSelect.data.map((val) => (str += val + '/'))
+    meetingSelectOld.data.map((val) => {
+      val.map((data) => (str += data + '/'))
+    })
     initiateMeet(str).then((res) => {
       console.log('组会=========>', res)
     })
   }
+  // 获取会议列表
+  const meetingColumns = ref([
+    {
+      title: '视频会议用户名称',
+      dataIndex: 'hostName',
+      key: 'hostName',
+    },
+  ])
+  const getMeetingList = () => {
+    getEnkeUsers({
+      page: meetingPagination.value.current,
+      limit: meetingPagination.value.pageSize,
+    }).then((res) => {
+      meetingList.value = []
+      res.data.data.list.map((val) => {
+        val.key = val.hostName
+      })
+      meetingList.value = res.data.data.list
+      meetingPagination.value.total = res.data.data.total
+      meetingSelect.data =
+        meetingSelectOld.data[meetingPagination.value.current - 1]
+      console.log('会议列表=============>', res.data.data)
+    })
+  }
+  getMeetingList()
+  const handleMeeting = (pag, filters, sorter) => {
+    console.log(pag, filters, sorter)
+    meetingPagination.value.current = pag.current
+    getMeetingList()
+  }
   let visible = ref(false) // 视频预览
   let picVisible = ref(false) // 图片预览
   let batchVisible = ref(false) // 视频批量预览
@@ -2072,20 +2115,6 @@
       key: 'channelId',
     },
   ])
-  const meetingColumns = ref([
-    {
-      title: '视频会议用户名称',
-      dataIndex: 'name',
-      key: 'name',
-    },
-  ])
-  const meetingName = ref([
-    { name: '一网统揽平台组', key: '一网统揽平台组' },
-    { name: '市气象局', key: '市气象局' },
-    { name: '地铁集团', key: '地铁集团' },
-    { name: '市公安局', key: '市公安局' },
-    { name: '市交通运输局', key: '市交通运输局' },
-  ])
   // 西海岸--状态展示
   if (isXiHaiAn) {
     columns.value.splice(2, 0, {

From 8f33c9f3758a3003424a342749cc4234440b1ff9 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 25 Oct 2022 11:30:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |    3 +-
 front/src/views/home/DetailsPageconetent.vue  | 3563 +++++++++--------
 .../home/components/searchResultList.vue      |   15 +-
 3 files changed, 1940 insertions(+), 1641 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea7fa33a..2ebfa222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ front/public/index.html
 back/dist-西海岸-后台管理-v0.8.2.1.zip
 back/dist-市局-后台管理-v0.8.2.3.zip
 back/dist-西海岸-后台管理-v0.8.2.4.d.zip
-*.zip
\ No newline at end of file
+*.zip
+front/public/static/config/basicConfig.js
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index b4bfc172..f8907262 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -12,32 +12,55 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
-          <button v-if="Cardsname == '应用资源'" class="button-reset" @click="applyAll()" style="margin-left: 0.1rem">
+          <button
+            v-if="Cardsname == '应用资源'"
+            class="button-reset"
+            @click="applyAll()"
+            style="margin-left: 0.1rem"
+          >
             全部申请
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -46,45 +69,89 @@
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-        :key="listKey2" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length > 0"
+        :resourceList="resourceList"
+        :key="listKey2"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty />
       </div>
     </div>
@@ -92,29 +159,47 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -123,36 +208,58 @@
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage ref="camera" @add="handleAdd" :searchValue="searchValue" />
+        <infrastructurePage
+          ref="camera"
+          @add="handleAdd"
+          :searchValue="searchValue"
+        />
       </div>
     </div>
     <div class="top" v-else>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -160,7 +267,10 @@
           </span>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -172,14 +282,21 @@
       <p></p>
       <p>能力广场</p>
       <ul v-show="visibleAbilitySquare">
-        <li v-for="item in abilitySquare" :key="item" @click="abilitySquareFunction(item)">
+        <li
+          v-for="item in abilitySquare"
+          :key="item"
+          @click="abilitySquareFunction(item)"
+        >
           {{ item }}
         </li>
       </ul>
     </div>
   </div>
   <!-- 西海岸 -->
-  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowXiHaiAn">
+  <div
+    class="details-pageconetent"
+    v-else-if="whoShow1 && whoShow1.itShowXiHaiAn"
+  >
     <home-header></home-header>
     <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
@@ -189,102 +306,188 @@
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
-        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length > 0"
+        :key="listKey2"
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname === '基础设施'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage ref="camera" :searchValue="searchValue" :searchType="searchType" />
+        <infrastructurePage
+          ref="camera"
+          :searchValue="searchValue"
+          :searchType="searchType"
+        />
       </div>
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -294,76 +497,140 @@
     </div>
   </div>
   <!-- 包头 -->
-  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowBaoTou">
+  <div
+    class="details-pageconetent"
+    v-else-if="whoShow1 && whoShow1.itShowBaoTou"
+  >
     <home-header></home-header>
     <div class="details-pageconetent-left">
       <detailsPageconetentTree />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '数据资源'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
-      <div v-show="Cardsname !== '数据资源'" class="resultListSearchInput-father">
+      <div
+        v-show="Cardsname !== '数据资源'"
+        class="resultListSearchInput-father"
+      >
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
         <!-- todo -->
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length" :key="listKey2"
-        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length"
+        :key="listKey2"
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
       <div class="shujuziyuan" v-if="Cardsname == '数据资源'">
         <div class="yunziyuan">
           <div class="yunziyuan-title">
             <div class="tupian"></div>
-            <div class="title" @click="dianjitiaozhaun('青岛市政务资源管理平台')">
+            <div
+              class="title"
+              @click="dianjitiaozhaun('青岛市政务资源管理平台')"
+            >
               青岛市政务资源管理平台{{ dataShowdev }}
             </div>
           </div>
@@ -379,18 +646,28 @@
           </div>
         </div>
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty v-if="!(Cardsname == '数据资源')" />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname == '数据资源'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -398,572 +675,669 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
   </div>
   <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,
-  nextTick,
-} from 'vue'
-import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-import {
-  selectDicStoreAll,
-  pageWithAttrs,
-  getDataResource,
-  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 { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-import { useStore } from 'vuex'
-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,
+    nextTick,
+  } from 'vue'
+  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import {
+    selectDicStoreAll,
+    pageWithAttrs,
+    getDataResource,
+    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 { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  import { useStore } from 'vuex'
+  import { message } from 'ant-design-vue'
+  import {
+    titleNameArray,
+    keyongziyuanqingkaungArray,
+    shujuziyuanqingkuangArray,
+  } from './constantData/showData.js'
 
-export default defineComponent({
-  beforeRouteLeave(to, from, next) {
-    console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
-    console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
-    console.log('next---DetailsPageconetent--beforeRouteLeave------->', next)
-    if (to.name !== 'details') {
-      localStorage.removeItem('DetailsPageconetent')
-    }
-    next()
-  },
-  setup() {
-    //会议室传的标识6
-    const flag = ref('')
-    let componentTypeArray = ['组件类型', '应用领域']
-    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 whoShow1 = ref(whoShow)
-    // 分页
-    const loading = ref(true)
-    let currentPage = ref(1)
-    let currentPageSize = ref(5)
-    const pageSizeOptions = ref(['5', '10', '20', '50'])
-    const router = useRouter()
-    let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
-    console.log('select------------>', select);
-    // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
-    const selectSubType = router.currentRoute.value.query.type || ''
-    const queryName = ref('')
-    const str = router.currentRoute.value.query.str
-    const searchValue = ref(str)
-    const searchType = ref(str)
-    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: [],
-    })
-    // 查询参数
-    let paramsGetResources = {
-      districtId: '',
-      deptIds: [],
-      pageNum: 1,
-      pageSize: currentPageSize.value,
-      type: Cardsname.value,
-      name: '',
-      infoList: [],
-      orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-      orderType: 'DESC', // ASC 升序  DESC 降序
-    }
-
-    const store = useStore()
-    // 用户信息
-    const user = ref({
-      username: store.getters['user/username'],
-      realName: store.getters['user/realName'],
-    })
-
-    const searchResultListDom = ref(null)
-
-    // 读取本地存储查询条件
-    let storageSearchInfo = null
-    const handleSetSearchData = () => {
-      if (localStorage.getItem('DetailsPageconetent')) {
-        storageSearchInfo = JSON.parse(
-          localStorage.getItem('DetailsPageconetent')
-        )
+  export default defineComponent({
+    beforeRouteLeave(to, from, next) {
+      console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
+      console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
+      console.log('next---DetailsPageconetent--beforeRouteLeave------->', next)
+      if (to.name !== 'details') {
+        localStorage.removeItem('DetailsPageconetent')
       }
-      console.log('storageSearchInfo------------>', storageSearchInfo)
-      // 读取本地存储：表单赋值
-      if (storageSearchInfo) {
-        paramsGetResources = Object.assign(
-          {},
-          paramsGetResources,
-          storageSearchInfo
-        )
-        // 搜索名称
-        searchValue.value = storageSearchInfo.name
-        currentPage.value = storageSearchInfo.pageNum
-        currentPageSize.value = storageSearchInfo.pageSize
-        paramsGetResources.pageNum = storageSearchInfo.pageNum
-        paramsGetResources.pageSize = storageSearchInfo.pageSize
-        paramsGetResources.deptIds = storageSearchInfo.deptIds
-        paramsGetResources.districtId = storageSearchInfo.districtId
-
-        // 延迟使用，因为还没有返回跟挂载
-        nextTick(() => {
-          searchResultListDom.value.changeCondition(
-            {
-              value: storageSearchInfo.orderField,
-              orderType: storageSearchInfo.orderType,
-            },
-            true
-          )
-        })
+      next()
+    },
+    setup() {
+      //会议室传的标识6
+      const flag = ref('')
+      let componentTypeArray = ['组件类型', '应用领域']
+      const handleAdd = (value) => {
+        flag.value = value
       }
-    }
+      const titleName = ref(titleNameArray)
 
-    //西海岸查询参数
-    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 current = ref(5)
-    const chagneTag = (name) => {
-      console.log('name----chagneTag-------->', name)
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      if (tagFlag.value == name) {
-        tagFlag.value = ''
-        paramsGetResources.shareCondition = ''
-      } else {
-        tagFlag.value = name
-        paramsGetResources.shareCondition = name
+      const openMonitor = () => {
+        window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
       }
-      listKey.value++
-      getAppResources()
-      console.log(
-        'paramsGetResources-----chagneTag------->',
-        paramsGetResources
-      )
-    }
+      // 模糊查询
+      const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
+      const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
 
-    // 重置数据
-    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 whoShow1 = ref(whoShow)
       // 分页
-      currentPage.value = 1
-      currentPageSize.value = 5
-      // 重置查询条件
-      paramsGetResources2.value = {
+      const loading = ref(true)
+      let currentPage = ref(1)
+      let currentPageSize = ref(5)
+      const pageSizeOptions = ref(['5', '10', '20', '50'])
+      const router = useRouter()
+      let select =
+        router.currentRoute.value.query.select ||
+        DETAIL_PAGE_CONTENT_DEFAULT_TAB
+      console.log('select------------>', select)
+      // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
+      const selectSubType = router.currentRoute.value.query.type || ''
+      const queryName = ref('')
+      const str = router.currentRoute.value.query.str
+      const searchValue = ref(str)
+      const searchType = ref(str)
+      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: [],
+      })
+      // 查询参数
+      let paramsGetResources = {
+        districtId: '',
+        deptIds: [],
+        pageNum: 1,
+        pageSize: currentPageSize.value,
+        type: Cardsname.value,
+        name: '',
+        infoList: [],
+        orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+        orderType: 'DESC', // ASC 升序  DESC 降序
+      }
+
+      const store = useStore()
+      // 用户信息
+      const user = ref({
+        username: store.getters['user/username'],
+        realName: store.getters['user/realName'],
+      })
+
+      const searchResultListDom = ref(null)
+
+      // 读取本地存储查询条件
+      let storageSearchInfo = null
+      const handleSetSearchData = () => {
+        if (localStorage.getItem('DetailsPageconetent')) {
+          storageSearchInfo = JSON.parse(
+            localStorage.getItem('DetailsPageconetent')
+          )
+        }
+        console.log('storageSearchInfo------------>', storageSearchInfo)
+        // 读取本地存储：表单赋值
+        if (storageSearchInfo) {
+          paramsGetResources = Object.assign(
+            {},
+            paramsGetResources,
+            storageSearchInfo
+          )
+          // 搜索名称
+          searchValue.value = storageSearchInfo.name
+          currentPage.value = storageSearchInfo.pageNum
+          currentPageSize.value = storageSearchInfo.pageSize
+          paramsGetResources.pageNum = storageSearchInfo.pageNum
+          paramsGetResources.pageSize = storageSearchInfo.pageSize
+          paramsGetResources.deptIds = storageSearchInfo.deptIds
+          paramsGetResources.districtId = storageSearchInfo.districtId
+
+          // 延迟使用，因为还没有返回跟挂载
+          nextTick(() => {
+            searchResultListDom.value.changeCondition(
+              {
+                value: storageSearchInfo.orderField,
+                orderType: storageSearchInfo.orderType,
+              },
+              true
+            )
+          })
+        }
+      }
+
+      //西海岸查询参数
+      let paramsGetResources2 = ref({
         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')
-      console.log(
-        'paramsGetResources---chongzhi-重置-------->',
-        paramsGetResources
-      )
-      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)
-
-      // 西海岸-智能算法 特殊处理
-      if (whoShow1.value.itShowXiHaiAn) {
-        if (tag.dict_label == '智能算法' && checked) {
-          if (ListContentCopy.value[2]) {
-            ListContent.records.splice(2, 1, ListContentCopy.value[2])
-          }
-        } else {
-          if (name == '组件类型') {
-            ListContent.records.splice(2, 1)
-            paramsGetResources.infoList = paramsGetResources.infoList.filter(
-              (item) => componentTypeArray.includes(item.attrType)
-            )
-          }
-        }
-      }
-
-      ListContent.records.forEach((val) => {
-
-        if (!val) {
-          return
-        }
-        if (val.name === name) {
-          paramsGetResources.infoList = paramsGetResources.infoList.filter(
-            (item) => item.attrType !== name
-          )
-
-          if (
-            val.selectedTags &&
-            val.selectedTags.indexOf(tag.dict_label) == -1
-          ) {
-            val.selectedTags = [tag.dict_label]
-            paramsGetResources.infoList.push({
-              attrType: name,
-              attrValue: tag.dict_label,
-            })
-          } else {
-            val.selectedTags &&
-              val.selectedTags.splice(
-                val.selectedTags.indexOf(tag.dict_label),
-                1
-              )
-          }
-
-          // 西海岸-智能算法 特殊处理
-          if (whoShow1.value.itShowXiHaiAn) {
-            if (
-              (val.selectedTags.length == 0 &&
-                tag.dict_label == '智能算法' &&
-                !checked) ||
-              (tag.dict_label !== '智能算法' && name == '组件类型')
-            ) {
-              if (ListContentCopy.value[2]) {
-                ListContentCopy.value[2].selectedTags = []
-              }
-            }
-          }
-        }
       })
-      listKey.value++
-      console.log(
-        'paramsGetResources---handleChange--------->',
-        paramsGetResources
-      )
-      getAppResources()
-    }
-    const getNewList = () => {
-      tecHnosphere = router.currentRoute.value.query.tecHnosphere
-      appLiCation = router.currentRoute.value.query.appLiCation
-      const params = {
-        topCategoryName: Cardsname.value,
+      // 查询
+      const onSearch = () => {
+        loading.value = true
+        paramsGetResources.name = searchValue.value
+        currentPage.value = 1
       }
-      selectDicStoreAll(params).then((res) => {
-        console.log('selectDicStoreAll============>', res)
-        const { data } = res.data
-        let dataCopy = data
-        tecHnosphere = router.currentRoute.value.query.tecHnosphere
-        appLiCation = router.currentRoute.value.query.appLiCation
-        mybus.emit('getDeptList')
-        dataCopy.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
-          }
-
-          if (storageSearchInfo) {
-            let obj = (storageSearchInfo.infoList || []).find(
-              (x) => x.attrType === val.name
-            )
-            if (obj) {
-              val.selectedTags = [obj.attrValue] || []
-            }
-          }
-        })
-        ListContentCopy.value = []
-        ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
-        ListContent.records = []
-        ListContent.records = JSON.parse(JSON.stringify(dataCopy))
-        if (select == '组件服务') {
-          queryName.value = '组件类型'
-        } else if (select == '应用资源') {
-          queryName.value = '应用领域'
+      // 免批
+      const tagFlag = ref('')
+      const current = ref(5)
+      const chagneTag = (name) => {
+        console.log('name----chagneTag-------->', name)
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        if (tagFlag.value == name) {
+          tagFlag.value = ''
+          paramsGetResources.shareCondition = ''
         } else {
-          queryName.value = ''
+          tagFlag.value = name
+          paramsGetResources.shareCondition = name
         }
-        ListContent.records.forEach((val) => {
+        listKey.value++
+        getAppResources()
+        console.log(
+          'paramsGetResources-----chagneTag------->',
+          paramsGetResources
+        )
+      }
 
+      // 重置数据
+      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 = []
+        })
+        // 分页
+        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')
+        console.log(
+          'paramsGetResources---chongzhi-重置-------->',
+          paramsGetResources
+        )
+        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)
+
+        // 西海岸-智能算法 特殊处理
+        if (whoShow1.value.itShowXiHaiAn) {
+          if (tag.dict_label == '智能算法' && checked) {
+            if (ListContentCopy.value[2]) {
+              ListContent.records.splice(2, 1, ListContentCopy.value[2])
+            }
+          } else {
+            if (name == '组件类型') {
+              ListContent.records.splice(2, 1)
+              paramsGetResources.infoList = paramsGetResources.infoList.filter(
+                (item) => componentTypeArray.includes(item.attrType)
+              )
+            }
+          }
+        }
+
+        ListContent.records.forEach((val) => {
           if (!val) {
             return
           }
-          // todo
-          if (val.name === queryName.value) {
+          if (val.name === name) {
+            paramsGetResources.infoList = paramsGetResources.infoList.filter(
+              (item) => item.attrType !== name
+            )
+
             if (
               val.selectedTags &&
-              val.selectedTags.indexOf(selectSubType) == -1
+              val.selectedTags.indexOf(tag.dict_label) == -1
             ) {
-              val.selectedTags = [selectSubType]
-              // changeShrink(queryName.value)
+              val.selectedTags = [tag.dict_label]
+              paramsGetResources.infoList.push({
+                attrType: name,
+                attrValue: tag.dict_label,
+              })
             } else {
               val.selectedTags &&
                 val.selectedTags.splice(
-                  val.selectedTags.indexOf(selectSubType),
+                  val.selectedTags.indexOf(tag.dict_label),
                   1
                 )
             }
+
+            // 西海岸-智能算法 特殊处理
+            if (whoShow1.value.itShowXiHaiAn) {
+              if (
+                (val.selectedTags.length == 0 &&
+                  tag.dict_label == '智能算法' &&
+                  !checked) ||
+                (tag.dict_label !== '智能算法' && name == '组件类型')
+              ) {
+                if (ListContentCopy.value[2]) {
+                  ListContentCopy.value[2].selectedTags = []
+                }
+              }
+            }
           }
         })
-        // 智能算法-特殊处理
-        if (whoShow1.value.itShowXiHaiAn) {
-          if (!storageSearchInfo) {
-            let _tag_list = dataCopy.filter((v) =>
-              componentTypeArray.includes(v.name)
-            )
-            ListContent.records = _tag_list
-          }
-        }
         listKey.value++
-        listKey2.value++
-      })
-      console.log('selectDicStoreAll', ListContent)
-    }
-    // 筛选条件
-    let ListContent = reactive({
-      records: [],
-    })
-    let ListContentCopy = ref([])
-    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)
+        console.log(
+          'paramsGetResources---handleChange--------->',
+          paramsGetResources
+        )
+        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
+          let dataCopy = data
+          tecHnosphere = router.currentRoute.value.query.tecHnosphere
+          appLiCation = router.currentRoute.value.query.appLiCation
+          mybus.emit('getDeptList')
+          dataCopy.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
+            }
+
+            if (storageSearchInfo) {
+              let obj = (storageSearchInfo.infoList || []).find(
+                (x) => x.attrType === val.name
+              )
+              if (obj) {
+                val.selectedTags = [obj.attrValue] || []
+              }
             }
           })
-          if (!mapFlag) {
-            return
+          ListContentCopy.value = []
+          ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
+          ListContent.records = []
+          ListContent.records = JSON.parse(JSON.stringify(dataCopy))
+          if (select == '组件服务') {
+            queryName.value = '组件类型'
+          } else if (select == '应用资源') {
+            queryName.value = '应用领域'
+          } else {
+            queryName.value = ''
           }
-          if (paramsGetResources.type == '基础设施') {
-            console.log('camera1', camera.value)
-            camera.value.getCamera(true, searchValue.value)
+          ListContent.records.forEach((val) => {
+            if (!val) {
+              return
+            }
+            // todo
+            if (val.name === queryName.value) {
+              if (
+                val.selectedTags &&
+                val.selectedTags.indexOf(selectSubType) == -1
+              ) {
+                val.selectedTags = [selectSubType]
+                // changeShrink(queryName.value)
+              } else {
+                val.selectedTags &&
+                  val.selectedTags.splice(
+                    val.selectedTags.indexOf(selectSubType),
+                    1
+                  )
+              }
+            }
+          })
+          // 智能算法-特殊处理
+          if (whoShow1.value.itShowXiHaiAn) {
+            if (!storageSearchInfo) {
+              let _tag_list = dataCopy.filter((v) =>
+                componentTypeArray.includes(v.name)
+              )
+              ListContent.records = _tag_list
+            }
+          }
+          listKey.value++
+          listKey2.value++
+        })
+        console.log('selectDicStoreAll', ListContent)
+      }
+      // 筛选条件
+      let ListContent = reactive({
+        records: [],
+      })
+      let ListContentCopy = ref([])
+      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()
+            }
+            console.log(
+              'paramsGetResources--globalSearch---------->',
+              paramsGetResources
+            )
+          })
+        } 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 {
+          if (storageSearchInfo) {
+            getAppResources('分页查询')
           } else {
             getAppResources()
           }
-          console.log(
-            'paramsGetResources--globalSearch---------->',
-            paramsGetResources
-          )
-        })
-      } 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 {
-        if (storageSearchInfo) {
-          getAppResources('分页查询')
-        } else {
-          getAppResources()
         }
       }
-    }
-    const getAppResources = (switchIndex) => {
-      if (!globalFlag.value) {
-        globalData.data = []
-      }
-      select = router.currentRoute.value.query.select
-      if (
-        (select == '应用资源' &&
-          (paramsGetResources.orderField == '' ||
-            paramsGetResources.orderField == 'deptSort' ||
-            paramsGetResources.orderField == 'pin_top')) ||
-        (paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0] &&
+      const getAppResources = (switchIndex) => {
+        if (!globalFlag.value) {
+          globalData.data = []
+        }
+        select = router.currentRoute.value.query.select
+        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].attrValue == '图层服务' &&
+          )[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 == 'pin_top')
+        ) {
+          paramsGetResources.orderField = 'pin_top'
+        } else if (
+          paramsGetResources.orderField == '' ||
           paramsGetResources.orderField == 'deptSort' ||
-          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
-        if (
-          searchValue.value.length >= 2 &&
-          paramsGetResources.type !== '基础设施'
+          paramsGetResources.orderField == 'pin_top'
         ) {
-          str = searchValue.value.substring(0, 2)
-          r = re.test(str)
+          paramsGetResources.orderField = ''
         }
-        if (
-          (searchValue.value.length > 1 && r) ||
-          paramsGetResources.type === '基础设施'
-        ) {
+        if (searchValue.value) {
+          let str = ''
+          let r = null
+          if (
+            searchValue.value.length >= 2 &&
+            paramsGetResources.type !== '基础设施'
+          ) {
+            str = searchValue.value.substring(0, 2)
+            r = re.test(str)
+          }
+          if (
+            (searchValue.value.length > 1 && r) ||
+            paramsGetResources.type === '基础设施'
+          ) {
+            paramsGetResources.name = searchValue.value
+            paramsGetResources.type = Cardsname.value
+            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) => {
+                loading.value = false
+                console.log('res.data.data----874-------->', res.data.data)
+                if (whoShow1.value.itShowQingDao) {
+                  if (whoShow1.value.itShowZhanTingDev) {
+                    // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样
+                    console.log('999----->', res.data.data.list)
+                    getXiHaiAn(res)
+                  } else {
+                    getQingDao(res)
+                  }
+                } else if (whoShow1.value.itShowXiHaiAn) {
+                  getXiHaiAn(res)
+                }
+              })
+            } else if (
+              paramsGetResources.type !== '数据资源' &&
+              (paramsGetResources.type !== '基础设施' ||
+                !whoShow1.value.itShowXiHaiAn)
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              pageWithAttrs(paramsGetResources).then((res) => {
+                if (res.data.code != 0) {
+                  return message.error(res.data.msg)
+                }
+                console.log(
+                  '查询列表====22========>',
+                  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 || []
+                }
+              })
+            } 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 {
+          //switchIndex这个参数是下面的分页传过来的参数
           paramsGetResources.name = searchValue.value
           paramsGetResources.type = Cardsname.value
           if (
@@ -980,25 +1354,24 @@ export default defineComponent({
                   ? 'syqk'
                   : 'fbrq'
                 : paramsGetResources.orderField == 'applyCount'
-                  ? 'requestCount'
-                  : 'createTime', //排序字段
+                ? 'requestCount'
+                : 'createTime', //排序字段
               orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
               pageNum: paramsGetResources.pageNum, //页码
               pageSize: paramsGetResources.pageSize, //分页大小
             }
             getDataResource(dataResourceParams).then((res) => {
               loading.value = false
-              console.log('res.data.data----874-------->', res.data.data)
+              console.log('res.data.data----982-------->', res.data.data)
               if (whoShow1.value.itShowQingDao) {
                 if (whoShow1.value.itShowZhanTingDev) {
-                  // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样
-                  console.log('999----->', res.data.data.list)
                   getXiHaiAn(res)
                 } else {
                   getQingDao(res)
                 }
               } else if (whoShow1.value.itShowXiHaiAn) {
                 getXiHaiAn(res)
+                loading.value = false
               }
             })
           } else if (
@@ -1010,11 +1383,8 @@ export default defineComponent({
               paramsGetResources.pageNum = 1
             }
             pageWithAttrs(paramsGetResources).then((res) => {
-              if (res.data.code != 0) {
-                return message.error(res.data.msg)
-              }
               console.log(
-                '查询列表====22========>',
+                '查询列表===11=========>',
                 resourceList,
                 res.data.data
               )
@@ -1030,7 +1400,7 @@ export default defineComponent({
               }
             })
           } else if (
-            paramsGetResources.type === '基础设施' &&
+            paramsGetResources.type === '基础设施' ||
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -1038,234 +1408,156 @@ export default defineComponent({
             }
             paramsGetResources2.value.pageNum = paramsGetResources.pageNum
             paramsGetResources2.value.pageSize = paramsGetResources.pageSize
-            paramsGetResources2.value.name = paramsGetResources.name
           }
-        } else {
-          message.error('请以两位以上汉字或数字开头')
-        }
-      } else {
-        //switchIndex这个参数是下面的分页传过来的参数
-        paramsGetResources.name = searchValue.value
-        paramsGetResources.type = Cardsname.value
-        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) => {
-            loading.value = false
-            console.log('res.data.data----982-------->', res.data.data)
-            if (whoShow1.value.itShowQingDao) {
-              if (whoShow1.value.itShowZhanTingDev) {
-                getXiHaiAn(res)
-              } else {
-                getQingDao(res)
-              }
-            } else if (whoShow1.value.itShowXiHaiAn) {
-              getXiHaiAn(res)
-              loading.value = false
-            }
-          })
-        } else if (
-          paramsGetResources.type !== '数据资源' &&
-          (paramsGetResources.type !== '基础设施' ||
-            !whoShow1.value.itShowXiHaiAn)
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          pageWithAttrs(paramsGetResources).then((res) => {
-            console.log(
-              '查询列表===11=========>',
-              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 || []
-            }
-          })
-        } else if (
-          paramsGetResources.type === '基础设施' ||
-          whoShow1.value.itShowXiHaiAn
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          paramsGetResources2.value.pageNum = paramsGetResources.pageNum
-          paramsGetResources2.value.pageSize = paramsGetResources.pageSize
         }
       }
-    }
 
-    // 青岛-数据处理
-    const getQingDao = (res) => {
-      ((res.data && res.data.data && 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 || ''
-    }
-    // 青岛-西海岸处理
-    const getXiHaiAn = (res) => {
-      ((res.data && res.data.data && 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 || ''
-    }
-
-    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 = console.log(
-          '经过过滤后的列表信息',
-          list
+      // 青岛-数据处理
+      const getQingDao = (res) => {
+        ;((res.data && res.data.data && 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 = 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
+        resourceList.data = res.data.data.data || []
+        resourceTotal.value = res.data.data.rows || ''
       }
-      getAppResources()
-      console.log(
-        'paramsGetResources-----paramsGetResources------->',
-        paramsGetResources
-      )
-    })
-    mybus.on('changePage', (page) => {
-      paramsGetResources.pageNum = page
-      getAppResources('分页查询')
-      console.log(
-        'paramsGetResources----changePage-------->',
-        paramsGetResources
-      )
-    })
-    mybus.on('changeSelcted', () => {
-      // 添加申购车后，返回第一页
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      getAppResources()
-      console.log(
-        'paramsGetResources----changeSelcted-------->',
-        paramsGetResources
-      )
-    })
-    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)
+      // 青岛-西海岸处理
+      const getXiHaiAn = (res) => {
+        ;((res.data && res.data.data && 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 || ''
       }
-      getAppResources()
-      console.log(
-        'paramsGetResources-----changeInfo------->',
-        paramsGetResources
-      )
-    })
-    mybus.on('refresh', () => {
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      getAppResources()
-      console.log(
-        'paramsGetResources-----refresh------->',
-        paramsGetResources
-      )
-    })
 
-    mybus.on('changeCondition', (condition) => {
-      if (!storageSearchInfo) {
-        // 回到第一页，分页页码为1
+      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 = 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
+        }
+        getAppResources()
+        console.log(
+          'paramsGetResources-----paramsGetResources------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changePage', (page) => {
+        paramsGetResources.pageNum = page
+        getAppResources('分页查询')
+        console.log(
+          'paramsGetResources----changePage-------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changeSelcted', () => {
+        // 添加申购车后，返回第一页
         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
-      if (storageSearchInfo) {
-        getAppResources('分页查询')
-      } else {
         getAppResources()
+        console.log(
+          'paramsGetResources----changeSelcted-------->',
+          paramsGetResources
+        )
+      })
+      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-----changeInfo------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('refresh', () => {
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        getAppResources()
+        console.log(
+          'paramsGetResources-----refresh------->',
+          paramsGetResources
+        )
+      })
+
+      mybus.on('changeCondition', (condition) => {
+        if (!storageSearchInfo) {
+          // 回到第一页，分页页码为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
+        if (storageSearchInfo) {
+          getAppResources('分页查询')
+        } else {
+          getAppResources()
+        }
+        console.log(
+          'paramsGetResources---changeCondition--------->',
+          paramsGetResources
+        )
+      })
+
+      const pageChange = (val) => {
+        console.log('pageChange------------>', val)
+        loading.value = true
+        currentPage.value = val
+        paramsGetResources.pageNum = val
+        getAppResources('分页查询') //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+        console.log(
+          'paramsGetResources-----pageChange------->',
+          paramsGetResources
+        )
       }
-      console.log(
-        'paramsGetResources---changeCondition--------->',
-        paramsGetResources
-      )
-    })
 
-    const pageChange = (val) => {
-      console.log('pageChange------------>', val)
-      loading.value = true
-      currentPage.value = val
-      paramsGetResources.pageNum = val
-      getAppResources('分页查询') //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-      console.log(
-        'paramsGetResources-----pageChange------->',
-        paramsGetResources
-      )
-    }
-
-
-    // 判断是否存在二级类型（首页-能力分类-图层服务）查询条件
-    const judgeHasSubSelectType = () => {
-      if (selectSubType) {
-            paramsGetResources.infoList = []
+      // 判断是否存在二级类型（首页-能力分类-图层服务）查询条件
+      const judgeHasSubSelectType = () => {
+        if (selectSubType) {
+          paramsGetResources.infoList = []
           if (select == '组件服务') {
             queryName.value = '组件类型'
           } else if (select == '应用资源') {
@@ -1277,831 +1569,840 @@ export default defineComponent({
             searchType.value = ''
           }
           let info = { attrType: queryName.value, attrValue: selectSubType }
-            paramsGetResources.infoList.push(info)
+          paramsGetResources.infoList.push(info)
+        }
+        // changeShrink(queryName.value)
+        paramsGetResources.type = select
+        console.log(
+          'paramsGetResources---onMounted--------->',
+          paramsGetResources
+        )
+      }
+
+      onMounted(() => {
+        // 从本地读取查询条件，赋值
+        handleSetSearchData()
+
+        listKey2.value++
+        // 获取筛选条件
+        getNewList()
+        if (!tecHnosphere && !appLiCation) {
+          if (searchValue.value && !select) {
+            globalSearch()
+          } else {
+            judgeHasSubSelectType()
+            getAppResources2()
+            listKey.value++
           }
-          // changeShrink(queryName.value)
-          paramsGetResources.type = select
-          console.log('paramsGetResources---onMounted--------->', paramsGetResources);
-    }
-
-    onMounted(() => {
-      // 从本地读取查询条件，赋值
-      handleSetSearchData()
-
-      listKey2.value++
-      // 获取筛选条件
-      getNewList()
-      if (!tecHnosphere && !appLiCation) {
-        if (searchValue.value && !select) {
-          globalSearch()
-        } else {
-          judgeHasSubSelectType()
-          getAppResources2()
-          listKey.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
-      getAppResources()
-      console.log(
-        'paramsGetResources----onShowSizeChange-------->',
-        paramsGetResources
-      )
-    }
-    watch(currentPageSize, () => {
-      console.log('pageSize', currentPageSize.value)
-    })
-
-    const changeShrink = (name) => {
-      console.log('name---changeShrink--------->', name);
-      ListContent.records.forEach((val) => {
-        if (val.name === name) {
-          console.log(val)
-          val.shrinkFlag = !val.shrinkFlag
         }
       })
-    }
-    const changeCards = (name) => {
-      // 西海岸-特殊处理
-      if (whoShow1.value.itShowXiHaiAn) {
-        if (name !== '基础设施' && !xhaHasPermissionUser.list.includes(user.value.username)) {
-          return message.warn('暂无权限')
+      // 全部申请
+      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
+        getAppResources()
+        console.log(
+          'paramsGetResources----onShowSizeChange-------->',
+          paramsGetResources
+        )
+      }
+      watch(currentPageSize, () => {
+        console.log('pageSize', currentPageSize.value)
+      })
+
+      const changeShrink = (name) => {
+        console.log('name---changeShrink--------->', name)
+        ListContent.records.forEach((val) => {
+          if (val.name === name) {
+            console.log(val)
+            val.shrinkFlag = !val.shrinkFlag
+          }
+        })
+      }
+      const changeCards = (name) => {
+        // 西海岸-特殊处理
+        if (whoShow1.value.itShowXiHaiAn) {
+          if (
+            name !== '基础设施' &&
+            !xhaHasPermissionUser.list.includes(user.value.username)
+          ) {
+            return message.warn('暂无权限')
+          }
+        }
+        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
+        newQuery.select = Cardsname.value
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {
+            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
         }
       }
-      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
-      newQuery.select = Cardsname.value
-      router
-        .replace({
-          query: newQuery,
+      let abilitySquareFunctionData = ref('智能算法')
+      const abilitySquareFunction = (e) => {
+        let snumSquare = ref({})
+        if (e === '应用广场') {
+          abilitySquareFunctionData.value = '应用资源'
+        } else if (e === '算法广场') {
+          abilitySquareFunctionData.value = '智能算法'
+        } else if (e === 'GIS广场') {
+          abilitySquareFunctionData.value = '图层服务'
+        }
+        snumSquare.value = {
+          abilityToType: abilitySquareFunctionData.value,
+        }
+        const applypage = router.resolve({
+          path: '/capacitySquare', // 跳转的页面路由
+          query: snumSquare.value,
         })
-        .then(() => {
-          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
+        window.open(applypage.href, '_blank')
         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 = '图层服务'
       }
-      snumSquare.value = {
-        abilityToType: abilitySquareFunctionData.value,
+
+      // 存储查询条件到本地 todo
+      const saveSearchCodition = () => {
+        console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
+        localStorage.setItem(
+          'DetailsPageconetent',
+          JSON.stringify(paramsGetResources)
+        )
       }
-      const applypage = router.resolve({
-        path: '/capacitySquare', // 跳转的页面路由
-        query: snumSquare.value,
-      })
-      window.open(applypage.href, '_blank')
-      visibleAbilitySquare.value = false
-      abilitySquareFunctionData.value = '智能算法'
-    }
 
-    // 存储查询条件到本地 todo
-    const saveSearchCodition = () => {
-      console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
-      localStorage.setItem(
-        'DetailsPageconetent',
-        JSON.stringify(paramsGetResources)
-      )
-    }
-
-    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,
-      loading,
-      getShoppingCartList,
-      whoShow1,
-      applyAll,
-      handleAdd,
-      flag,
-      abilitySquare,
-      visibleAbilitySquare,
-      showAbilitySquare,
-      abilitySquareFunction,
-      abilitySquareFunctionData,
-      showAbilitySquareNum,
-      globalData,
-      globalSearch,
-      camera,
-      saveSearchCodition,
-      searchResultListDom,
-      handleSetSearchData, // todo
-    }
-  },
-  components: {
-    HomeHeader,
-    HomeFooter,
-    detailsPageconetentTree,
-    searchResultList,
-    UpOutlined,
-    DownOutlined,
-    KnowledgeBase,
-    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')
-  },
-})
+      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,
+        loading,
+        getShoppingCartList,
+        whoShow1,
+        applyAll,
+        handleAdd,
+        flag,
+        abilitySquare,
+        visibleAbilitySquare,
+        showAbilitySquare,
+        abilitySquareFunction,
+        abilitySquareFunctionData,
+        showAbilitySquareNum,
+        globalData,
+        globalSearch,
+        camera,
+        saveSearchCodition,
+        searchResultListDom,
+        handleSetSearchData, // todo
+      }
+    },
+    components: {
+      HomeHeader,
+      HomeFooter,
+      detailsPageconetentTree,
+      searchResultList,
+      UpOutlined,
+      DownOutlined,
+      KnowledgeBase,
+      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');
-}
+  @font-face {
+    font-family: 'webfont';
+    src: url('~@/assets/capacitySquare/webfont.ttf');
+  }
 
-.resultListSearchInput-father {
-  background: #f3f5f9;
-  padding: 0.2rem;
+  .resultListSearchInput-father {
+    background: #f3f5f9;
+    padding: 0.2rem;
 
-  .resultListSearchInput-son {
-    background: #fff;
-    padding: 0.2rem 0.2rem 0rem 0.3rem;
+    .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) {
+      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-search-button) {
+  .button-reset {
+    border: 0;
+    outline: none;
     width: 0.8rem;
     height: 0.36rem;
-    background: #0087ff;
-    border-radius: 0.04rem !important;
+    background: #e1edfa;
+    border-radius: 0.04rem;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #fff;
+    color: #0087ff;
     line-height: 0.34rem;
-    margin-left: 0.1rem;
-  }
-
-  :deep(.ant-input-group-addon) {
-    left: 0 !important;
-  }
-}
-
-.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;
+    cursor: pointer;
+  }
 
-    .pagination {
-      background: #f3f5f9;
-      padding-bottom: 0.6rem;
+  .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;
     }
 
-    .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;
-            }
-          }
-        }
-      }
-
-      .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 {
+    .top {
+      min-height: 7.2rem;
+      position: relative;
+      width: 11.5rem;
       display: flex;
+      padding-top: 0.2rem;
       flex-direction: column;
-      justify-content: center;
-      padding-top: 0.4rem;
+      font-size: 0.16rem;
+      justify-content: left;
+      margin-left: 2.5rem;
+      background: #f3f5f9;
 
-      .yunziyuan {
-        width: 100%;
-        position: relative;
+      .pagination {
+        background: #f3f5f9;
+        padding-bottom: 0.6rem;
+      }
 
-        .shuoming {
-          position: absolute;
-          right: 0.2rem;
-          top: 0.15rem;
-          font-size: 0.12rem;
-        }
+      .jichusheshi {
+        height: 4.45rem;
 
-        .yunziyuan-title {
-          display: flex;
-          align-items: center;
-          margin-left: 0.2rem;
+        .yunziyuan {
+          width: 100%;
+          position: relative;
 
-          .tupian {}
+          .shuoming {
+            position: absolute;
+            right: 0.2rem;
+            top: 0.15rem;
+            font-size: 0.12rem;
+          }
 
-          .title {
-            margin-left: 0.1rem;
-            font-weight: 600;
-            text-decoration: underline;
-            cursor: pointer;
+          .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;
+              }
+            }
           }
         }
 
-        .fenlei {
-          display: flex;
-          margin-left: 0.2rem;
-          margin-right: 0.3rem;
-          justify-content: space-between;
+        .yunziyuan > div {
+          margin-bottom: 0.1rem;
         }
 
-        .keyongziyuan {
-          display: flex;
-          justify-content: space-between;
-          margin-left: 0.3rem;
-          margin-right: 0.3rem;
+        .shipin {
+          width: 100%;
 
-          div {
+          .shipin-title {
             display: flex;
+            align-items: center;
 
-            div:last-child {
+            .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;
+        }
       }
 
-      .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;
+      .jichusheshi > div {
+        padding-top: 0.1rem;
+        border-radius: 0.04rem;
+        margin-bottom: 0.2rem;
+        padding-bottom: 0.4rem;
       }
 
-      div {
-        padding: 0 0.1rem;
-        cursor: pointer;
+      .shujuziyuan {
         display: flex;
-        align-items: center;
-      }
+        flex-direction: column;
+        justify-content: center;
+        padding-top: 0.4rem;
 
-      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;
+        .yunziyuan {
+          width: 100%;
           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;
-        }
+          .shuoming {
+            position: absolute;
+            right: 0.2rem;
+            top: 0.15rem;
+            font-size: 0.12rem;
+          }
 
-        .leixingsumfather2 {
-          width: 9.2rem;
-        }
-
-        .leixingsum {
-          display: inline-block;
-          cursor: pointer;
-          text-align: center;
-          margin-top: 0.05rem;
-
-          .ant-tag-checkable {
-            width: 1rem;
-            height: 0.25rem;
+          .yunziyuan-title {
             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;
+            margin-left: 0.2rem;
+
+            .tupian {
+            }
+
+            .title {
+              margin-left: 0.1rem;
+              font-weight: 600;
+              text-decoration: underline;
+              cursor: pointer;
+            }
           }
 
-          :deep(.ant-tag-checkable-checked) {
-            margin-left: 0.15rem;
-            margin-right: 0.15rem;
-            text-align: center;
+          .fenlei {
+            display: flex;
+            margin-left: 0.2rem;
+            margin-right: 0.3rem;
+            justify-content: space-between;
           }
 
-          .ant-tag-checkable:active,
-          .ant-tag-checkable-checked {
-            // width: 0.85rem;
-            width: 1rem;
-            font-family: 'Alibaba PuHuiTi';
+          .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 {
+          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: 1rem;
+              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;
+              width: 1rem;
+              font-family: 'Alibaba PuHuiTi';
+              font-weight: 500;
+              background-color: #0087ff;
+              color: #ffffff;
+              border-radius: 0.16rem;
+            }
+          }
+
+          .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;
+    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;
+
+    .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;
+      }
+
+      .leixingsumfather {
+        width: 7.7rem;
+        display: inline-block;
+        height: 0.3014rem;
+        overflow: hidden;
+      }
+
+      .leixingsum {
+        // width: 1rem;
+        display: inline-block;
+        cursor: pointer;
+        text-align: center;
+        margin-top: 0.05rem;
+
+        .ant-tag-checkable {
+          width: 1rem;
+          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;
-  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;
-
-  .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;
-    }
-
-    .leixingsumfather {
-      width: 7.7rem;
-      display: inline-block;
-      height: 0.3014rem;
-      overflow: hidden;
-    }
-
-    .leixingsum {
-      // width: 1rem;
-      display: inline-block;
-      cursor: pointer;
-      text-align: center;
-      margin-top: 0.05rem;
-
-      .ant-tag-checkable {
-        width: 1rem;
-        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';
+      .active {
+        font-family: Alibaba PuHuiTi;
         font-weight: 500;
         background-color: #0087ff;
         color: #ffffff;
-        border-radius: 0.16rem;
       }
     }
 
-    .active {
-      font-family: Alibaba PuHuiTi;
-      font-weight: 500;
-      background-color: #0087ff;
-      color: #ffffff;
+    .top-content:nth-child(1) {
+      margin-top: 0.41rem !important;
     }
   }
 
-  .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;
   }
-}
-
-: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/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 99d22fcc..1fc314bb 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -230,13 +230,8 @@
                   </span>
                 </template>
               </div>
-              <div
-                v-if="
-                  selectCardsname === '打包模式'
-                "
-                class="label-content1"
-              >
-              发布时间：
+              <div v-if="selectCardsname === '打包模式'" class="label-content1">
+                发布时间：
                 <template v-if="item.createDate">
                   <span>
                     {{ item.createDate.substring(0, 10) + ' ' }}
@@ -300,11 +295,13 @@
                 >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
+                <!-- 青岛不展示数据量 -->
                 <div
                   v-if="
                     selectCardsname === '数据资源' &&
                     selectCardsname !== '融合服务' &&
-                    selectCardsname !== '赋能场景'
+                    selectCardsname !== '赋能场景' &&
+                    whoShow1.itShowXiHaiAn
                   "
                 >
                   数据量：{{ item.sjlCount || 0 }}
@@ -1004,7 +1001,7 @@
           margin: 0 10px 0 0;
 
           .header-right {
-           // display: flex;
+            // display: flex;
             font-size: 14px;
             color: #212121;
 

From 983b2c053488e2a628f02968948db7140b9f9679 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 25 Oct 2022 15:11:47 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 6aff800a..58173185 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -2626,6 +2626,11 @@
       text-align: end;
     }
   }
+  :deep(.ant-table-thead > tr > th) {
+    color: #5580f7 !important;
+    font-size: 16px !important;
+    font-weight: 600 !important;
+  }
 </style>
 <style lang="less">
   .wrj {