diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index 37616e9b..9608ff60 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -2,16 +2,16 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-27 14:25:39
+ * @LastEditTime: 2022-10-12 15:25:01
  * @Description: 告诉大家这是什么
  */
 var _global = {}
 var CONFIGITEM = {
-  version: 'qingdao', // 青岛
+  // version: 'qingdao', // 青岛
   // version: 'xihaian', // 西海岸
   // version: 'test', // 测试
   // version: 'frp', // 内网穿透
-  // version: 'dev', // 开发
+  version: 'xihaian', // 开发
   vNum: 'v0.8.7.2',
   configData: {
     // 青岛市大数据局
@@ -24,7 +24,9 @@ var CONFIGITEM = {
     xihaian: {
       previewUrl: 'http://10.134.135.9:9796/',
       // apiURL: 'http://10.134.135.9:8888/renren-admin',
-      apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成
+      // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
+      apiURL: 'http://192.168.124.236:8888/renren-admin',
+      // apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
       websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
     },
     // 测试
diff --git a/back/src/views/main-sidebar-sub-menu.vue b/back/src/views/main-sidebar-sub-menu.vue
index 90df26c5..6f9c82ce 100644
--- a/back/src/views/main-sidebar-sub-menu.vue
+++ b/back/src/views/main-sidebar-sub-menu.vue
@@ -9,6 +9,7 @@
         <use :xlink:href="`#${menu.icon}`"></use>
       </svg>
       <span class="first-level-text">{{ menu.name }}</span>
+      <span class="tabNum" v-if="menu.total && menu.total !==0">{{menu.total}}</span>
     </template>
     <sub-menu
       v-for="item in menu.children"
@@ -32,6 +33,7 @@
         <use :xlink:href="`#${menu.icon}`"></use>
       </svg>
       <span>{{ menu.name }}</span>
+      <span class="tabNum" v-if="menu.total && menu.total !==0 ">{{menu.total}}</span>
     </a>
   </el-menu-item>
 </template>
@@ -110,6 +112,13 @@ export default {
 </script>
 
 <style lang="scss">
+.tabNum{
+  color: #ffffff;
+  margin-left: 5px;
+  background: red;
+  padding:1px  4px;
+  border-radius:5px;
+}
 .aui-sidebar__menu {
   .first-level-text {
     font-size: 16px;
diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index af5f8261..1b79b521 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -18,29 +18,81 @@
         :collapseTransition="false"
         class="aui-sidebar__menu"
       >
+      <div >
         <sub-menu
-          v-for="menu in $store.state.sidebarMenuList"
+           v-for="menu in $store.state.sidebarMenuList"
           :key="menu.id"
           :menu="menu"
-        />
+        >
+        <span>sdddd</span>
+     
+        </sub-menu>
+      </div>
       </el-menu>
     </div>
   </aside>
 </template>
 
 <script>
+import http from '@/utils/request'
 import SubMenu from "./main-sidebar-sub-menu";
 export default {
   data() {
-    return {};
+    return {
+      numObject:{}
+    };
   },
   components: {
     SubMenu,
   },
   created() {
-    this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    this.getNum()
+    //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
   },
-};
+  methods: {
+    getNum(){
+      http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
+    this.numObject=res.data
+    console.log("this.numObject========",this.numObject)
+   let menuList= window.SITE_CONFIG["menuList"];
+   for(var i=0;i<menuList.length;i++){
+     let menu=menuList[i];
+    // menu.total=0;
+      if(menu.id=='1541261628388888578'){//我的待办
+        let daibanNum=0
+      for(let j=0;j<menu.children.length;j++){
+        let children=menu.children[j]
+        if(children.id=="1541261780432408577"){//能力申请 v3
+          children.total=Number(this.numObject.abilityprocess_v3)
+         daibanNum=Number(daibanNum)+Number(children.total)
+      } if(children.id=="1559376285703081986"){//会议室审核
+        children.total=Number(this.numObject.meetingroom_book)
+         daibanNum=Number(daibanNum)+Number(children.total)
+      }if(children.id=="1545292602084827138"){//能力资源上架
+        children.total=Number(this.numObject.resourcemountapply)
+         daibanNum=Number(daibanNum)+Number(children.total)
+      }if(children.id=="1545312045695377410"){//能力需求申请
+        children.total=Number(this.numObject.abilitydemandapply)
+         daibanNum=Number(daibanNum)+Number(children.total)
+      }if(children.id=="1545313018614521857"){//能力需求下架
+        children.total=Number(this.numObject.resourcundercarriageapply)
+         daibanNum=Number(daibanNum)+Number(children.total)
+      }if(children.id=="1545313754106699777"){//评论审核
+        children.total=Number(this.numObject.comment_review)
+         daibanNum=Number(daibanNum)+Number(children.total)
+      }if(children.id=="1554294862931562498"){//会议室 暂无
+        children.total=0
+         daibanNum=Number(daibanNum)+Number(children.total)
+      }
+    
+      }
+      menu.total=daibanNum
+    }
+  }
+    this.$store.state.sidebarMenuList=menuList
+})
+  }
+}};
 </script>
 <style scoped lang="scss">
 .aui-sidebar {
diff --git a/back/src/views/modules/sys/menu-add-or-update.vue b/back/src/views/modules/sys/menu-add-or-update.vue
index 4df7fa18..ed7ddd49 100644
--- a/back/src/views/modules/sys/menu-add-or-update.vue
+++ b/back/src/views/modules/sys/menu-add-or-update.vue
@@ -33,9 +33,13 @@
       <el-form-item prop="sort" :label="$t('menu.sort')">
         <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
       </el-form-item>
+      <!-- 授权标识 -->
       <el-form-item prop="permissions" :label="$t('menu.permissions')">
         <el-input v-model="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
       </el-form-item>
+      <el-form-item prop="site" label="站点标识">
+        <el-input v-model="dataForm.site" placeholder="请输入站点标识(1为共享门户,0为后台管理)"></el-input>
+      </el-form-item>
       <el-form-item v-if="dataForm.type === 0" prop="icon" :label="$t('menu.icon')" class="icon-list">
         <el-popover v-model="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
           <div class="mod-sys__menu-icon-inner">
@@ -77,6 +81,7 @@ export default {
         name: '',
         pid: '0',
         parentName: '',
+        site: 0,
         url: '',
         permissions: '',
         sort: 0,
@@ -98,14 +103,14 @@ export default {
   },
   watch: {
     'dataForm.type' (val) {
-      this.$refs['dataForm'].clearValidate()
+      this.$refs.dataForm.clearValidate()
     }
   },
   methods: {
     init () {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs.dataForm.resetFields()
         this.iconList = getIconList()
         console.log('iconList', this.iconList)
         this.dataForm.parentName = this.$t('menu.parentNameDefault')
@@ -159,7 +164,7 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs.dataForm.validate((valid) => {
         if (!valid) {
           return false
         }
@@ -178,7 +183,7 @@ export default {
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { leading: true, trailing: false })
   }
 }
 </script>
diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index ea1f9e0d..6d37819d 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -1,15 +1,15 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-09-19 09:36:49
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-12 15:29:29
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  version: 'xihaian', // 西海岸
-  // version: 'dev', // 开发
+  // version: 'xihaian', // 西海岸
+  version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   //version: 'test', // 测试
   //version: 'frp', // 内网穿透
@@ -61,6 +61,11 @@ var CONFIGITEM = {
         userName: '',
         userPwd: '',
       },
+      // 获取摄像头的后端接口地址
+      camreaInfo: {
+        // cameraUrl: '10.134.135.92:9537', // 测试环境
+        cameraUrl: '10.134.135.9:9537', // 生产环境
+      },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',
       // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
diff --git a/front/src/api/file.js b/front/src/api/file.js
index ccb2466b..19b43c8d 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -97,13 +97,16 @@ export function getHls(params) {
     config2
   )
 }
+
+// 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
+let _cameraUrl = _global && _global.config && _global.config.camreaInfo && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537';
 //能力集市基础设施-左侧列表
 export function getCameraInfoByAreaId(params) {
-  return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
+  return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
     config2
   )
 }
 //能力集市基础设施-摄像头
 export function getCameraByCondition(params) {
-  return axios.post('http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition', params, config2)
+  return axios.post(`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, params, config2)
 }
diff --git a/front/src/api/home.js b/front/src/api/home.js
index db989ea8..7daee6ff 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -74,7 +74,15 @@ export function getHls(params) {
 // 加入申购车
 export function sgcInsert(data) {
   return request({
-    // url: '/resourcecar/insert',
+    url: '/resourcecar/insert',
+    method: 'post',
+    data,
+  })
+}
+
+// 西海岸--加入申购车
+export function xhaAddCart(data) {
+  return request({
     url: '/resourcecar/batchInsert', // 西海岸-加入购物车相当于收藏功能
     method: 'post',
     data,
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index 08a7e1db..949868d6 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -53,7 +53,7 @@ const mutations = {
    * @param {*} state
    * @param {*} username
    */
-   setRealname(state, realName) {
+  setRealname(state, realName) {
     state.realName = realName
   },
   // 设置角色
@@ -126,16 +126,16 @@ const actions = {
    * @returns
    */
   async getUserInfo({ commit }) {
-    const { data } = await getUserInfo()
-    if (!data) {
+    const res = await getUserInfo()
+    if (!res || !res.data) {
       message.error(`验证失败，请重新登录...`)
       return false
     }
     // debugger
-    commit('setUsername', data.data.username)
-    commit('setRealname', data.data.realName)
-    commit('setRole', data.data.roleIdList.length)
-    commit('setUserId', data.data.id)
+    commit('setUsername', res.data.data.username)
+    commit('setRealname', res.data.data.realName)
+    commit('setRole', res.data.data.roleIdList.length)
+    commit('setUserId', res.data.data.id)
     // TODO 获取用户信息，后续执行部分操作
     // let { username, avatar, roles, ability } = data
     // if (username && roles && Array.isArray(roles)) {
@@ -168,6 +168,7 @@ const actions = {
    * @param {*} { commit, dispatch }
    */
   async resetAll({ dispatch }) {
+    debugger
     await dispatch('setAccessToken', '')
     await dispatch('acl/setFull', false, {
       root: true,
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index 4721f5c7..03239f01 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -11,14 +11,8 @@ import store from '@/store'
 import qs from 'qs'
 import router from '@/router'
 // import { isArray } from '@/utils/validate'
-import {
-  message
-} from 'ant-design-vue'
-import {
-  getAccessToken,
-  setAccessToken
-} from '@/utils/accessToken'
-
+import { message } from 'ant-design-vue'
+import { getAccessToken, setAccessToken } from '@/utils/accessToken'
 
 let loadingInstance
 
@@ -33,12 +27,14 @@ const handleCode = (code, msg, res) => {
   switch (code) {
     case 401:
       debugger
-      store.dispatch('user/resetAll').catch(() => { })
+      store.dispatch('user/resetAll').catch(() => {})
       break
     case 403:
-      router.push({
-        path: '/401'
-      }).catch(() => { })
+      router
+        .push({
+          path: '/401',
+        })
+        .catch(() => {})
       break
     case 500:
       message.error(msg || '接口异常')
@@ -76,7 +72,7 @@ instance.interceptors.request.use(
     if (
       config.data &&
       config.headers['Content-Type'] ===
-      'application/x-www-form-urlencoded;charset=UTF-8'
+        'application/x-www-form-urlencoded;charset=UTF-8'
     )
       config.data = qs.stringify(config.data)
     if (debounce.some((item) => config.url.includes(item))) {
@@ -103,17 +99,14 @@ instance.interceptors.response.use(
     console.log('接口返回headers', response.headers)
     console.log('接口返回REDIRECT', response.headers.redirect)
     response['Access-Control-Expose-Headers'] = 'redirect'
-    const {
-      code,
-      message
-    } = response.data
+    const { code, message } = response.data
 
     if (response.headers.token) {
       setAccessToken(response.headers.token)
     }
     if (response.headers.redirect) {
-      const _old_href = window.location.href.split('#')[0];
-      const _new_href = response.headers.redirect.split('#')[0];
+      const _old_href = window.location.href.split('#')[0]
+      const _new_href = response.headers.redirect.split('#')[0]
       window.location.replace(response.headers.redirect)
       // url 相同，强制刷新
       if (_old_href === _new_href) {
@@ -124,7 +117,7 @@ instance.interceptors.response.use(
     if (response.headers.redirect === '/#/login') {
       var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
       if (keys) {
-        for (var i = keys.length; i--;) {
+        for (var i = keys.length; i--; ) {
           document.cookie =
             keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
           document.cookie =
@@ -168,14 +161,14 @@ instance.interceptors.response.use(
     console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
 
-    const {
-      response,
-      message
-    } = error
+    const { response, message } = error
     if (error.response) {
       console.log('接口返回', response)
       console.log('接口返回headers', response.headers)
       console.log('接口返回REDIRECT', response.headers.redirect)
+      const { status, data } = response
+
+      handleCode(status, data.msg || message, response.headers.redirect)
       if (response.headers.token) {
         setAccessToken(response.headers.token)
       }
@@ -183,17 +176,10 @@ instance.interceptors.response.use(
         window.location.replace(response.headers.redirect)
         return Promise.resolve()
       }
-      const {
-        status,
-        data
-      } = response
 
-      handleCode(status, data.msg || message, response.headers.redirect)
       return Promise.reject(error)
     } else {
-      let {
-        message
-      } = error
+      let { message } = error
       if (message === 'Network Error') {
         message = '后端接口连接异常'
       }
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index 1cd6fbd4..4c197d7c 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
- * @LastEditors: Light
- * @LastEditTime: 2022-10-10 16:43:58
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-11 13:59:18
  * @Description: 告诉大家这是什么
  */
 /**
@@ -26,7 +26,7 @@ router.beforeEach(async (to, from, next) => {
   // if (SSOTOKEN) {
   //   setAccessToken(SSOTOKEN)
   // }
-
+  console.log('验证白名单', routesWhiteList)
   const token = getAccessToken()
   console.log('token', token)
   let hasToken = token
@@ -45,6 +45,7 @@ router.beforeEach(async (to, from, next) => {
       router.addRoute(item)
     })
     if (routesWhiteList.indexOf(to.path) !== -1) {
+      debugger
       next()
     } else {
       // 这里是一个单点登录的入口
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 64c3021b..018e14a8 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -11,9 +11,12 @@
           <div v-for="item in dataList.dataList" :key="item.name">
             <div v-if="item.type !== '资源汇聚总量'" class="content-left">
               <div class="name">
-                <span class="name-photo" :style="{
-                  backgroundImage: `url(${item.photo}) `,
-                }"></span>
+                <span
+                  class="name-photo"
+                  :style="{
+                    backgroundImage: `url(${item.photo}) `,
+                  }"
+                ></span>
                 <span class="name-text">{{ item.type }}</span>
               </div>
               <div class="organization-value">
@@ -52,579 +55,591 @@
   </div>
 </template>
 <script setup>
-import { ref, onMounted, watch } from 'vue'
-import { selectTotal } from '@/api/home'
-import {
-  // numberOfResourcesByCategory,
-  sourceDepartmentStatistics,
-} from '@/api/abilityStatistics.js'
-// import { zywMessage } from '@/api/home'
-import * as echarts from 'echarts'
-import { message } from 'ant-design-vue'
-//各类资源汇聚量
-let dataList = ref({
-  title: '各类资源汇聚量',
-  dataList: [],
-})
-// let photo = ref([
-//   require('../../../assets/abilityStatistics/banner-jc.png'),
-//   require('../../../assets/abilityStatistics/banner-sj.png'),
-//   require('../../../assets/abilityStatistics/banner-zj.png'),
-//   require('../../../assets/abilityStatistics/banner-yy.png'),
-//   require('../../../assets/abilityStatistics/banner-zs.png'),
-// ])
-// let name = ref([])
-// 获取数据资源数据
-// const findZywMessage = () => {
-//   zywMessage().then((res) => {
-//     const { data } = res.data
-//     dataSourceNum.value = data.sxmlcount || 0
-//     snum()
-//   })
-// }
-//各类资源数目接口
-// function snum() {
-//   numberOfResourcesByCategory().then((res) => {
-//     dataList.value.dataList = res.data.data
-//     res.data.data.map((item, index) => {
-//       // if (dataList.value.dataList[index].type === '数据资源') {
-//       //   dataList.value.dataList[index].amount = dataSourceNum.value || 0
-//       // }
-//       dataList.value.dataList[index].organization = '个'
-//       dataList.value.dataList[index].photo = photo.value[index]
-//     })
-//   })
-// }
-selectTotal().then((res) => {
-  console.log('selectTotal===============>', res)
-  if(res.data.code !== 0) {
-    return message.error(res.data.msg)
-  }
-  let imgObj = {
-    '组件服务': require('../../../assets/abilityStatistics/banner-zj.png'),
-    '应用资源': require('../../../assets/abilityStatistics/banner-yy.png'),
-    '基础设施': require('../../../assets/abilityStatistics/banner-jc.png'),
-    '数据资源': require('../../../assets/abilityStatistics/banner-sj.png'),
-    '知识库': require('../../../assets/abilityStatistics/banner-zs.png'),
-  }
-  res.data.data.total.forEach((val) => {
-    let _obj = {
-      organization: '个',
-      type: val.type,
-      photo: val.type && imgObj[val.type],
-      amount: val.count,
+  import { ref, onMounted, watch } from 'vue'
+  import { selectTotal } from '@/api/home'
+  import {
+    // numberOfResourcesByCategory,
+    sourceDepartmentStatistics,
+  } from '@/api/abilityStatistics.js'
+  // import { zywMessage } from '@/api/home'
+  import * as echarts from 'echarts'
+  import { message } from 'ant-design-vue'
+  //各类资源汇聚量
+  let dataList = ref({
+    title: '各类资源汇聚量',
+    dataList: [],
+  })
+  // let photo = ref([
+  //   require('../../../assets/abilityStatistics/banner-jc.png'),
+  //   require('../../../assets/abilityStatistics/banner-sj.png'),
+  //   require('../../../assets/abilityStatistics/banner-zj.png'),
+  //   require('../../../assets/abilityStatistics/banner-yy.png'),
+  //   require('../../../assets/abilityStatistics/banner-zs.png'),
+  // ])
+  // let name = ref([])
+  // 获取数据资源数据
+  // const findZywMessage = () => {
+  //   zywMessage().then((res) => {
+  //     const { data } = res.data
+  //     dataSourceNum.value = data.sxmlcount || 0
+  //     snum()
+  //   })
+  // }
+  //各类资源数目接口
+  // function snum() {
+  //   numberOfResourcesByCategory().then((res) => {
+  //     dataList.value.dataList = res.data.data
+  //     res.data.data.map((item, index) => {
+  //       // if (dataList.value.dataList[index].type === '数据资源') {
+  //       //   dataList.value.dataList[index].amount = dataSourceNum.value || 0
+  //       // }
+  //       dataList.value.dataList[index].organization = '项'
+  //       dataList.value.dataList[index].photo = photo.value[index]
+  //     })
+  //   })
+  // }
+  selectTotal().then((res) => {
+    console.log('selectTotal===============>', res)
+    if (res.data.code !== 0) {
+      return message.error(res.data.msg)
     }
-    if (val.type == '基础设施') {
-      if (uavAndIndividualSoldier.num) {
-        _obj.amount = val.count - 0 + uavAndIndividualSoldier.num
+    let imgObj = {
+      组件服务: require('../../../assets/abilityStatistics/banner-zj.png'),
+      应用资源: require('../../../assets/abilityStatistics/banner-yy.png'),
+      基础设施: require('../../../assets/abilityStatistics/banner-jc.png'),
+      数据资源: require('../../../assets/abilityStatistics/banner-sj.png'),
+      知识库: require('../../../assets/abilityStatistics/banner-zs.png'),
+    }
+    res.data.data.total.forEach((val) => {
+      let _obj = {
+        organization: '项',
+        type: val.type,
+        photo: val.type && imgObj[val.type],
+        amount: val.count,
       }
-    }
-    dataList.value.dataList.push(_obj)
-    // switch (val.type) {
-    //   case '组件服务':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '组件服务',
-    //       photo: require('../../../assets/abilityStatistics/banner-zj.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '应用资源':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '应用资源',
-    //       photo: require('../../../assets/abilityStatistics/banner-yy.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '基础设施':
-    //     if (uavAndIndividualSoldier.num) {
-    //       val.count = val.count - 0 + uavAndIndividualSoldier.num
-    //     }
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '基础设施',
-    //       photo: require('../../../assets/abilityStatistics/banner-jc.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '数据资源':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '数据资源',
-    //       photo: require('../../../assets/abilityStatistics/banner-sj.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    //   case '知识库':
-    //     dataList.value.dataList.push({
-    //       organization: '个',
-    //       type: '知识库',
-    //       photo: require('../../../assets/abilityStatistics/banner-zs.png'),
-    //       amount: val.count,
-    //     })
-    //     break
-    // }
+      if (val.type == '基础设施') {
+        if (uavAndIndividualSoldier.num) {
+          _obj.amount = val.count - 0 + uavAndIndividualSoldier.num
+        }
+      }
+      if (val.type == '知识库') {
+        _obj.organization = '条'
+      }
+      dataList.value.dataList.push(_obj)
+      // switch (val.type) {
+      //   case '组件服务':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '组件服务',
+      //       photo: require('../../../assets/abilityStatistics/banner-zj.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '应用资源':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '应用资源',
+      //       photo: require('../../../assets/abilityStatistics/banner-yy.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '基础设施':
+      //     if (uavAndIndividualSoldier.num) {
+      //       val.count = val.count - 0 + uavAndIndividualSoldier.num
+      //     }
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '基础设施',
+      //       photo: require('../../../assets/abilityStatistics/banner-jc.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '数据资源':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '数据资源',
+      //       photo: require('../../../assets/abilityStatistics/banner-sj.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      //   case '知识库':
+      //     dataList.value.dataList.push({
+      //       organization: '项',
+      //       type: '知识库',
+      //       photo: require('../../../assets/abilityStatistics/banner-zs.png'),
+      //       amount: val.count,
+      //     })
+      //     break
+      // }
+    })
+    let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+    dataList.value.dataList.sort((a, b) => {
+      return arr.indexOf(a.type) - arr.indexOf(b.type)
+    })
   })
-  let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
-  dataList.value.dataList.sort((a, b) => {
-    return arr.indexOf(a.type) - arr.indexOf(b.type)
-  })
-})
-let datas = ref([])
-let laiyuanDataList = ref([])
-// let dataSourceNum = ref(0)
-let bumenSum = ref([])
+  let datas = ref([])
+  let laiyuanDataList = ref([])
+  // let dataSourceNum = ref(0)
+  let bumenSum = ref([])
 
-//能力统计-来源部门统计接口
-const sourceDepartment = () => {
-  sourceDepartmentStatistics().then((res) => {
-    // datas.value = res.data.data.deptTypeCount
-    bumenSum.value = res.data.data.deptCount
-    for (const key in res.data.data.deptTypeCount) {
-      datas.value.push({
-        name: key,
-        value: res.data.data.deptTypeCount[key],
-      })
-    }
-    let fanwei = ref([])
-    for (const key in res.data.data.deptTotalCount) {
-      laiyuanDataList.value.push({
-        name: res.data.data.deptTotalCount[key],
-        value: res.data.data.deptTotalCount[key],
-        fanwei: '',
-      })
-      fanwei.value.push(key)
-      fanwei.value.map((item, index) => {
-        if (index + 1 < fanwei.value.length) {
-          laiyuanDataList.value[index].fanwei =
-            item + '-' + fanwei.value[index + 1]
-        } else {
-          laiyuanDataList.value[index].fanwei = item + '以上'
-        }
-      })
-    }
-    console.log('laiyuanDataList.value', laiyuanDataList.value)
-  })
-}
-//来源部门饼图
-let leftDom = ref(0)
-const pieCharti = (dataLists) => {
-  leftDom.value += 'a'
-  echarts.init(document.getElementById('left')).dispose()
-  let chartDom = document.getElementById('left')
-  let myChart = echarts.init(chartDom)
-  let option
-  let index = -1
-  option = {
-    title: {
-      // text: '区级占比',
-      x: 'center',
-      y: '35%',
-      textStyle: {
-        fontWeight: 'normal',
-        fontSize: 16,
-      },
-    },
-    tooltip: {
-      show: true,
-      trigger: 'item',
-      formatter: '{b}: {c} ({d}%)',
-    },
-    legend: {
-      icon: 'emptyCircle',
-      height: 3,
-      itemGap: 40,
-      // orient: 'horizontal',
-      bottom: 0,
-      formatter: function (name) {
-        if (index < 4) {
-          index += 1
-        }
-        let dom = ref()
-        datas.value.map((item) => {
-          if (item.name == name) {
-            dom.value = name + '  ' + item.value
+  //能力统计-来源部门统计接口
+  const sourceDepartment = () => {
+    sourceDepartmentStatistics().then((res) => {
+      // datas.value = res.data.data.deptTypeCount
+      bumenSum.value = res.data.data.deptCount
+      for (const key in res.data.data.deptTypeCount) {
+        datas.value.push({
+          name: key,
+          value: res.data.data.deptTypeCount[key],
+        })
+      }
+      let fanwei = ref([])
+      for (const key in res.data.data.deptTotalCount) {
+        laiyuanDataList.value.push({
+          name: res.data.data.deptTotalCount[key],
+          value: res.data.data.deptTotalCount[key],
+          fanwei: '',
+        })
+        fanwei.value.push(key)
+        fanwei.value.map((item, index) => {
+          if (index + 1 < fanwei.value.length) {
+            laiyuanDataList.value[index].fanwei =
+              item + '-' + fanwei.value[index + 1]
+          } else {
+            laiyuanDataList.value[index].fanwei = item + '以上'
           }
         })
-        return dom.value
+      }
+      console.log('laiyuanDataList.value', laiyuanDataList.value)
+    })
+  }
+  //来源部门饼图
+  let leftDom = ref(0)
+  const pieCharti = (dataLists) => {
+    leftDom.value += 'a'
+    echarts.init(document.getElementById('left')).dispose()
+    let chartDom = document.getElementById('left')
+    let myChart = echarts.init(chartDom)
+    let option
+    let index = -1
+    option = {
+      title: {
+        // text: '区级占比',
+        x: 'center',
+        y: '35%',
+        textStyle: {
+          fontWeight: 'normal',
+          fontSize: 16,
+        },
       },
-    },
-    series: [
-      {
-        center: ['50%', '40%'],
-        type: 'pie',
-        selectedMode: 'single',
-        radius: ['50%', '30%'],
-        color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
-        top: '0',
-        label: {
-          normal: {
-            show: false,
-            position: 'inner',
-            formatter: '{d}%',
+      tooltip: {
+        show: true,
+        trigger: 'item',
+        formatter: '{b}: {c} ({d}%)',
+      },
+      legend: {
+        icon: 'emptyCircle',
+        height: 3,
+        itemGap: 40,
+        // orient: 'horizontal',
+        bottom: 0,
+        formatter: function (name) {
+          if (index < 4) {
+            index += 1
+          }
+          let dom = ref()
+          datas.value.map((item) => {
+            if (item.name == name) {
+              dom.value = name + '  ' + item.value
+            }
+          })
+          return dom.value
+        },
+      },
+      series: [
+        {
+          center: ['50%', '40%'],
+          type: 'pie',
+          selectedMode: 'single',
+          radius: ['50%', '30%'],
+          color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
+          top: '0',
+          label: {
+            normal: {
+              show: false,
+              position: 'inner',
+              formatter: '{d}%',
 
-            // textStyle: {
-            //   color: '#fff',
-            //   fontWeight: 'bold',
-            //   fontSize: 14,
-            // },
-          },
-        },
-        labelLine: {
-          normal: {
-            show: false,
-          },
-        },
-        data: dataLists,
-      },
-      {
-        type: 'pie',
-        center: ['50%', '40%'],
-        radius: ['58%', '50%'],
-        itemStyle: {
-          normal: {
-            color: '#c2c7d6',
-          },
-          emphasis: {
-            color: '#ADADAD',
-          },
-        },
-        label: {
-          normal: {
-            position: 'inner',
-            formatter: '{c}',
-            textStyle: {
-              color: '#777777',
-              fontWeight: 'bold',
-              fontSize: 14,
+              // textStyle: {
+              //   color: '#fff',
+              //   fontWeight: 'bold',
+              //   fontSize: 14,
+              // },
             },
           },
-        },
-        // data: dataLists,
-      },
-    ],
-  }
-
-  option && myChart.setOption(option)
-}
-//来源部门漏斗图
-const funnelPlot = (dataList) => {
-  // 排序
-  let arrCopy = ['0-5', '5-10', '10-15', '15-20', '20以上']
-  // 真实数据
-  dataList.sort((a, b) => {
-    return Number(a.value) - Number(b.value)
-  })
-  
-  let _arr = dataList.map(v => v.fanwei) || arrCopy;
-  // 数据配置形成金字塔形状固定
-  let chartData = _arr.map((v, i) => {
-    return {
-      name: v,
-      value: 10 + 10 * i,
-    }
-  })
-
-  let newArr = [];
-  dataList.map(v => {
-    if (v.value && Number(v.value > 0)) {
-      newArr.push({
-        name: v.fanwei,
-        value: v.value
-      })
-    }
-  })
-  console.log('============》', dataList)
-  echarts.init(document.getElementById('right')).dispose()
-  let chartDom = document.getElementById('right')
-  let myChart = echarts.init(chartDom)
-  let option = {
-    tooltip: {
-      trigger: 'item',
-      formatter: function (info) {
-        let _obj = dataList.find(v => v.fanwei == info.data.name) || {}
-        let dom = ref()
-        dom.value =
-          '部门数<br/>' + (_obj.fanwei || '--') + ' : ' + (_obj.value || _obj.value === 0 ? _obj.value : '--') + '个'
-        console.log('name', info.data)
-        return dom.value
-      },
-    },
-    grid: {
-      height: '65%',
-      width: '45%',
-      left: '20%',
-      bottom: 30,
-    },
-    xAxis: {
-      show: false,
-      type: 'category',
-      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-    },
-    yAxis: {
-      show: false,
-      type: 'value',
-      min: 0,
-      max: 20,
-    },
-    series: [
-      {
-        name: '部门数',
-        type: 'funnel',
-        left: '28%',
-        right: '35%',
-        top: '15%',
-        bottom: '10%',
-        minSize: '0%',
-        maxSize: '100%',
-        sort: 'ascending',
-        label: {
-          show: true,
-          formatter: function (info) {
-            let _obj = dataList.find(v => v.fanwei == info.data.name) || {}
-            let dom = ref()
-            dom.value = (_obj.fanwei || '--') + ' : ' + (_obj.value || _obj.value === 0 ? _obj.value : '--') + '个';
-            console.log('name', info.data)
-            return dom.value
+          labelLine: {
+            normal: {
+              show: false,
+            },
           },
-          rich: {
-            b: {
-              fontSize: 14
-            }
-          }
+          data: dataLists,
         },
-        labelLine: {
-          length: 40,
-          lineStyle: {
-            width: 1,
-            type: 'solid'
-          }
-        },
-        itemStyle: {
-          borderColor: '#fff',
-          borderWidth: 1,
-        },
-        emphasis: {
+        {
+          type: 'pie',
+          center: ['50%', '40%'],
+          radius: ['58%', '50%'],
+          itemStyle: {
+            normal: {
+              color: '#c2c7d6',
+            },
+            emphasis: {
+              color: '#ADADAD',
+            },
+          },
           label: {
-            fontSize: 20,
+            normal: {
+              position: 'inner',
+              formatter: '{c}',
+              textStyle: {
+                color: '#777777',
+                fontWeight: 'bold',
+                fontSize: 14,
+              },
+            },
           },
+          // data: dataLists,
         },
-        data: chartData,
-      }
-    ],
-  }
+      ],
+    }
 
-  option && myChart.setOption(option)
-}
-onMounted(() => {
-  // findZywMessage()
-  // snum()
-  sourceDepartment()
-})
-watch(
-  datas,
-  (value) => {
-    pieCharti(value)
-  },
-  { deep: true }
-)
-watch(
-  laiyuanDataList,
-  (value) => {
-    funnelPlot(value)
-    console.log(value, '   laiyuanDataList')
-  },
-  { deep: true }
-)
+    option && myChart.setOption(option)
+  }
+  //来源部门漏斗图
+  const funnelPlot = (dataList) => {
+    // 排序
+    let arrCopy = ['0-5', '5-10', '10-15', '15-20', '20以上']
+    // 真实数据
+    dataList.sort((a, b) => {
+      return Number(a.value) - Number(b.value)
+    })
+
+    let _arr = dataList.map((v) => v.fanwei) || arrCopy
+    // 数据配置形成金字塔形状固定
+    let chartData = _arr.map((v, i) => {
+      return {
+        name: v,
+        value: 10 + 10 * i,
+      }
+    })
+
+    let newArr = []
+    dataList.map((v) => {
+      if (v.value && Number(v.value > 0)) {
+        newArr.push({
+          name: v.fanwei,
+          value: v.value,
+        })
+      }
+    })
+    console.log('============》', dataList)
+    echarts.init(document.getElementById('right')).dispose()
+    let chartDom = document.getElementById('right')
+    let myChart = echarts.init(chartDom)
+    let option = {
+      tooltip: {
+        trigger: 'item',
+        formatter: function (info) {
+          let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
+          let dom = ref()
+          dom.value =
+            '部门数<br/>' +
+            (_obj.fanwei || '--') +
+            ' : ' +
+            (_obj.value || _obj.value === 0 ? _obj.value : '--') +
+            '项'
+          console.log('name', info.data)
+          return dom.value
+        },
+      },
+      grid: {
+        height: '65%',
+        width: '45%',
+        left: '20%',
+        bottom: 30,
+      },
+      xAxis: {
+        show: false,
+        type: 'category',
+        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+      },
+      yAxis: {
+        show: false,
+        type: 'value',
+        min: 0,
+        max: 20,
+      },
+      series: [
+        {
+          name: '部门数',
+          type: 'funnel',
+          left: '28%',
+          right: '35%',
+          top: '15%',
+          bottom: '10%',
+          minSize: '0%',
+          maxSize: '100%',
+          sort: 'ascending',
+          label: {
+            show: true,
+            formatter: function (info) {
+              let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
+              let dom = ref()
+              dom.value =
+                (_obj.fanwei || '--') +
+                ' : ' +
+                (_obj.value || _obj.value === 0 ? _obj.value : '--') +
+                '项'
+              console.log('name', info.data)
+              return dom.value
+            },
+            rich: {
+              b: {
+                fontSize: 14,
+              },
+            },
+          },
+          labelLine: {
+            length: 40,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+            },
+          },
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 1,
+          },
+          emphasis: {
+            label: {
+              fontSize: 20,
+            },
+          },
+          data: chartData,
+        },
+      ],
+    }
+
+    option && myChart.setOption(option)
+  }
+  onMounted(() => {
+    // findZywMessage()
+    // snum()
+    sourceDepartment()
+  })
+  watch(
+    datas,
+    (value) => {
+      pieCharti(value)
+    },
+    { deep: true }
+  )
+  watch(
+    laiyuanDataList,
+    (value) => {
+      funnelPlot(value)
+      console.log(value, '   laiyuanDataList')
+    },
+    { deep: true }
+  )
 </script>
 <style lang="less" scoped>
-@font-face {
-  font-family: 'num-typeface';
-  src: url('~@/assets/newHome/font/num-typeface.otf');
-}
-
-@font-face {
-  font-family: 'text-typeface';
-  src: url('~@/assets/newHome/font/text-typeface.otf');
-}
-
-.num {
-  font-family: num-typeface;
-  font-size: 32px;
-  font-weight: 600;
-  margin-right: 5px;
-}
-
-.hengxian {
-  height: 3px;
-  width: 30px;
-  border-radius: 1px;
-  margin-top: 6px;
-  background: #0058e1;
-}
-
-.resource-aggregation {
-  font-size: 18px;
-  font-family: text-typeface;
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  background: #f3f5f9;
-  padding-bottom: 60px;
-
-  .resource-aggregation-left {
-    background: #fff;
-    border: 1px solid #e6e9ed;
-    border-radius: 2px;
-    box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
-    width: 360px;
-    height: 397px;
-    padding: 20px;
-    padding-top: 64px;
-    position: relative;
-
-    .title {
-      position: absolute;
-      top: 20px;
-      font-size: 18px;
-      color: #212121;
-    }
-
-    .content {
-      .content-son {
-        .content-left {
-          margin-bottom: 8px;
-          height: 56px;
-          width: 320px;
-          background: #f1f4fb;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          border-radius: 1px;
-
-          .name {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            .name-photo {
-              margin-left: 10px;
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              margin-right: 11px;
-            }
-          }
-
-          .organization-value {
-            margin-right: 16px;
-
-            .num {
-              font-size: 26px;
-            }
-
-            span:nth-child(2) {
-              font-size: 16px;
-            }
-          }
-        }
-      }
-    }
+  @font-face {
+    font-family: 'num-typeface';
+    src: url('~@/assets/newHome/font/num-typeface.otf');
   }
 
-  .resource-aggregation-right {
-    background: #fff;
-    border: 1px solid #e6e9ed;
-    border-radius: 2px;
-    box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
-    margin-left: 20px;
-    width: 920px;
-    height: 397px;
-    padding: 64px;
-    overflow: hidden;
-    position: relative;
+  @font-face {
+    font-family: 'text-typeface';
+    src: url('~@/assets/newHome/font/text-typeface.otf');
+  }
+
+  .num {
+    font-family: num-typeface;
+    font-size: 32px;
+    font-weight: 600;
+    margin-right: 5px;
+  }
+
+  .hengxian {
+    height: 3px;
+    width: 30px;
+    border-radius: 1px;
+    margin-top: 6px;
+    background: #0058e1;
+  }
+
+  .resource-aggregation {
+    font-size: 18px;
+    font-family: text-typeface;
+    width: 100%;
     display: flex;
-    padding-left: 120px;
+    justify-content: center;
+    background: #f3f5f9;
+    padding-bottom: 60px;
 
-    .title {
-      position: absolute;
-      top: 20px;
-      left: 20px;
-      font-size: 18px;
-      color: #212121;
-    }
-
-    .bumensnum {
-      width: 100px;
-      position: absolute;
-      left: 20px;
-      height: 313px;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding-top: 66px;
-      background: rgba(0, 88, 225, 0.1);
-      border-right: 1px solid rgba(0, 88, 225, 0.5);
+    .resource-aggregation-left {
+      background: #fff;
+      border: 1px solid #e6e9ed;
       border-radius: 2px;
+      box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
+      width: 360px;
+      height: 397px;
+      padding: 20px;
+      padding-top: 64px;
+      position: relative;
 
-      .bumensnum-photo {
-        height: 50px;
-        width: 50px;
-        background: url('~@/assets/abilityStatistics/bumenzongshu.png') no-repeat;
-        margin-bottom: 30px;
+      .title {
+        position: absolute;
+        top: 20px;
+        font-size: 18px;
+        color: #212121;
       }
 
-      p {
-        margin-top: 18px;
-        color: #0058e1;
+      .content {
+        .content-son {
+          .content-left {
+            margin-bottom: 8px;
+            height: 56px;
+            width: 320px;
+            background: #f1f4fb;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-radius: 1px;
 
-        .num {
-          font-size: 30px;
-        }
+            .name {
+              display: flex;
+              justify-content: center;
+              align-items: center;
 
-        span:last-child {
-          font-size: 16px;
+              .name-photo {
+                margin-left: 10px;
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                margin-right: 11px;
+              }
+            }
+
+            .organization-value {
+              margin-right: 16px;
+
+              .num {
+                font-size: 26px;
+              }
+
+              span:nth-child(2) {
+                font-size: 16px;
+              }
+            }
+          }
         }
       }
     }
 
-    .content {
-      width: 779px;
-      height: 313px;
-      display: flex;
+    .resource-aggregation-right {
+      background: #fff;
+      border: 1px solid #e6e9ed;
+      border-radius: 2px;
+      box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
+      margin-left: 20px;
+      width: 920px;
+      height: 397px;
+      padding: 64px;
+      overflow: hidden;
       position: relative;
-      background: #f1f4fb;
+      display: flex;
+      padding-left: 120px;
 
-      .left {
-        width: 373px;
-        height: 313px;
-      }
-
-      .center {
-        height: 240px;
-        width: 1px;
-        margin-top: 31px;
-        background: #d0d4de;
-      }
-
-      .right {
-        width: 406px;
-        height: 313px;
-      }
-
-      .right-son1 {
+      .title {
         position: absolute;
-        top: 10px;
-        left: 52.5%;
+        top: 20px;
+        left: 20px;
+        font-size: 18px;
+        color: #212121;
       }
 
-      .right-son2 {
+      .bumensnum {
+        width: 100px;
         position: absolute;
-        top: 10px;
-        left: 70.5%;
+        left: 20px;
+        height: 313px;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding-top: 66px;
+        background: rgba(0, 88, 225, 0.1);
+        border-right: 1px solid rgba(0, 88, 225, 0.5);
+        border-radius: 2px;
+
+        .bumensnum-photo {
+          height: 50px;
+          width: 50px;
+          background: url('~@/assets/abilityStatistics/bumenzongshu.png')
+            no-repeat;
+          margin-bottom: 30px;
+        }
+
+        p {
+          margin-top: 18px;
+          color: #0058e1;
+
+          .num {
+            font-size: 30px;
+          }
+
+          span:last-child {
+            font-size: 16px;
+          }
+        }
+      }
+
+      .content {
+        width: 779px;
+        height: 313px;
+        display: flex;
+        position: relative;
+        background: #f1f4fb;
+
+        .left {
+          width: 373px;
+          height: 313px;
+        }
+
+        .center {
+          height: 240px;
+          width: 1px;
+          margin-top: 31px;
+          background: #d0d4de;
+        }
+
+        .right {
+          width: 406px;
+          height: 313px;
+        }
+
+        .right-son1 {
+          position: absolute;
+          top: 10px;
+          left: 52.5%;
+        }
+
+        .right-son2 {
+          position: absolute;
+          top: 10px;
+          left: 70.5%;
+        }
       }
     }
   }
-}
 </style>
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index eff61da6..b8fcc4c9 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1085,7 +1085,7 @@ export default defineComponent({
 
     // 青岛-数据处理
     const getQingDao = (res) => {
-      ; ((res.data && res.data.data && res.data.data.data) || []).forEach(
+      ((res.data && res.data.data && res.data.data.data) || []).forEach(
         (val) => {
           val.id = val.guid // id
           val.name = val.zyname // 名字
@@ -1101,7 +1101,7 @@ export default defineComponent({
     }
     // 青岛-西海岸处理
     const getXiHaiAn = (res) => {
-      ; ((res.data && res.data.data && res.data.data.list) || []).forEach(
+      ((res.data && res.data.data && res.data.data.list) || []).forEach(
         (val) => {
           val.id = val.serviceId // id
           val.name = val.serviceName // 名字
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 5ae0e50e..d0d82917 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,7 +88,10 @@
         <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>
@@ -82,214 +114,168 @@
           fill="#bfbfbf"
         ></path>
       </svg> -->
-      <i @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })" class="iconTo"></i>
+      <i
+        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })"
+        class="iconTo"
+        v-show="backFlag"
+      ></i>
     </div>
   </div>
 </template>
 <script setup>
-import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
-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 } 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 store = useStore()
+  const router = useRouter()
+  const route = useRoute()
+  const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
 
-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) {
+      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)
-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 = () => {
-  router.push({
-    path: '/home',
-  })
-}
-// 跳转页面
-const jumpPage = (item) => {
-  // 西海岸
-  if (itShowXiHaiAn.value) {
-    let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
-    if (_arr.includes(item.name) && !xhaHasPermissionUser.list.includes(user.value.username)) {
-      return message.warn('暂无权限')
+  // 返回首页
+  const goToHome = () => {
+    router.push({
+      path: '/home',
+    })
+  }
+  // 跳转页面
+  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
     }
   }
-  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) => {
@@ -297,268 +283,329 @@ 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;
-  }
-
-  .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%;
-    }
-
-    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;
+    }
+
+    .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%;
+      }
+
+      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>
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index c32a2f60..96d345a2 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -6,106 +6,159 @@
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
         个{{
-        cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
+          cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : ''
         }}
       </div>
       <div class="condition" :key="showKey">
-        <IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
-          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-        "></IntegrationServiceOrder>
+        <IntegrationServiceOrder
+          ref="integrationServiceOrderDom"
+          v-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        ></IntegrationServiceOrder>
         <ul v-else>
-          <li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
-            item.show &&
-            item.name !== '评分' &&
-            selectCardsname !== '数据资源'
-          ">
+          <li
+            v-for="(item, i) in selList"
+            :key="i"
+            @click="changeCondition(item)"
+            v-show="
+              item.show &&
+              item.name !== '评分' &&
+              selectCardsname !== '数据资源'
+            "
+          >
             {{ item.name }}
-            <span class="arrow" :class="
-              orderObj.orderType == 'ASC' &&
-              orderObj.orderField == item.value
-                ? 'down'
-                : ''
-            "></span>
+            <span
+              class="arrow"
+              :class="
+                orderObj.orderType == 'ASC' && orderObj.orderField == item.value
+                  ? 'down'
+                  : ''
+              "
+            ></span>
           </li>
         </ul>
       </div>
-
     </div>
-    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
+    <div
+      class="result-list"
+      v-for="(item, index) in resourceList.data"
+      :key="item.index"
+    >
       <div class="item" :key="showKey">
-        <div class="left" style="display: flex; align-items: center" v-if="
-          item.type === '应用资源' &&
-          item.infoList &&
-          item.infoList.filter((val) => val.attrType == '应用图片')[0]
-        ">
-          <a-image :width="106" :preview="false" :src="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-if="
+            item.type === '应用资源' &&
+            item.infoList &&
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-              .attrValue
-          " />
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '应用图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <div class="left" style="display: flex; align-items: center" v-else-if="
-          (selectCardsname === '融合服务' ||
-            selectCardsname === '赋能场景') &&
-          item.fuseAttrList &&
-          item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-        ">
-          <a-image :width="106" :preview="false" :src="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-else-if="
+            (selectCardsname === '融合服务' ||
+              selectCardsname === '赋能场景') &&
+            item.fuseAttrList &&
             item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-              .attrValue
-          " />
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <div class="left" :class="
-          item.type == '应用资源'
-            ? 'yyzy'
-            : !item.type
-            ? 'sjzy'
-            : !item.infoList ||
-              !item.infoList.filter((val) => val.attrType == '组件类型')[0]
-            ? 'znsf'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '智能算法'
-            ? 'znsf'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '图层服务'
-            ? 'tcfw'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '开发组件'
-            ? 'kfzj'
-            : item.infoList &&
-              item.infoList.filter((val) => val.attrType == '组件类型')[0]
-                .attrValue == '业务组件'
-            ? 'ywzj'
-            : ''
-        " @click="toView('details', item)" v-else-if="
-          selectCardsname !== '基础设施' &&
-          selectCardsname !== '融合服务' &&
-          selectCardsname !== '赋能场景'
-        "></div>
+        <div
+          class="left"
+          :class="
+            item.type == '应用资源'
+              ? 'yyzy'
+              : !item.type
+              ? 'sjzy'
+              : !item.infoList ||
+                !item.infoList.filter((val) => val.attrType == '组件类型')[0]
+              ? 'znsf'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '智能算法'
+              ? 'znsf'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '图层服务'
+              ? 'tcfw'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '开发组件'
+              ? 'kfzj'
+              : item.infoList &&
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                  .attrValue == '业务组件'
+              ? 'ywzj'
+              : ''
+          "
+          @click="toView('details', item)"
+          v-else-if="
+            selectCardsname !== '基础设施' &&
+            selectCardsname !== '融合服务' &&
+            selectCardsname !== '赋能场景'
+          "
+        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div class="left rhfw" v-else-if="
-          selectCardsname === '融合服务' || selectCardsname === '赋能场景'
-        "></div>
+        <div
+          class="left rhfw"
+          v-else-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        ></div>
         <div class="right" @click="toView('details', item)">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
               <!-- 已申请--通过 -->
-              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
-                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="
+              <svg
+                t="1652322568870"
+                class="icon"
+                viewBox="0 0 3072 1024"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                p-id="3062"
+                width="40"
+                height="40"
+                v-if="
                   item.applyState == '已申请' && item.approveStatus == '通过'
-                " style="margin-left: 10px; min-width: 40px">
+                "
+                style="margin-left: 10px; min-width: 40px"
+              >
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06" p-id="3063"></path>
+                  fill="#d81e06"
+                  p-id="3063"
+                ></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06" p-id="3064"></path>
+                  fill="#d81e06"
+                  p-id="3064"
+                ></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06" p-id="3065"></path>
+                  fill="#d81e06"
+                  p-id="3065"
+                ></path>
               </svg>
               <!-- 审核中 -->
               <!-- <svg
@@ -151,19 +204,28 @@
               </span> -->
             </span>
             <div class="header-right">
-              <div v-if="
-                selectCardsname === '融合服务' ||
-                selectCardsname === '赋能场景'
-              " class="label-content">
-                <template v-if="
-                  item.fuseAttrList &&
-                  item.fuseAttrList.filter(
-                    (val) => val.attrType == '应用领域'
-                  )[0]
-                ">
-                  <span class="label" v-for="(data, index) in item.fuseAttrList
-                  .filter((val) => val.attrType == '应用领域')[0]
-                  .attrValue.split(';')" :key="index">
+              <div
+                v-if="
+                  selectCardsname === '融合服务' ||
+                  selectCardsname === '赋能场景'
+                "
+                class="label-content"
+              >
+                <template
+                  v-if="
+                    item.fuseAttrList &&
+                    item.fuseAttrList.filter(
+                      (val) => val.attrType == '应用领域'
+                    )[0]
+                  "
+                >
+                  <span
+                    class="label"
+                    v-for="(data, index) in item.fuseAttrList
+                      .filter((val) => val.attrType == '应用领域')[0]
+                      .attrValue.split(';')"
+                    :key="index"
+                  >
                     {{ data }}
                   </span>
                 </template>
@@ -181,15 +243,21 @@
             </div>
           </div>
           <div class="dec">
-            <div v-if="
-              selectCardsname !== '融合服务' &&
-              selectCardsname !== '赋能场景' &&
-              selectCardsname !== '基础设施'
-            ">
+            <div
+              v-if="
+                selectCardsname !== '融合服务' &&
+                selectCardsname !== '赋能场景' &&
+                selectCardsname !== '基础设施'
+              "
+            >
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
+          <div
+            v-if="selectCardsname !== '基础设施'"
+            style="margin-top: 0.1rem"
+            class="description"
+          >
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -198,26 +266,32 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div v-if="
-                  selectCardsname !== '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景'
-                ">
+                <!-- <div
+                  v-if="
+                    selectCardsname !== '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景'
+                  "
+                >
                   浏览量：{{ item.visits || 0 }}次
-                </div>
-                <div v-if="
-                  selectCardsname !== '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景' &&
-                  (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                ">
+                </div> -->
+                <div
+                  v-if="
+                    selectCardsname !== '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景' &&
+                    (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
+                  "
+                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div v-if="
-                  selectCardsname === '数据资源' &&
-                  selectCardsname !== '融合服务' &&
-                  selectCardsname !== '赋能场景'
-                ">
+                <div
+                  v-if="
+                    selectCardsname === '数据资源' &&
+                    selectCardsname !== '融合服务' &&
+                    selectCardsname !== '赋能场景'
+                  "
+                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -227,41 +301,77 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template v-if="
-                  (selectCardsname == '组件服务' &&
-                    item.infoList.filter(
-                      (val) => val.attrType == '外部服务地址'
-                    ).length === 0) ||
-                  (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                ">
-                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
-                  <span class="shopping-on" v-else @click.stop="addShoppingCart(item, index)"></span>
+                <template
+                  v-if="
+                    (selectCardsname == '组件服务' &&
+                      item.infoList.filter(
+                        (val) => val.attrType == '外部服务地址'
+                      ).length === 0) ||
+                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
+                  "
+                >
+                  <span
+                    class="shopping-down"
+                    v-if="item.isInShoppingCart"
+                  ></span>
+                  <span
+                    class="shopping-on"
+                    v-else
+                    @click.stop="addShoppingCart(item, index)"
+                  ></span>
                 </template>
               </div>
               <div class="sc">
-                <span class="sc-down" v-if="item.isCollect == 'false'" @click.stop="addCollect(item)"></span>
-                <span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></span>
+                <span
+                  class="sc-down"
+                  v-if="item.isCollect == 'false'"
+                  @click.stop="addCollect(item)"
+                ></span>
+                <span
+                  class="sc-on"
+                  v-if="item.isCollect == 'true'"
+                  @click.stop="addCollect(item)"
+                ></span>
               </div>
-              <div class="shopping pk" :key="pk" v-show="
-                cardType == '组件服务' && findComponentName(item, '智能算法')
-              ">
-                <span class="pk-on" @click.stop="goComparePk(item, index)"></span>
+              <div
+                class="shopping pk"
+                :key="pk"
+                v-show="
+                  cardType == '组件服务' && findComponentName(item, '智能算法')
+                "
+              >
+                <span
+                  class="pk-on"
+                  @click.stop="goComparePk(item, index)"
+                ></span>
               </div>
-              <a-button type="primary" @click.stop="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
+              <a-button
+                type="primary"
+                @click.stop="toView('details', item)"
+                v-if="!whoShow1.itShowBaoTou"
+              >
                 查看详情
               </a-button>
-              <a-button style="margin-left: 10px" v-show="
-                selectCardsname === '融合服务' ||
-                selectCardsname === '赋能场景'
-              " @click.stop="handleAKeyApplication(item)">
+              <a-button
+                style="margin-left: 10px"
+                v-show="
+                  selectCardsname === '融合服务' ||
+                  selectCardsname === '赋能场景'
+                "
+                @click.stop="handleAKeyApplication(item)"
+              >
                 一键申请
               </a-button>
-              <a-button type="primary" @click.stop="toView('apply', item)" v-show="
-                cardType == '组件服务' ||
-                (cardType == '应用资源' && whoShow1.itShowQingDao)
-              ">
+              <a-button
+                type="primary"
+                @click.stop="toView('apply', item)"
+                v-show="
+                  cardType == '组件服务' ||
+                  (cardType == '应用资源' && whoShow1.itShowQingDao)
+                "
+              >
                 {{
-                item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>
@@ -274,7 +384,12 @@
         </div>
       </div>
     </div>
-    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
+    <a-modal
+      v-model:visible="visible"
+      title="视频预览"
+      :width="750"
+      destroyOnClose
+    >
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -285,816 +400,817 @@
   </div>
 </template>
 <script>
-import { ref, reactive } from 'vue'
-import { message } from 'ant-design-vue'
-import { useRouter } from 'vue-router'
-import { getUser, sgcInsert } from '@/api/home'
-import { scInsert, scDel } from '@/api/personalCenter'
-import mybus from '@/myplugins/mybus'
-import { getHls } from '@/api/home.js'
-import IntegrationServiceOrder from './integrationServiceOrder.vue';
-import ComponentServiceTag from './ComponentServiceTag.vue';
-export default {
-  name: '',
-  props: {
-    resourceList: {
-      type: Object,
-      default: () => { },
+  import { ref, reactive } from 'vue'
+  import { message } from 'ant-design-vue'
+  import { useRouter } from 'vue-router'
+  import { getUser, sgcInsert } from '@/api/home'
+  import { scInsert, scDel } from '@/api/personalCenter'
+  import mybus from '@/myplugins/mybus'
+  import { getHls } from '@/api/home.js'
+  import IntegrationServiceOrder from './integrationServiceOrder.vue'
+  import ComponentServiceTag from './ComponentServiceTag.vue'
+  export default {
+    name: '',
+    props: {
+      resourceList: {
+        type: Object,
+        default: () => {},
+      },
+      resourceTotal: {
+        type: String,
+        default: '0',
+      },
+      selectCardsname: {
+        type: String,
+        default: '应用资源',
+      },
     },
-    resourceTotal: {
-      type: String,
-      default: '0',
+    components: {
+      IntegrationServiceOrder,
+      ComponentServiceTag,
     },
-    selectCardsname: {
-      type: String,
-      default: '应用资源',
-    },
-  },
-  components: {
-    IntegrationServiceOrder,
-    ComponentServiceTag,
-  },
-  setup(props, context) {
-    const whoShow1 = whoShow
-    const showKey = ref(0)
-    let shoppingKey = ref(1)
-    let orderObj = reactive({
-      orderField: '',
-      orderType: '',
-    })
-    const integrationServiceOrderDom = ref(null)
-    // 购物车id列表
-    const selList = ref([
-      { name: '发布时间', value: 'tdr.create_date', show: true },
-      { name: '浏览量', value: 'visits', show: true },
-      { name: '申请量', value: 'applyCount', show: true },
-      { name: '收藏量', value: 'collectCount', show: true },
-      { name: '评分', value: 'score', show: true },
-    ])
-    // 西海岸-去掉浏览量
-    if (whoShow1.itShowXiHaiAn) {
-      selList.value = selList.value.filter(v => v.name !== '浏览量')
-    }
-    if (props.selectCardsname === '基础设施') {
-      selList.value.map((val) => (val.show = false))
-    } else if (props.selectCardsname === '数据资源') {
-      selList.value.map(
-        (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
-      )
-    }
-    const findComponentName = (list, name) => {
-      if (list.infoList) {
-        return list.infoList.find((item) => {
-          if (item.attrType === '组件类型') {
-            return item.attrValue === name
-          }
-        })
+    setup(props, context) {
+      const whoShow1 = whoShow
+      const showKey = ref(0)
+      let shoppingKey = ref(1)
+      let orderObj = reactive({
+        orderField: '',
+        orderType: '',
+      })
+      const integrationServiceOrderDom = ref(null)
+      // 购物车id列表
+      const selList = ref([
+        { name: '发布时间', value: 'tdr.create_date', show: true },
+        { name: '浏览量', value: 'visits', show: true },
+        { name: '申请量', value: 'applyCount', show: true },
+        { name: '收藏量', value: 'collectCount', show: true },
+        { name: '评分', value: 'score', show: true },
+      ])
+      // 西海岸-去掉浏览量
+      // if (whoShow1.itShowXiHaiAn) {
+      selList.value = selList.value.filter((v) => v.name !== '浏览量')
+      // }
+      if (props.selectCardsname === '基础设施') {
+        selList.value.map((val) => (val.show = false))
+      } else if (props.selectCardsname === '数据资源') {
+        selList.value.map(
+          (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
+        )
       }
-    }
-
-    // 西海岸--智能算法--列表增加标签显示
-    const showTagArray = ['已落地', '需要计算支持']
-    const getTagList = (item) => {
-      let _arr = item.infoList.filter((x) => showTagArray.includes(x.attrValue)) || []
-      let tagArray = _arr.map(v => v.attrValue)
-      return tagArray
-    }
-    console.log('this.resourceList', props.resourceList.data)
-    props.resourceList.data.map((val) => {
-      if (val.infoList) {
-        let obj = val.infoList.filter(
-          (item) => item.attrType == '组件类型'
-        )[0]
-        if (obj) {
-          switch (obj.attrValue) {
-            case '智能算法':
-              val.applicationType = 'znsf'
-              break
-            case '图层服务':
-              val.applicationType = 'tcfw'
-              break
-            case '开发组件':
-              val.applicationType = 'kfzj'
-              break
-            case '业务组件':
-              val.applicationType = 'ywzj'
-              break
-          }
-          console.log('obj', val.applicationType)
-        }
-      }
-    })
-    showKey.value++
-    const selData = ref('total')
-    const flag = ref(true)
-    // userId
-    const userId = ref('')
-    getUser().then((res) => {
-      console.log('getUser============>', res)
-      userId.value = res.data.data.id
-    })
-    const resultList = [1, 2, 3, 4]
-    const router = useRouter()
-    const cardType = router.currentRoute.value.query.select
-    const onSearch = (searchValue) => {
-      console.log('use value', searchValue)
-      console.log('or use this.value', searchValue.value)
-    }
-    function toView(type, item) {
-      if (props.selectCardsname == '数据资源') {
-        if (whoShow1.itShowQingDao) {
-          window.open(
-            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-            item.guid
-          )
-        } else {
-          window.open(
-            'http://10.134.135.24:30090/#/home?id=' + item.serviceId
-          )
-        }
-      } else if (props.selectCardsname === '融合服务') {
-        context.emit('saveSearchCodition')
-        // 打包模式
-        router.push({
-          path: '/packagingDetails',
-          query: {
-            id: item.id,
-          },
-        })
-      } else if (props.selectCardsname === '赋能场景') {
-        router.push({
-          path: '/integrationServicesDetails',
-          query: {
-            id: item.id,
-          },
-        })
-      } else {
-        if (type === 'apply') {
-          // 外部服务地址跳转到外部
-          const webUrl = item.infoList.filter(
-            (val) => val.attrType == '外部服务地址'
-          )[0]?.attrValue
-          if (webUrl) {
-            window.open(webUrl)
-          } else {
-            if (
-              !(
-                props.selectCardsname === '应用资源' ||
-                props.selectCardsname === '组件服务'
-              ) ||
-              whoShow1.itShowBaoTou
-            ) {
-              return
+      const findComponentName = (list, name) => {
+        if (list.infoList) {
+          return list.infoList.find((item) => {
+            if (item.attrType === '组件类型') {
+              return item.attrValue === name
             }
-            // 内部跳转申请页面
-            console.log('一键申请===================>', item)
-            localStorage.setItem(
-              'applyList',
-              JSON.stringify([
-                {
-                  arr: [
-                    {
-                      delFlag: item.delFlag,
-                      description: item.description,
-                      resourceId: item.id,
-                      resourceName: item.name,
-                      time: item.createDate,
-                      type: item.type,
-                      componentType:
-                        (item.infoList.filter(
-                          (val) => val.attrType == '组件类型'
-                        )[0] &&
-                          item.infoList.filter(
-                            (val) => val.attrType == '组件类型'
-                          )[0].attrValue) ||
-                        '',
-                    },
-                  ],
-                  deptId: item.deptId,
-                  deptName: item.deptName,
-                },
-              ])
-            )
-            router.push({
-              path: '/apply',
-            })
+          })
+        }
+      }
+
+      // 西海岸--智能算法--列表增加标签显示
+      const showTagArray = ['已落地', '需要计算支持']
+      const getTagList = (item) => {
+        let _arr =
+          item.infoList.filter((x) => showTagArray.includes(x.attrValue)) || []
+        let tagArray = _arr.map((v) => v.attrValue)
+        return tagArray
+      }
+      console.log('this.resourceList', props.resourceList.data)
+      props.resourceList.data.map((val) => {
+        if (val.infoList) {
+          let obj = val.infoList.filter(
+            (item) => item.attrType == '组件类型'
+          )[0]
+          if (obj) {
+            switch (obj.attrValue) {
+              case '智能算法':
+                val.applicationType = 'znsf'
+                break
+              case '图层服务':
+                val.applicationType = 'tcfw'
+                break
+              case '开发组件':
+                val.applicationType = 'kfzj'
+                break
+              case '业务组件':
+                val.applicationType = 'ywzj'
+                break
+            }
+            console.log('obj', val.applicationType)
           }
-        } else {
+        }
+      })
+      showKey.value++
+      const selData = ref('total')
+      const flag = ref(true)
+      // userId
+      const userId = ref('')
+      getUser().then((res) => {
+        console.log('getUser============>', res)
+        userId.value = res.data.data.id
+      })
+      const resultList = [1, 2, 3, 4]
+      const router = useRouter()
+      const cardType = router.currentRoute.value.query.select
+      const onSearch = (searchValue) => {
+        console.log('use value', searchValue)
+        console.log('or use this.value', searchValue.value)
+      }
+      function toView(type, item) {
+        if (props.selectCardsname == '数据资源') {
+          if (whoShow1.itShowQingDao) {
+            window.open(
+              'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
+                item.guid
+            )
+          } else {
+            window.open(
+              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
+            )
+          }
+        } else if (props.selectCardsname === '融合服务') {
           context.emit('saveSearchCodition')
+          // 打包模式
           router.push({
-            path: '/details',
+            path: '/packagingDetails',
             query: {
               id: item.id,
             },
           })
-        }
-      }
-    }
-    // 加入申购车
-    const addShoppingCart = (item, index) => {
-      console.log('item===============>', item)
-      if (flag.value && item.id) {
-        flag.value = false
-        sgcInsert({
-          delFlag: '0',
-          resourceId: item.id,
-          // userId: userId.value,
-        }).then((res) => {
-          console.log(res)
-          message.success('添加申购车成功！')
-          mybus.emit('getSgcNum')
-          mybus.emit('changeSelcted', index)
-          flag.value = true
-        })
-      }
-      shoppingKey.value++
-      // 查询申购车中已有id,用于过滤图标
-    }
-    // 添加收藏
-    const addCollect = (item) => {
-      console.log('收藏===============>', item, flag.value)
-      if (flag.value && item.id) {
-        flag.value = false
-        if (item.isCollect == 'true') {
-          scDel([item.id]).then((res) => {
-            if (res.data.msg === 'success') {
-              message.success('取消成功')
-              item.isCollect = 'false'
-              item.collectCount--
-              flag.value = true
-              console.log('收藏2===============>', res.data, flag.value)
-            }
+        } else if (props.selectCardsname === '赋能场景') {
+          router.push({
+            path: '/integrationServicesDetails',
+            query: {
+              id: item.id,
+            },
           })
         } else {
-          scInsert([
-            {
-              resourceId: item.id,
-            },
-          ]).then((res) => {
-            if (res.data.msg === 'success') {
-              message.success('添加收藏成功！')
-              item.isCollect = 'true'
-              item.collectCount++
-              flag.value = true
-              console.log('收藏2===============>', res.data, flag.value)
+          if (type === 'apply') {
+            // 外部服务地址跳转到外部
+            const webUrl = item.infoList.filter(
+              (val) => val.attrType == '外部服务地址'
+            )[0]?.attrValue
+            if (webUrl) {
+              window.open(webUrl)
+            } else {
+              if (
+                !(
+                  props.selectCardsname === '应用资源' ||
+                  props.selectCardsname === '组件服务'
+                ) ||
+                whoShow1.itShowBaoTou
+              ) {
+                return
+              }
+              // 内部跳转申请页面
+              console.log('一键申请===================>', item)
+              localStorage.setItem(
+                'applyList',
+                JSON.stringify([
+                  {
+                    arr: [
+                      {
+                        delFlag: item.delFlag,
+                        description: item.description,
+                        resourceId: item.id,
+                        resourceName: item.name,
+                        time: item.createDate,
+                        type: item.type,
+                        componentType:
+                          (item.infoList.filter(
+                            (val) => val.attrType == '组件类型'
+                          )[0] &&
+                            item.infoList.filter(
+                              (val) => val.attrType == '组件类型'
+                            )[0].attrValue) ||
+                          '',
+                      },
+                    ],
+                    deptId: item.deptId,
+                    deptName: item.deptName,
+                  },
+                ])
+              )
+              router.push({
+                path: '/apply',
+              })
             }
+          } else {
+            context.emit('saveSearchCodition')
+            router.push({
+              path: '/details',
+              query: {
+                id: item.id,
+              },
+            })
+          }
+        }
+      }
+      // 加入申购车
+      const addShoppingCart = (item, index) => {
+        console.log('item===============>', item)
+        if (flag.value && item.id) {
+          flag.value = false
+          sgcInsert({
+            delFlag: '0',
+            resourceId: item.id,
+            // userId: userId.value,
+          }).then((res) => {
+            console.log(res)
+            message.success('添加申购车成功！')
+            mybus.emit('getSgcNum')
+            mybus.emit('changeSelcted', index)
+            flag.value = true
           })
         }
+        shoppingKey.value++
+        // 查询申购车中已有id,用于过滤图标
       }
-    }
-
-    /**更换查询条件
-     * val: 排序字段值
-     * isFromFather: 是否来自父组件传值
-     */
-    const changeCondition = (item, isFromFather = false) => {
-      console.log('item, isFromFather------------>', item, isFromFather);
-      let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC';
-      if (isFromFather) {
-        newType = item.orderType;
-      }
-      orderObj.orderField = item.value;
-      orderObj.orderType = newType;
-      let _index = selList.value.findIndex(x => x.value == item.value)
-      if (_index > -1) {
-        selList.value[_index].orderType = newType
-      }
-      selList.value = selList.value.splice(0);
-      mybus.emit('changeCondition', orderObj)
-    }
-
-    // 融合服务--一键申请
-    const handleAKeyApplication = (item) => {
-      let _applyList = []
-      let fuseResourceList = item.fuseResourceList || []
-      let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
-      let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
-      jcssArray = jcssArray.map((v) => {
-        v = Object.assign(v, v.resource)
-        return v
-      })
-      let jcss = [
-        {
-          arr: [
-            {
-              description: '',
-              note1: JSON.stringify(jcssArray),
-              resourceId: '1522550195055828996',
-              resourceName: '摄像头列表',
-              type: '基础设施',
-            },
-          ],
-          deptId: '',
-          deptName: '',
-        },
-      ]
-      if (infrastructure) {
-        jcss[0].deptId = infrastructure.deptId
-        jcss[0].deptName = infrastructure.deptName
-      }
-      otherArray.map((v) => {
-        let resource = v.resource || {}
-        let obj = {
-          arr: [
-            {
-              delFlag: resource.delFlag,
-              description: resource.description,
-              resourceId: resource.id,
-              resourceName: resource.name,
-              time: resource.createDate,
-              type: resource.type,
-            },
-          ],
-          deptId: resource.deptId,
-          deptName: resource.deptName,
+      // 添加收藏
+      const addCollect = (item) => {
+        console.log('收藏===============>', item, flag.value)
+        if (flag.value && item.id) {
+          flag.value = false
+          if (item.isCollect == 'true') {
+            scDel([item.id]).then((res) => {
+              if (res.data.msg === 'success') {
+                message.success('取消成功')
+                item.isCollect = 'false'
+                item.collectCount--
+                flag.value = true
+                console.log('收藏2===============>', res.data, flag.value)
+              }
+            })
+          } else {
+            scInsert([
+              {
+                resourceId: item.id,
+              },
+            ]).then((res) => {
+              if (res.data.msg === 'success') {
+                message.success('添加收藏成功！')
+                item.isCollect = 'true'
+                item.collectCount++
+                flag.value = true
+                console.log('收藏2===============>', res.data, flag.value)
+              }
+            })
+          }
         }
-        _applyList.push(obj)
-      })
-      _applyList = jcss.concat(_applyList)
-      localStorage.setItem('applyList', JSON.stringify(_applyList))
-      router.push({
-        path: '/apply',
-        query: {
-          integrationServicesId: item.id,
-        },
-      })
-    }
-    
-    mybus.on('chongzhi', (typeObj) => {
-      if (!typeObj) {
-        selData.value = 'total'
       }
-      if (
-        typeObj &&
-        (typeObj.type === '融合服务' || typeObj.type === '打包模式')
-      ) {
-        integrationServiceOrderDom.value.reset &&
-          integrationServiceOrderDom.value.reset()
-      }
-    })
 
-    let videoUrl = ref('')
-    const options = reactive({
-      width: '700px', //播放器宽度
-      height: '400px', //播放器高度
-      color: '#409eff', //主题色
-      title: '', //视频名称
-      src: '', //视频源
-      type: 'm3u8', // 视频源类型
-      muted: false, //静音
-      webFullScreen: false,
-      speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-      autoPlay: true, //自动播放
-      loop: false, //循环播放
-      mirror: false, //镜像画面
-      ligthOff: false, //关灯模式
-      volume: 0.3, //默认音量大小
-      control: true, //是否显示控制
-      controlBtns: [
-        'audioTrack',
-        'quality',
-        'speedRate',
-        'volume',
-        'setting',
-        'pip',
-        'pageFullScreen',
-        'fullScreen',
-      ], //显示所有按钮,
-    })
-    let visible = ref(false)
-    // 打开视频预览
-    const openVideo = (item) => {
-      videoUrl.value = ''
-      const param = {
-        key: item.link,
+      /**更换查询条件
+       * val: 排序字段值
+       * isFromFather: 是否来自父组件传值
+       */
+      const changeCondition = (item, isFromFather = false) => {
+        console.log('item, isFromFather------------>', item, isFromFather)
+        let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC'
+        if (isFromFather) {
+          newType = item.orderType
+        }
+        orderObj.orderField = item.value
+        orderObj.orderType = newType
+        let _index = selList.value.findIndex((x) => x.value == item.value)
+        if (_index > -1) {
+          selList.value[_index].orderType = newType
+        }
+        selList.value = selList.value.splice(0)
+        mybus.emit('changeCondition', orderObj)
       }
-      getHls(param).then((res) => {
-        console.log('获取视频地址===============>', res)
-        // videoUrl.value = res.data.data
-        options.src = res.data.data
-        visible.value = true
+
+      // 融合服务--一键申请
+      const handleAKeyApplication = (item) => {
+        let _applyList = []
+        let fuseResourceList = item.fuseResourceList || []
+        let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
+        let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
+        jcssArray = jcssArray.map((v) => {
+          v = Object.assign(v, v.resource)
+          return v
+        })
+        let jcss = [
+          {
+            arr: [
+              {
+                description: '',
+                note1: JSON.stringify(jcssArray),
+                resourceId: '1522550195055828996',
+                resourceName: '摄像头列表',
+                type: '基础设施',
+              },
+            ],
+            deptId: '',
+            deptName: '',
+          },
+        ]
+        if (infrastructure) {
+          jcss[0].deptId = infrastructure.deptId
+          jcss[0].deptName = infrastructure.deptName
+        }
+        otherArray.map((v) => {
+          let resource = v.resource || {}
+          let obj = {
+            arr: [
+              {
+                delFlag: resource.delFlag,
+                description: resource.description,
+                resourceId: resource.id,
+                resourceName: resource.name,
+                time: resource.createDate,
+                type: resource.type,
+              },
+            ],
+            deptId: resource.deptId,
+            deptName: resource.deptName,
+          }
+          _applyList.push(obj)
+        })
+        _applyList = jcss.concat(_applyList)
+        localStorage.setItem('applyList', JSON.stringify(_applyList))
+        router.push({
+          path: '/apply',
+          query: {
+            integrationServicesId: item.id,
+          },
+        })
+      }
+
+      mybus.on('chongzhi', (typeObj) => {
+        if (!typeObj) {
+          selData.value = 'total'
+        }
+        if (
+          typeObj &&
+          (typeObj.type === '融合服务' || typeObj.type === '打包模式')
+        ) {
+          integrationServiceOrderDom.value.reset &&
+            integrationServiceOrderDom.value.reset()
+        }
       })
-    }
-    // 算法对比跳转
-    const goComparePk = (item) => {
-      router.push({
-        path: '/algorithmCompare',
-        query: {
-          id: item.id,
-        },
+
+      let videoUrl = ref('')
+      const options = reactive({
+        width: '700px', //播放器宽度
+        height: '400px', //播放器高度
+        color: '#409eff', //主题色
+        title: '', //视频名称
+        src: '', //视频源
+        type: 'm3u8', // 视频源类型
+        muted: false, //静音
+        webFullScreen: false,
+        speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+        autoPlay: true, //自动播放
+        loop: false, //循环播放
+        mirror: false, //镜像画面
+        ligthOff: false, //关灯模式
+        volume: 0.3, //默认音量大小
+        control: true, //是否显示控制
+        controlBtns: [
+          'audioTrack',
+          'quality',
+          'speedRate',
+          'volume',
+          'setting',
+          'pip',
+          'pageFullScreen',
+          'fullScreen',
+        ], //显示所有按钮,
       })
-    }
-    return {
-      onSearch,
-      resultList,
-      toView,
-      addShoppingCart,
-      changeCondition,
-      selData,
-      selList,
-      addCollect,
-      cardType,
-      findComponentName,
-      shoppingKey,
-      openVideo,
-      videoUrl,
-      options,
-      visible,
-      goComparePk,
-      whoShow1,
-      showKey,
-      handleAKeyApplication,
-      integrationServiceOrderDom,
-      orderObj,
-      getTagList,
-    }
-  },
-  beforeUnmount() {
-    mybus.off('chongzhi')
-    // mybus.emit('changeSelcted')
-  },
-}
+      let visible = ref(false)
+      // 打开视频预览
+      const openVideo = (item) => {
+        videoUrl.value = ''
+        const param = {
+          key: item.link,
+        }
+        getHls(param).then((res) => {
+          console.log('获取视频地址===============>', res)
+          // videoUrl.value = res.data.data
+          options.src = res.data.data
+          visible.value = true
+        })
+      }
+      // 算法对比跳转
+      const goComparePk = (item) => {
+        router.push({
+          path: '/algorithmCompare',
+          query: {
+            id: item.id,
+          },
+        })
+      }
+      return {
+        onSearch,
+        resultList,
+        toView,
+        addShoppingCart,
+        changeCondition,
+        selData,
+        selList,
+        addCollect,
+        cardType,
+        findComponentName,
+        shoppingKey,
+        openVideo,
+        videoUrl,
+        options,
+        visible,
+        goComparePk,
+        whoShow1,
+        showKey,
+        handleAKeyApplication,
+        integrationServiceOrderDom,
+        orderObj,
+        getTagList,
+      }
+    },
+    beforeUnmount() {
+      mybus.off('chongzhi')
+      // mybus.emit('changeSelcted')
+    },
+  }
 </script>
 <style scoped lang="less">
-#search-result-list-container {
-  width: 1088px;
-  padding: 0 20px;
-  background: #f3f5f9;
+  #search-result-list-container {
+    width: 1088px;
+    padding: 0 20px;
+    background: #f3f5f9;
 
-  .detail-content {
-    // 超出
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: 130px;
-    display: inline-block;
-  }
-
-  .shai-xuan {
-    width: 1047px;
-    height: 36px;
-    // margin: 11px 0 20px;
-    // background: #e5f2ff;
-    // padding-left: 20px;
-    display: flex;
-    align-items: center;
-    position: relative;
-
-    .circle {
-      width: 16px;
-      height: 16px;
-      border-radius: 50%;
-      background-color: #0087ff;
-      text-align: center;
-      color: #fff;
-      line-height: 16px;
-      margin-right: 21px;
+    .detail-content {
+      // 超出
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 130px;
+      display: inline-block;
     }
 
-    .result {
-      font-size: 14px;
-      font-weight: 500;
-      color: #212121;
+    .shai-xuan {
+      width: 1047px;
+      height: 36px;
+      // margin: 11px 0 20px;
+      // background: #e5f2ff;
+      // padding-left: 20px;
+      display: flex;
+      align-items: center;
+      position: relative;
 
-      span {
-        font-size: 18px;
-        color: #0087ff;
-      }
-    }
-
-    .condition {
-      position: absolute;
-      right: 20px;
-      top: 10px;
-
-      ul li {
-        list-style-type: none;
+      .circle {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #0087ff;
+        text-align: center;
+        color: #fff;
+        line-height: 16px;
+        margin-right: 21px;
       }
 
-      ul {
-        display: flex;
+      .result {
+        font-size: 14px;
+        font-weight: 500;
+        color: #212121;
 
-        li {
-          width: 90px;
-          height: 12px;
-          text-align: center;
-          cursor: pointer;
+        span {
+          font-size: 18px;
+          color: #0087ff;
+        }
+      }
+
+      .condition {
+        position: absolute;
+        right: 20px;
+        top: 10px;
+
+        ul li {
+          list-style-type: none;
+        }
+
+        ul {
           display: flex;
-          justify-content: center;
-          align-items: center;
 
-          .arrow {
-            display: inline-block;
-            width: 12px;
+          li {
+            width: 90px;
             height: 12px;
-            background: url('~@/assets/newHome/arrow.png');
-            margin-left: 10px;
-          }
+            text-align: center;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
 
-          .down {
-            background: url('~@/assets/newHome/down.png');
-            margin-top: 6px;
+            .arrow {
+              display: inline-block;
+              width: 12px;
+              height: 12px;
+              background: url('~@/assets/newHome/arrow.png');
+              margin-left: 10px;
+            }
+
+            .down {
+              background: url('~@/assets/newHome/down.png');
+              margin-top: 6px;
+            }
           }
         }
       }
     }
-  }
 
-  .result-list {
-    width: 1048px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-    border-top: 1px rgba(150, 144, 144, 0.3) solid;
-    padding: 10px 0;
-
-    .item {
-      width: 100%;
-      margin-top: 10px;
+    .result-list {
+      width: 1048px;
       display: flex;
-      align-items: center;
+      flex-direction: column;
+      flex-wrap: wrap;
+      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+      border-top: 1px rgba(150, 144, 144, 0.3) solid;
+      padding: 10px 0;
 
-      .left {
-        display: inline-block;
-        width: 120px;
-        height: 110px;
-        margin-right: 16px;
-      }
-
-      .right {
+      .item {
         width: 100%;
-      }
-
-      .yyzy {
-        background: url('~@/assets/home/yyzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .sjzy {
-        background: url('~@/assets/home/sjzy_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .znsf {
-        background: url('~@/assets/home/znsf_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .tcfw {
-        background: url('~@/assets/home/tcfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .kfzj {
-        background: url('~@/assets/home/kfzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .ywzj {
-        background: url('~@/assets/home/ywzj_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .rhfw {
-        background: url('~@/assets/home/rhfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .jcss {
-        background: url('~@/assets/home/sxt_square.png') no-repeat;
-        background-size: 100%;
-      }
-
-      .header {
+        margin-top: 10px;
         display: flex;
-        justify-content: space-between;
         align-items: center;
-        margin: 0 10px 0 0;
 
-        .header-right {
+        .left {
+          display: inline-block;
+          width: 120px;
+          height: 110px;
+          margin-right: 16px;
+        }
+
+        .right {
+          width: 100%;
+        }
+
+        .yyzy {
+          background: url('~@/assets/home/yyzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .sjzy {
+          background: url('~@/assets/home/sjzy_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .znsf {
+          background: url('~@/assets/home/znsf_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .tcfw {
+          background: url('~@/assets/home/tcfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .kfzj {
+          background: url('~@/assets/home/kfzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .ywzj {
+          background: url('~@/assets/home/ywzj_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .rhfw {
+          background: url('~@/assets/home/rhfw_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .jcss {
+          background: url('~@/assets/home/sxt_square.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .header {
           display: flex;
-          font-size: 14px;
-          color: #212121;
+          justify-content: space-between;
+          align-items: center;
+          margin: 0 10px 0 0;
 
-          span {
+          .header-right {
+            display: flex;
             font-size: 14px;
             color: #212121;
+
+            span {
+              font-size: 14px;
+              color: #212121;
+            }
+
+            div {
+              margin-right: 24px;
+            }
+
+            .label-content {
+              flex: 1;
+              display: flex;
+              justify-content: flex-end;
+
+              .label {
+                padding: 0.01rem 0.1rem;
+                margin-right: 0.1rem;
+                border-radius: 0.13rem;
+                background: #0087ff;
+                color: #fff;
+              }
+            }
           }
 
+          .header-right:last-child {
+            div {
+              margin-right: 16px;
+            }
+          }
+
+          span {
+            font-size: 20px;
+            font-weight: 600;
+            // color: #0087ff;
+          }
+        }
+
+        .dec {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          // white-space: nowrap;
+          color: #0058e1;
+          display: flex;
+          margin-top: 10px;
+
           div {
-            margin-right: 24px;
+            margin-right: 10px;
+            background: rgba(0, 88, 225, 0.1);
+            padding-left: 10px;
+            padding-right: 10px;
           }
 
-          .label-content {
+          div:nth-child(2) {
+            max-width: 200px;
+            display: -webkit-box;
+            /*设置为弹性盒子*/
+            -webkit-line-clamp: 1;
+            /*最多显示3行*/
+            overflow: hidden;
+            /*超出隐藏*/
+            text-overflow: ellipsis;
+            /*超出显示为省略号*/
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+        }
+
+        .btn {
+          display: flex;
+          justify-content: space-between;
+          font-size: 14px;
+          margin: 5px 0;
+
+          // .left {
+          //   width: 600px;
+          //   display: flex;
+          //   justify-content: space-between;
+          //   flex-wrap: wrap;
+          //   & > div {
+          //     width: 300px;
+          //     & > span {
+          //       color: #0087ff;
+          //       font-weight: 600;
+          //     }
+          //   }
+          // }
+          .right {
             flex: 1;
             display: flex;
             justify-content: flex-end;
+            margin: 0 10px;
+            align-items: center;
 
-            .label {
-              padding: 0.01rem 0.1rem;
-              margin-right: 0.1rem;
-              border-radius: 0.13rem;
-              background: #0087ff;
-              color: #fff;
+            .shopping {
+              span {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                margin-right: 10px;
+                margin-top: 5px;
+              }
+
+              .shopping-on {
+                background: url('~@/assets/newHome/shopping-on.png');
+                cursor: pointer;
+              }
+
+              .shopping-down {
+                background: url('~@/assets/newHome/shopping-down.png');
+              }
             }
-          }
-        }
 
-        .header-right:last-child {
-          div {
-            margin-right: 16px;
-          }
-        }
-
-        span {
-          font-size: 20px;
-          font-weight: 600;
-          // color: #0087ff;
-        }
-      }
-
-      .dec {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        // white-space: nowrap;
-        color: #0058e1;
-        display: flex;
-        margin-top: 10px;
-
-        div {
-          margin-right: 10px;
-          background: rgba(0, 88, 225, 0.1);
-          padding-left: 10px;
-          padding-right: 10px;
-        }
-
-        div:nth-child(2) {
-          max-width: 200px;
-          display: -webkit-box;
-          /*设置为弹性盒子*/
-          -webkit-line-clamp: 1;
-          /*最多显示3行*/
-          overflow: hidden;
-          /*超出隐藏*/
-          text-overflow: ellipsis;
-          /*超出显示为省略号*/
-          -webkit-box-orient: vertical;
-          word-break: break-all;
-        }
-      }
-
-      .btn {
-        display: flex;
-        justify-content: space-between;
-        font-size: 14px;
-        margin: 5px 0;
-
-        // .left {
-        //   width: 600px;
-        //   display: flex;
-        //   justify-content: space-between;
-        //   flex-wrap: wrap;
-        //   & > div {
-        //     width: 300px;
-        //     & > span {
-        //       color: #0087ff;
-        //       font-weight: 600;
-        //     }
-        //   }
-        // }
-        .right {
-          flex: 1;
-          display: flex;
-          justify-content: flex-end;
-          margin: 0 10px;
-          align-items: center;
-
-          .shopping {
-            span {
+            .pk-on {
               display: inline-block;
               height: 32px;
               width: 32px;
+              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-            }
-
-            .shopping-on {
-              background: url('~@/assets/newHome/shopping-on.png');
+              background: url('~@/assets/newHome/pk-on.png');
               cursor: pointer;
             }
 
-            .shopping-down {
-              background: url('~@/assets/newHome/shopping-down.png');
-            }
-          }
-
-          .pk-on {
-            display: inline-block;
-            height: 32px;
-            width: 32px;
-            margin-left: 10px;
-            margin-right: 10px;
-            margin-top: 5px;
-            background: url('~@/assets/newHome/pk-on.png');
-            cursor: pointer;
-          }
-
-          .sc {
-            // margin-top: 4px;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-
-            .sc-down {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-down.png');
-            }
-
-            .sc-on {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              background: url('~@/assets/newHome/sc-on.png');
-            }
-          }
-
-          .ant-btn {
-            background: transparent;
-            background: #0058e1;
-            color: white;
-            width: 80px;
-            height: 32px;
-            font-weight: 600;
-            border-radius: 2px;
-            text-align: center;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-left: 10px;
-          }
-
-          .ant-btn:last-child {
-            background: #0058e1;
-            color: white;
-          }
-        }
-      }
-
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 10px;
-        align-items: center;
-
-        &>div {
-          display: flex;
-          align-items: center;
-
-          &>div {
-            margin: 0 10px;
-          }
-        }
-
-        .pingfen {
-          :deep(span) {
-            display: flex;
-            align-items: center;
-
-            :deep(ul) {
+            .sc {
+              // margin-top: 4px;
+              cursor: pointer;
               display: flex;
               align-items: center;
 
-              :deep(.ant-rate-star:not(:last-child)) {
-                margin-right: 4px;
+              .sc-down {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-down.png');
+              }
+
+              .sc-on {
+                display: inline-block;
+                height: 32px;
+                width: 32px;
+                background: url('~@/assets/newHome/sc-on.png');
+              }
+            }
+
+            .ant-btn {
+              background: transparent;
+              background: #0058e1;
+              color: white;
+              width: 80px;
+              height: 32px;
+              font-weight: 600;
+              border-radius: 2px;
+              text-align: center;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-left: 10px;
+            }
+
+            .ant-btn:last-child {
+              background: #0058e1;
+              color: white;
+            }
+          }
+        }
+
+        .bottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 10px;
+          align-items: center;
+
+          & > div {
+            display: flex;
+            align-items: center;
+
+            & > div {
+              margin: 0 10px;
+            }
+          }
+
+          .pingfen {
+            :deep(span) {
+              display: flex;
+              align-items: center;
+
+              :deep(ul) {
+                display: flex;
+                align-items: center;
+
+                :deep(.ant-rate-star:not(:last-child)) {
+                  margin-right: 4px;
+                }
               }
             }
           }
         }
       }
-    }
 
-    .item:nth-of-type(1) {
-      margin-top: 0;
+      .item:nth-of-type(1) {
+        margin-top: 0;
+      }
     }
   }
-}
 
-.description {
-  max-width: 990px;
-  height: 52px;
-  font-size: 14px;
-  line-height: 18px;
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  /*最多显示3行*/
-  overflow: hidden;
-  /*超出隐藏*/
-  text-overflow: ellipsis;
-  /*超出显示为省略号*/
-  -webkit-box-orient: vertical;
-  word-break: break-all;
-}
+  .description {
+    max-width: 990px;
+    height: 52px;
+    font-size: 14px;
+    line-height: 18px;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    /*最多显示3行*/
+    overflow: hidden;
+    /*超出隐藏*/
+    text-overflow: ellipsis;
+    /*超出显示为省略号*/
+    -webkit-box-orient: vertical;
+    word-break: break-all;
+  }
 </style>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index e38455bc..ba77c2e5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -330,7 +330,6 @@
                 <a-input v-model:value="formState.name" style="width: 72%" />
               </a-form-item>
             </a-col>
-            <!-- v-bind="validateInfos.phone" -->
             <a-col :span="8">
               <a-form-item
                 name="phone"
@@ -416,7 +415,6 @@
             <span>{{ pagination.total || 0 }}</span>
             个
           </p>
-          <!-- <i class="boundary"></i> -->
           <p>
             已选
             <span>{{ selectedRowKeys.length }}</span>
@@ -425,7 +423,6 @@
         </div>
         <!-- 右侧 -->
         <div class="contentRight">
-          <!-- 搜索@search="onSearch" -->
           <div class="searchInput" v-if="isXiHaiAn">
             <a-input-search
               v-model:value="mapSearchParam.cameraName"
@@ -490,10 +487,10 @@
           @change="handleTableChange"
           :row-selection="{
             selectedRowKeys: selectedRowKeys,
-            // onChange: onSelectChange,
             onSelect: onSelectChange,
             onSelectAll: onSelectAll,
           }"
+          :loading="loadingCamera"
         >
           <template #bodyCell="{ column, record }">
             <template v-if="isXiHaiAn && column.dataIndex === 'status'">
@@ -512,18 +509,6 @@
               >
                 预览
               </a>
-              <!-- <a
-                v-else
-                @click="
-                  openPicture(
-                    record.channelCode ||
-                      record.channelId ||
-                      record.channelCode.channelId
-                  )
-                "
-              >
-                预览
-              </a> -->
             </template>
           </template>
         </a-table>
@@ -566,19 +551,19 @@
       >
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
-          <div style="width: 100%; height: 100%; position: relative">
+          <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
             <!-- 西海岸--预览视频--遮罩 todo-->
-            <div class="video-cover" @click="videoShowMsg" v-show="isXiHaiAn"></div>
-            <div class="waterMark waterMark-left-top" v-show="isXiHaiAn">
+            <div class="video-cover" @click="videoShowMsg"></div>
+            <div class="waterMark waterMark-left-top">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="waterMark waterMark-right-top" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-right-top">
               {{ userInfo.realNameShow }}
             </div>
-            <div class="waterMark waterMark-left-bottom" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-left-bottom">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="waterMark waterMark-right-bottom" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-right-bottom">
               {{ userInfo.realNameShow }}
             </div>
             <vue3VideoPlay v-bind="options" />
@@ -684,6 +669,7 @@
         :title="wrjName + '详情'"
         @ok="wrjVisible = false"
       >
+        <template #footer></template>
         <div v-for="(db, key) in wrjData" :key="key">
           <template v-if="typeof db == 'object'">
             <div
@@ -736,6 +722,7 @@
   import { getCameraByCondition } from '@/api/file'
   import {
     sgcInsert,
+    xhaAddCart,
     getRoomSearch,
     getDate,
     setSubmit,
@@ -843,13 +830,6 @@
       },
     ],
     matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }],
-    // phone: [
-    //   {
-    //     required: true,
-    //     pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
-    //     message: '请输入正确的手机号',
-    //   },
-    // ],
     dept: [
       {
         required: true,
@@ -948,7 +928,6 @@
 
       dataSource.value = param.dataSource
       pagination.value.total = param.total
-      // getCamera()
     })
     //点位点击
     mybus.off('pointMarkerClick')
@@ -1004,10 +983,6 @@
       {
         arr: [
           {
-            // description:
-            //   '申请单兵手持便携终端，提告前端人员执法透明度，加强执法人员与指挥中心实时沟通。',
-            // resourceId: 'dbsb',
-            // type: '单兵设备',
             description: data.description,
             resourceId: data.id,
             resourceName: data.wrjName,
@@ -1423,7 +1398,6 @@
         }
         selectType.value = '视频资源'
         console.log('444------------>', 444);
-        
       } else if (name == '政务云资源') {
         room.value = true
         tableHeight.value = 600
@@ -1444,14 +1418,6 @@
         pagination.value.total = 0
         selectType.value = '感知资源'
       } else if (name == '城市云脑会客厅') {
-        //     room.value = false
-        //     wrjFlag.value = true
-        //     showMap.value = false
-        // roomYuyue.value = true
-        //     roomResult.value = false
-        //     tabList.value[1] = []
-        //     emits('add', 6)
-        //     searchData()
       }
       clickList.value[indexFather].content.splice(
         clickList.value[indexFather].content.indexOf(name),
@@ -1491,12 +1457,10 @@
             mapSearchParam.value.labelCodes.push(item.labelCode)
           })
         }
-        // todo
         mapSearchParam.value.gpsX = ''
         mapSearchParam.value.gpsY = ''
         mapSearchParam.value.radius = ''
         mapSearchParam.value.type = ''
-        console.log('mapSearchParam----->查询条件', mapSearchParam.value)
         mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
         emits('add', 1)
         getCamera()
@@ -1615,6 +1579,8 @@
       clickList.value[1].content = []
     }
     clickList.value[indexFather].content[0] = name
+    console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]);
+    
     if (tabList.value[1]) {
       tabList.value[1].title = ''
       tabList.value[1].content = []
@@ -1717,7 +1683,6 @@
           videoList.value.push(ob)
         })
       }
-      console.log('验证数据的准确性', videoList)
       batchVisible.value = true
     } else {
       message.error('请选择需要预览的数据')
@@ -1750,7 +1715,6 @@
           videoList.value.push(ob)
         })
       }
-      console.log('验证数据的准确性', videoList)
       batchPicVisible.value = true
     } else {
       message.error('请选择需要预览的数据')
@@ -1778,8 +1742,6 @@
   }
   const videoClean = () => {
     //视频预览弹窗关闭后不清除选中行
-    // selectedList.value = []
-    // selectedRowKeys.value = []
     videoList.value = []
     current.value = 1
   }
@@ -1787,11 +1749,8 @@
   const changePage = (page) => {}
   // 一键申请
   const dept = reactive({})
-  // eslint-disable-next-line no-undef
   if (infrastructure) {
-    // eslint-disable-next-line no-undef
     dept.deptId = infrastructure.deptId || ''
-    // eslint-disable-next-line no-undef
     dept.deptName = infrastructure.deptName || ''
   }
 
@@ -1809,7 +1768,6 @@
   }
 
   const apply = async () => {
-    console.log('一键申请', selectedList.value)
     if (selectedRowKeys.value.length != 0) {
       // 判断最大数量
       let maxNumRes = await judegNumber()
@@ -1831,6 +1789,7 @@
           deptName: dept.deptName,
         },
       ]
+      console.log('一键申请', arr)
       localStorage.setItem('applyList', JSON.stringify(arr))
       router.push({
         path: '/apply',
@@ -1851,30 +1810,27 @@
         break
     }
   }
-  // // 添加至购物车
-  // const addShopCar = () => {
-  //   console.log('添加至购物车')
-  // }
   const wrjFlag = ref(false)
+  // 西海岸-视频资源loading
+  const loadingCamera = ref(false)
   const getCamera = (flag, str) => {
-    console.log(
-      'mapSearchParam.value.cameraName------------>',
-      mapSearchParam.value.cameraName
-    )
+    loadingCamera.value = true;
     if (flag) {
       mapSearchParam.value.cameraName = str
-      console.log('赋值===============》', str, mapSearchParam.value)
     }
     console.log('初始化调用')
     console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
     if (!whoShow1.value.itShowXiHaiAn) {
       getCameraByParentId(mapSearchParam.value).then((res) => {
-        console.log('RRRRRRRRRR', res.data.data)
+        console.log('res--查询摄像头---------->', res);
+        loadingCamera.value = false;
         dataSource.value = res.data.data
         pagination.value.total = res.data.count
+      }).catch(err => {
+        loadingCamera.value = false;
+        message.error(err)
       })
     } else {
-      console.log('mapSearchParam------------>', mapSearchParam)
       let params = {
         regionId:
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@@ -1911,9 +1867,13 @@
         }
       }
       getCameraByCondition(params).then((res) => {
+        console.log('res--查询摄像头---------->', res);
+        loadingCamera.value = false;
         dataSource.value = res.data.data
         pagination.value.total = res.data.count
-        console.log('根据parent查询摄像头', res.data.data)
+      }).catch(err => {
+        loadingCamera.value = false;
+        message.error(err)
       })
     }
   }
@@ -1931,9 +1891,7 @@
           note1: [v],
         })
       })
-      console.log('_arr------------>', _arr);
-      sgcInsert(_arr).then((res) => {
-        console.log('res------申购车------>', res);
+      xhaAddCart(_arr).then((res) => {
         if(res.data.code !== 0) {
           return message.error(res.data.msg)
         }
@@ -2001,7 +1959,6 @@
       align: 'center',
     },
   ])
-  // const allClick = ref([])
   const onSelectChange = (
     record,
     selected,
@@ -2009,7 +1966,6 @@
     nativeEvent,
     type
   ) => {
-    console.log('hahhahah', record, selected, selectedRows, nativeEvent)
     record = JSON.parse(JSON.stringify(record))
     if (selected) {
       if (selectedRowKeys.value.length == 1000) {
@@ -2041,9 +1997,6 @@
       if (selectedRowKeys.value.length > 1000) {
         message.warning('最多只能添加1000个摄像头！')
         changeRows.map((val) => {
-          // selectedList.value = selectedList.value.filter(
-          //   (item) => item.idtCameraChannel !== val.idtCameraChannel
-          // )
           selectedList.value.forEach((ele, index) => {
             if (ele.channelCode == record.channelCode) {
               selectedList.value.splice(index, 1)
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index f0858373..593d66b7 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -4,13 +4,20 @@
     <home-header></home-header>
     <detail-back></detail-back>
     <!-- 头部基本信息 -->
-    <application-top-details :dataList="detailInfoObj" :navList="navList"></application-top-details>
+    <application-top-details
+      :dataList="detailInfoObj"
+      :navList="navList"
+    ></application-top-details>
 
     <!-- 导航 -->
     <div :class="{ fixed: scrollTop >= 600 }">
       <div class="application-navigation">
         <template v-for="nav in navList" :key="nav.key">
-          <div class="nav" :class="{ selectNow: nav.key == selectNow }" @click="selectNav(nav.key)">
+          <div
+            class="nav"
+            :class="{ selectNow: nav.key == selectNow }"
+            @click="selectNav(nav.key)"
+          >
             {{ nav.name }}
             <span class="line"></span>
           </div>
@@ -29,11 +36,16 @@
         </div>
 
         <div class="content" style="margin-left: 0.5rem">
-          <div class="content-item" v-for="(item, i) in painPoint" :key="i" style="
+          <div
+            class="content-item"
+            v-for="(item, i) in painPoint"
+            :key="i"
+            style="
               margin-bottom: 0.2rem;
               font-size: 0.18rem;
               line-height: 0.3rem;
-            ">
+            "
+          >
             {{ i + 1 + '、' + item.description }}
           </div>
         </div>
@@ -41,17 +53,26 @@
     </div>
 
     <!-- 解决方案 -->
-    <div id="integration-solution" class="solution scrollBox" style="background: #eee">
+    <div
+      id="integration-solution"
+      class="solution scrollBox"
+      style="background: #eee"
+    >
       <div class="title-1">
         <DetalsTitle title="解决方案" type="SOLUTION"></DetalsTitle>
       </div>
       <div class="flex-row-center">
         <div class="content" style="background: #fff; margin-top: 0.2rem">
-          <div class="content-item" v-for="(item, i) in solution" :key="i" style="
+          <div
+            class="content-item"
+            v-for="(item, i) in solution"
+            :key="i"
+            style="
               margin-bottom: 0.2rem;
               font-size: 0.18rem;
               line-height: 0.3rem;
-            ">
+            "
+          >
             {{ i + 1 + '、' + item.description }}
           </div>
         </div>
@@ -63,20 +84,48 @@
       <div class="title-1">
         <DetalsTitle title="使用能力" type="ABILITY"></DetalsTitle>
       </div>
-      <div class="flex-row-center combine-content" v-for="(item, i) in combineList" :key="i" style="display: block">
-        <div class="top" style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem">
+      <div
+        class="flex-row-center combine-content"
+        v-for="(item, i) in combineList"
+        :key="i"
+        style="display: block"
+      >
+        <div
+          class="top"
+          style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem"
+        >
           {{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
         </div>
         <div class="bottom" style="display: flex; align-items: flex-start">
           <div class="title" :class="'title' + i"></div>
           <div class="table-box">
-            <el-table class="table" :data="item.list" stripe :header-cell-style="{ 'text-align': 'center' }">
-              <el-table-column prop="name" label="数据" align="center" width="200" show-overflow-tooltip="true">
-              </el-table-column>
-              <el-table-column prop="dept" label="能力来源" align="center" width="300" show-overflow-tooltip="true">
-              </el-table-column>
-              <el-table-column prop="platform" label="申请平台" align="center" width="100" show-overflow-tooltip="true">
-              </el-table-column>
+            <el-table
+              class="table"
+              :data="item.list"
+              stripe
+              :header-cell-style="{ 'text-align': 'center' }"
+            >
+              <el-table-column
+                prop="name"
+                label="数据"
+                align="center"
+                width="200"
+                show-overflow-tooltip="true"
+              ></el-table-column>
+              <el-table-column
+                prop="dept"
+                label="能力来源"
+                align="center"
+                width="300"
+                show-overflow-tooltip="true"
+              ></el-table-column>
+              <el-table-column
+                prop="platform"
+                label="申请平台"
+                align="center"
+                width="100"
+                show-overflow-tooltip="true"
+              ></el-table-column>
             </el-table>
           </div>
         </div>
@@ -90,7 +139,12 @@
       </div>
       <div class="flex-row-center step-content">
         <el-steps direction="vertical" :space="150" :active="step.length">
-          <el-step v-for="(item, i) in step" :key="i" :title="item.question" :description="item.answer"></el-step>
+          <el-step
+            v-for="(item, i) in step"
+            :key="i"
+            :title="item.question"
+            :description="item.answer"
+          ></el-step>
         </el-steps>
       </div>
     </div>
@@ -99,542 +153,542 @@
 </template>
 
 <script setup>
-import ApplicationTopDetails from './components/ApplicationTopDetails.vue'
-import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
-import HomeFooter from '@/views/newHome/components/Footer'
-import HomeHeader from '@/views/home/components/header'
-import detailBack from '@/views/home/detailBack.vue'
-import { ref, onMounted, onBeforeUnmount } from 'vue'
-import { useRouter } from 'vue-router'
-import { getIntegrationDetail } from '@/api/home'
-import mybus from '@/myplugins/mybus'
-import { message } from 'ant-design-vue'
-const router = useRouter()
-const scrollTop = ref(0)
-const domArr = ref([])
-const painPoint = ref([])
-const solution = ref([])
-const step = ref([])
-const bgImg = ref('')
-const id = router.currentRoute.value.query.id
-document.documentElement.style.transition = 'all 0.3s ease'
-document.documentElement.scrollTop = 0
-document.body.style.transition = 'all 0.3s ease'
-document.body.scrollTop = 0
-mybus.on('flyToView', (id) => {
-  let top =
-    document.querySelector('#' + id) &&
-    document.querySelector('#' + id).offsetTop - 50
-  document.documentElement.scrollTop = top
-  document.body.scrollTop = top
-})
-
-const navList = ref([
-  {
-    name: '场景痛点',
-    key: 'integration-pain-point',
-  },
-  {
-    name: '解决方案',
-    key: 'integration-solution',
-  },
-  {
-    name: '使用能力',
-    key: 'integration-ability',
-  },
-  {
-    name: '构建步骤',
-    key: 'integration-step',
-  },
-])
-
-const selectNow = ref('integration-pain-point')
-
-const useWayShowList = ref([
-  {
-    title: '归属部门',
-    info: {
-      deptUser: '部门联系人',
-      mobile: '联系人电话',
-    },
-  },
-  {
-    title: '服务商',
-    info: {
-      providerUser: '服务商联系人',
-      providerMobile: '联系人电话',
-    },
-  },
-])
-
-const combineList = ref([
-  {
-    title: '基础设施',
-    list: [],
-  },
-  {
-    title: '组件服务',
-    list: [],
-  },
-  {
-    title: '数据资源',
-    list: [],
-  },
-])
-const detailInfoObj = ref({})
-
-onMounted(() => {
-  window.addEventListener('scroll', () => {
-    domArr.value = document.querySelectorAll('.scrollBox')
-    scrollTop.value =
-      document.documentElement.scrollTop || document.body.scrollTop
-    for (let i = 0; i < domArr.value.length; i++) {
-      if (i === 0) {
-        if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
-          selectNow.value = domArr.value[i].id
-        }
-      } else if (i == domArr.value.length - 1) {
-        if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
-          selectNow.value = domArr.value[i].id
-        }
-      } else {
-        if (
-          scrollTop.value >= domArr.value[i].offsetTop - 50 &&
-          scrollTop.value <= domArr.value[i + 1].offsetTop - 50
-        ) {
-          selectNow.value = domArr.value[i].id
-        }
-      }
-    }
+  import ApplicationTopDetails from './components/ApplicationTopDetails.vue'
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
+  import HomeFooter from '@/views/newHome/components/Footer'
+  import HomeHeader from '@/views/home/components/header'
+  import detailBack from '@/views/home/detailBack.vue'
+  import { ref, onMounted, onBeforeUnmount } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { getIntegrationDetail } from '@/api/home'
+  import mybus from '@/myplugins/mybus'
+  import { message } from 'ant-design-vue'
+  const router = useRouter()
+  const scrollTop = ref(0)
+  const domArr = ref([])
+  const painPoint = ref([])
+  const solution = ref([])
+  const step = ref([])
+  const bgImg = ref('')
+  const id = router.currentRoute.value.query.id
+  document.documentElement.style.transition = 'all 0.3s ease'
+  document.documentElement.scrollTop = 0
+  document.body.style.transition = 'all 0.3s ease'
+  document.body.scrollTop = 0
+  mybus.on('flyToView', (id) => {
+    let top =
+      document.querySelector('#' + id) &&
+      document.querySelector('#' + id).offsetTop - 50
+    document.documentElement.scrollTop = top
+    document.body.scrollTop = top
   })
-})
 
-const selectNav = (key) => {
-  selectNow.value = key
-  mybus.emit('flyToView', selectNow.value)
-}
+  const navList = ref([
+    {
+      name: '场景痛点',
+      key: 'integration-pain-point',
+    },
+    {
+      name: '解决方案',
+      key: 'integration-solution',
+    },
+    {
+      name: '使用能力',
+      key: 'integration-ability',
+    },
+    {
+      name: '构建步骤',
+      key: 'integration-step',
+    },
+  ])
 
-const getAttrValue = (fuseAttrList, data, text) => {
-  let _obj = fuseAttrList.find((v) => v.attrType === text) || {};
-  data =
-    JSON.parse(
-      _obj.attrValue || '[]'
-    ) || []
-}
+  const selectNow = ref('integration-pain-point')
 
-// 融合服务--详情
-const getIntegrationServicesDeatil = (id) => {
-  getIntegrationDetail(id).then(
-    (res) => {
-      if (res.data.code !== 0) {
-        return message.error(res.data.msg)
-      }
-      detailInfoObj.value = res.data.data || {}
-      // 资源属性
-      let fuseAttrList = res.data.data.fuseAttrList || []
-      // 融合关系
-      let fuseResourceList = res.data.data.fuseResourceList || []
-      let questionValue =
-        fuseAttrList.find((v) => v.attrType === '常见问题') || {}
-      let questionObj = {
-        attrType: '常见问题',
-        attrValue: questionValue.attrValue || '[]',
-      }
-      getAttrValue(fuseAttrList, painPoint.value, '场景痛点');
-      getAttrValue(fuseAttrList, solution.value, '解决方案');
-      getAttrValue(fuseAttrList, step.value, '使用步骤');
-      bgImg.value =
-        fuseAttrList.find((v) => v.attrType === '服务图片').attrValue || ''
-      let areaObj = {
-        attrType: '应用领域',
-        attrValue: '',
-      }
-      combineList.value.forEach((item) => {
-        let arr = []
-        let resource = fuseResourceList.filter(
-          (v) => v.resource && v.type == item.title
-        )
-        if (resource.length > 0) {
-          if (item.title === '基础设施') {
-            arr = resource.map((res) => ({
-              id: res.resource.idtCameraChannel,
-              name: res.resource.channelName,
-              dept: res.resource.nodeName,
-              platform: 'UCS',
-            }))
-          } else if (item.title === '组件服务') {
-            arr = resource.map((res) => ({
-              id: res.resource.id,
-              name: res.resource.name,
-              dept: res.resource.deptName,
-              platform: 'UCS',
-            }))
-          } else if (item.title === '数据资源') {
-            arr = resource.map((res) => ({
-              id: res.resource.zycode,
-              name: res.resource.zyname,
-              dept: res.resource.TGBM,
-              platform: '共享交换平台',
-            }))
+  const useWayShowList = ref([
+    {
+      title: '归属部门',
+      info: {
+        deptUser: '部门联系人',
+        mobile: '联系人电话',
+      },
+    },
+    {
+      title: '服务商',
+      info: {
+        providerUser: '服务商联系人',
+        providerMobile: '联系人电话',
+      },
+    },
+  ])
+
+  const combineList = ref([
+    {
+      title: '基础设施',
+      list: [],
+    },
+    {
+      title: '组件服务',
+      list: [],
+    },
+    {
+      title: '数据资源',
+      list: [],
+    },
+  ])
+  const detailInfoObj = ref({})
+
+  onMounted(() => {
+    window.addEventListener('scroll', () => {
+      domArr.value = document.querySelectorAll('.scrollBox')
+      scrollTop.value =
+        document.documentElement.scrollTop || document.body.scrollTop
+      for (let i = 0; i < domArr.value.length; i++) {
+        if (i === 0) {
+          if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
+            selectNow.value = domArr.value[i].id
+          }
+        } else if (i == domArr.value.length - 1) {
+          if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
+            selectNow.value = domArr.value[i].id
+          }
+        } else {
+          if (
+            scrollTop.value >= domArr.value[i].offsetTop - 50 &&
+            scrollTop.value <= domArr.value[i + 1].offsetTop - 50
+          ) {
+            selectNow.value = domArr.value[i].id
           }
         }
-        if (item.title === '数据资源') {
-          item.list.push({
-            id: '数据资源1',
-            name: '城管案件数据',
-            dept: '市城管局',
-            platform: '政务信息共享交换网',
-          })
-          item.list.push({
-            id: '数据资源2',
-            name: '手机信令数据',
-            dept: '运营商（移动）',
-            platform: '政务信息共享交换网',
-          })
-          item.list.push({
-            id: '数据资源3',
-            name: '标准地址数据',
-            dept: '市自规局',
-            platform: '政务信息共享交换网',
-          })
-        } else {
-          item.list = arr
-        }
-      })
-      detailInfoObj.value.infoList = []
-      detailInfoObj.value.infoList.push(questionObj)
-      detailInfoObj.value.infoList.push(areaObj)
-    },
-    (err) => {
-      message.error(err)
-    }
-  )
-}
-getIntegrationServicesDeatil(id)
+      }
+    })
+  })
 
-function handleOpenUrl(type) {
-  let obj =
-    (detailInfoObj.value.fuseAttrList || []).find(
-      (v) => v.attrType == type
-    ) || {}
-  let url = obj.attrValue || ''
-  if (!obj.attrValue) {
-    return message.error('错误的文档链接地址！')
+  const selectNav = (key) => {
+    selectNow.value = key
+    mybus.emit('flyToView', selectNow.value)
   }
-  window.open(
-    window.SITE_CONFIG.previewUrl +
-    'hisense_office/onlinePreview?url=' +
-    btoa(encodeURI(url))
-  )
-}
 
-onBeforeUnmount(() => {
-  mybus.off('flyToView')
-})
+  const getAttrValue = (fuseAttrList, text) => {
+    let _obj = fuseAttrList.find((v) => v.attrType === text) || {}
+    let data = JSON.parse(_obj.attrValue || '[]') || []
+    return data
+  }
+
+  // 融合服务--详情
+  const getIntegrationServicesDeatil = (id) => {
+    getIntegrationDetail(id).then(
+      (res) => {
+        if (res.data.code !== 0) {
+          return message.error(res.data.msg)
+        }
+        detailInfoObj.value = res.data.data || {}
+        // 资源属性
+        let fuseAttrList = res.data.data.fuseAttrList || []
+        // 融合关系
+        let fuseResourceList = res.data.data.fuseResourceList || []
+        let questionValue =
+          fuseAttrList.find((v) => v.attrType === '常见问题') || {}
+        let questionObj = {
+          attrType: '常见问题',
+          attrValue: questionValue.attrValue || '[]',
+        }
+        painPoint.value = getAttrValue(fuseAttrList, '场景痛点')
+        solution.value = getAttrValue(fuseAttrList, '解决方案')
+        step.value = getAttrValue(fuseAttrList, '使用步骤')
+        bgImg.value =
+          fuseAttrList.find((v) => v.attrType === '服务图片').attrValue || ''
+        let areaObj = {
+          attrType: '应用领域',
+          attrValue: '',
+        }
+        combineList.value.forEach((item) => {
+          let arr = []
+          let resource = fuseResourceList.filter(
+            (v) => v.resource && v.type == item.title
+          )
+          if (resource.length > 0) {
+            if (item.title === '基础设施') {
+              arr = resource.map((res) => ({
+                id: res.resource.idtCameraChannel,
+                name: res.resource.channelName,
+                dept: res.resource.nodeName,
+                platform: 'UCS',
+              }))
+            } else if (item.title === '组件服务') {
+              arr = resource.map((res) => ({
+                id: res.resource.id,
+                name: res.resource.name,
+                dept: res.resource.deptName,
+                platform: 'UCS',
+              }))
+            } else if (item.title === '数据资源') {
+              arr = resource.map((res) => ({
+                id: res.resource.zycode,
+                name: res.resource.zyname,
+                dept: res.resource.TGBM,
+                platform: '共享交换平台',
+              }))
+            }
+          }
+          if (item.title === '数据资源') {
+            item.list.push({
+              id: '数据资源1',
+              name: '城管案件数据',
+              dept: '市城管局',
+              platform: '政务信息共享交换网',
+            })
+            item.list.push({
+              id: '数据资源2',
+              name: '手机信令数据',
+              dept: '运营商（移动）',
+              platform: '政务信息共享交换网',
+            })
+            item.list.push({
+              id: '数据资源3',
+              name: '标准地址数据',
+              dept: '市自规局',
+              platform: '政务信息共享交换网',
+            })
+          } else {
+            item.list = arr
+          }
+        })
+        detailInfoObj.value.infoList = []
+        detailInfoObj.value.infoList.push(questionObj)
+        detailInfoObj.value.infoList.push(areaObj)
+      },
+      (err) => {
+        message.error(err)
+      }
+    )
+  }
+  getIntegrationServicesDeatil(id)
+
+  function handleOpenUrl(type) {
+    let obj =
+      (detailInfoObj.value.fuseAttrList || []).find(
+        (v) => v.attrType == type
+      ) || {}
+    let url = obj.attrValue || ''
+    if (!obj.attrValue) {
+      return message.error('错误的文档链接地址！')
+    }
+    window.open(
+      window.SITE_CONFIG.previewUrl +
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(url))
+    )
+  }
+
+  onBeforeUnmount(() => {
+    mybus.off('flyToView')
+  })
 </script>
 
 <style lang="less" scoped>
-.flex-row-between {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.flex-row-start {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: flex-start;
-}
-
-.flex-row-center {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-}
-
-.IntegrationServicesDetails {
-  .fixed {
-    position: fixed !important;
-    z-index: 2000;
-    top: 0;
-    left: 0;
-  }
-
-  .fixed2>div:nth-of-type(3) {
-    margin-top: 0.84rem;
-  }
-
-  .application-navigation {
-    width: 19.12rem;
-    height: 0.84rem;
-    line-height: 0.8rem;
+  .flex-row-between {
     display: flex;
-    justify-content: space-around;
-    font-size: 0.24rem;
-    color: #666;
-    background: #fff;
-    padding: 0 3rem;
-    box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
-    position: relative;
-
-    .nav {
-      cursor: pointer;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      align-items: center;
-
-      .line {
-        width: 0.4rem;
-        height: 0.04rem;
-      }
-    }
-
-    .selectNow {
-      color: #526aff;
-
-      .line {
-        background: #526aff;
-      }
-    }
-  }
-}
-
-.use-way {
-  padding: 0.8rem 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .title-1 {
-    margin-bottom: 0.3rem;
-  }
-
-  .left {
-    .btn {
-      padding: 10px 20px;
-      color: #526aff;
-      background: #fff;
-      border-radius: 50px;
-      margin: 10px;
-      font-size: 0.2rem;
-      width: 150px;
-      text-align: center;
-      cursor: pointer;
-    }
-
-    .btn-box {
-      display: flex;
-      flex-direction: column;
-      align-items: flex-end;
-    }
-  }
-
-  .content {
-    display: flex;
-    width: 13rem;
+    flex-direction: row;
+    align-items: center;
     justify-content: space-between;
-
-    .word-bg {
-      background: linear-gradient(90deg, #7184fc, #94a3fc) !important;
-    }
-
-    .content-card {
-      height: 1.5rem;
-      width: 6.2rem;
-      border-radius: 0.2rem;
-      background: linear-gradient(to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
-      padding: 0 0.3rem;
-      display: flex;
-      justify-content: center;
-
-      .card-title {
-        font-size: 0.26rem;
-        color: #212956;
-        margin-bottom: 0.2rem;
-        line-height: 0.26rem;
-      }
-
-      .content-card-item {
-        width: 50%;
-
-        .card-text {
-          margin-right: 0.2rem;
-          color: rgba(33, 41, 86, 0.8);
-          font-size: 0.2rem;
-          max-width: 2.8rem;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          overflow: hidden;
-        }
-
-        div:first-child {
-          display: block;
-        }
-      }
-    }
-  }
-}
-
-.pain-point {
-  padding: 0.8rem 0;
-  background: rgb(247, 248, 250);
-
-  .bg {
-    height: 3rem;
-    width: 3rem;
-    // background: url('~@/assets/home/rhfw_square.png') no-repeat;
-    // background-size: 100%;
-    margin-top: 0.3rem;
   }
 
-  .cjtd {
-    width: 5.75rem;
-    height: 3.4rem;
-    background: url('~@/assets/home/fn/cjtd.png') no-repeat;
-    background-size: 100%;
-  }
-
-  .content {
-    overflow: auto;
-    height: 3rem;
-    width: 7rem;
-    margin-top: 0.3rem;
-
-    .content-item {
-      font-size: 16px;
-      margin: 0rem 0rem 0.1rem 0.1rem;
-    }
-  }
-}
-
-.solution {
-  padding: 0.8rem 0;
-  background: rgb(247, 248, 250);
-
-  .content {
-    width: 11rem;
-
-    .content-item {
-      font-size: 16px;
-      margin: 0.3rem;
-    }
-  }
-}
-
-.step {
-  padding: 0.8rem 0;
-  background: rgb(247, 248, 250);
-
-  .step-content {
-    margin: 0.3rem 4.5rem;
-    padding: 0.3rem;
-    background: #fff;
-
-    :deep(.el-step__description.is-finish) {
-      color: #333;
-      line-height: 0.24rem;
-      margin-top: 0.05rem;
-    }
-
-    /deep/ .el-step__title {
-      font-size: 18px;
-    }
-
-    /deep/ .el-step__description {
-      font-size: 14px;
-    }
-  }
-}
-
-.ability {
-  padding: 0.8rem 0;
-  background: rgb(247, 248, 250);
-
-  .title-1 {
-    margin-bottom: 0.3rem;
-  }
-
-  .combine-content {
-    margin-top: 0.3rem;
-    align-items: flex-start;
-    border-bottom: 1px solid #ccc;
-    margin: 0.2rem 3.5rem 0;
-    padding: 0.2rem 0;
-
-    .title {
-      height: 3rem;
-      width: 3rem;
-      margin-right: 0.4rem;
-      background: url('~@/assets/home/rhfw_square.png') no-repeat;
-      background-size: 100% 100%;
-    }
-
-    .title0 {
-      width: 5.6rem;
-      height: 3.45rem;
-      background: url('~@/assets/home/fn/jcss.png') no-repeat;
-      background-size: 100% 100%;
-    }
-
-    .title1 {
-      width: 5.6rem;
-      height: 3.45rem;
-      background: url('~@/assets/home/fn/zjfw.png') no-repeat;
-      background-size: 100% 100%;
-    }
-
-    .title2 {
-      width: 5.6rem;
-      height: 3.45rem;
-      background: url('~@/assets/home/fn/sjzy.png') no-repeat;
-      background-size: 100% 100%;
-    }
-    .table-box {
-      height: 3.45rem;
-      flex: 1;
-      overflow-y: auto;
-    }
-
-    .table {
-      // width: 100%;
-      font-size: 16px;
-    }
-  }
-
-  .name-box {
+  .flex-row-start {
     display: flex;
     flex-direction: row;
-    flex-wrap: wrap;
+    align-items: center;
     justify-content: flex-start;
-    width: 100%;
   }
 
-  .no-data {
+  .flex-row-center {
     display: flex;
     flex-direction: row;
-    flex-wrap: wrap;
     align-items: center;
     justify-content: center;
-    font-size: 0.16rem;
-    color: #666;
-    text-align: center;
   }
 
-  .name-text {
-    font-size: 0.16rem;
-    color: #212121;
-    line-height: 0.3rem;
-    height: 0.3rem;
-    text-align: center;
-    width: 50%;
-    box-sizing: border-box;
+  .IntegrationServicesDetails {
+    .fixed {
+      position: fixed !important;
+      z-index: 2000;
+      top: 0;
+      left: 0;
+    }
+
+    .fixed2 > div:nth-of-type(3) {
+      margin-top: 0.84rem;
+    }
+
+    .application-navigation {
+      width: 19.12rem;
+      height: 0.84rem;
+      line-height: 0.8rem;
+      display: flex;
+      justify-content: space-around;
+      font-size: 0.24rem;
+      color: #666;
+      background: #fff;
+      padding: 0 3rem;
+      box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
+      position: relative;
+
+      .nav {
+        cursor: pointer;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+
+        .line {
+          width: 0.4rem;
+          height: 0.04rem;
+        }
+      }
+
+      .selectNow {
+        color: #526aff;
+
+        .line {
+          background: #526aff;
+        }
+      }
+    }
+  }
+
+  .use-way {
+    padding: 0.8rem 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .title-1 {
+      margin-bottom: 0.3rem;
+    }
+
+    .left {
+      .btn {
+        padding: 10px 20px;
+        color: #526aff;
+        background: #fff;
+        border-radius: 50px;
+        margin: 10px;
+        font-size: 0.2rem;
+        width: 150px;
+        text-align: center;
+        cursor: pointer;
+      }
+
+      .btn-box {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+      }
+    }
+
+    .content {
+      display: flex;
+      width: 13rem;
+      justify-content: space-between;
+
+      .word-bg {
+        background: linear-gradient(90deg, #7184fc, #94a3fc) !important;
+      }
+
+      .content-card {
+        height: 1.5rem;
+        width: 6.2rem;
+        border-radius: 0.2rem;
+        background: linear-gradient(
+          to right,
+          rgba(113, 132, 252, 0.4),
+          rgba(148, 163, 252, 0.4)
+        );
+        padding: 0 0.3rem;
+        display: flex;
+        justify-content: center;
+
+        .card-title {
+          font-size: 0.26rem;
+          color: #212956;
+          margin-bottom: 0.2rem;
+          line-height: 0.26rem;
+        }
+
+        .content-card-item {
+          width: 50%;
+
+          .card-text {
+            margin-right: 0.2rem;
+            color: rgba(33, 41, 86, 0.8);
+            font-size: 0.2rem;
+            max-width: 2.8rem;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+          }
+
+          div:first-child {
+            display: block;
+          }
+        }
+      }
+    }
+  }
+
+  .pain-point {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+
+    .bg {
+      height: 3rem;
+      width: 3rem;
+      // background: url('~@/assets/home/rhfw_square.png') no-repeat;
+      // background-size: 100%;
+      margin-top: 0.3rem;
+    }
+
+    .cjtd {
+      width: 5.75rem;
+      height: 3.4rem;
+      background: url('~@/assets/home/fn/cjtd.png') no-repeat;
+      background-size: 100%;
+    }
+
+    .content {
+      overflow: auto;
+      height: 3rem;
+      width: 7rem;
+      margin-top: 0.3rem;
+
+      .content-item {
+        font-size: 16px;
+        margin: 0rem 0rem 0.1rem 0.1rem;
+      }
+    }
+  }
+
+  .solution {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+
+    .content {
+      width: 11rem;
+
+      .content-item {
+        font-size: 16px;
+        margin: 0.3rem;
+      }
+    }
+  }
+
+  .step {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+
+    .step-content {
+      margin: 0.3rem 4.5rem;
+      padding: 0.3rem;
+      background: #fff;
+
+      :deep(.el-step__description.is-finish) {
+        color: #333;
+        line-height: 0.24rem;
+        margin-top: 0.05rem;
+      }
+
+      /deep/ .el-step__title {
+        font-size: 18px;
+      }
+
+      /deep/ .el-step__description {
+        font-size: 14px;
+      }
+    }
+  }
+
+  .ability {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+
+    .title-1 {
+      margin-bottom: 0.3rem;
+    }
+
+    .combine-content {
+      margin-top: 0.3rem;
+      align-items: flex-start;
+      border-bottom: 1px solid #ccc;
+      margin: 0.2rem 3.5rem 0;
+      padding: 0.2rem 0;
+
+      .title {
+        height: 3rem;
+        width: 3rem;
+        margin-right: 0.4rem;
+        background: url('~@/assets/home/rhfw_square.png') no-repeat;
+        background-size: 100% 100%;
+      }
+
+      .title0 {
+        width: 5.6rem;
+        height: 3.45rem;
+        background: url('~@/assets/home/fn/jcss.png') no-repeat;
+        background-size: 100% 100%;
+      }
+
+      .title1 {
+        width: 5.6rem;
+        height: 3.45rem;
+        background: url('~@/assets/home/fn/zjfw.png') no-repeat;
+        background-size: 100% 100%;
+      }
+
+      .title2 {
+        width: 5.6rem;
+        height: 3.45rem;
+        background: url('~@/assets/home/fn/sjzy.png') no-repeat;
+        background-size: 100% 100%;
+      }
+      .table-box {
+        height: 3.45rem;
+        flex: 1;
+        overflow-y: auto;
+      }
+
+      .table {
+        // width: 100%;
+        font-size: 16px;
+      }
+    }
+
+    .name-box {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      width: 100%;
+    }
+
+    .no-data {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: center;
+      font-size: 0.16rem;
+      color: #666;
+      text-align: center;
+    }
+
+    .name-text {
+      font-size: 0.16rem;
+      color: #212121;
+      line-height: 0.3rem;
+      height: 0.3rem;
+      text-align: center;
+      width: 50%;
+      box-sizing: border-box;
+    }
   }
-}
 </style>
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 57554491..494e4f02 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -8,65 +8,40 @@
       <div class="bottom">
         <div class="item">
           <div class="zj">组件服务</div>
-          <div
-            class="name"
-            v-for="(item, index) in zjList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne1(item.name)"
-          >
+          <div class="name" v-for="(item, index) in zjList.slice(0, 5)" :key="item.name"
+            :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
         <div class="item">
           <div class="yy">应用资源</div>
-        <div
-            class="name"
-            v-for="(item, index) in yyList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne11(item.name)"
-          >
+          <div class="name" v-for="(item, index) in yyList.slice(0, 5)" :key="item.name"
+            :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="jc">基础设施</div>
-          <div
-            class="name"
-            v-for="(item, index) in jcList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 2 ? 'name-last' : ''"
-            @click="selectOne2(item.name)"
-          >
+          <div class="name" v-for="(item, index) in jcList.slice(0, 5)" :key="item.name"
+            :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
-          <div
-            class="name"
-            v-for="(item, index) in sjList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne3(item.name)"
-          >
+          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="zs">知识库</div>
-          <div
-            class="name"
-            v-for="(item, index) in zsList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="openHref(item)"
-          >
+          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@@ -76,448 +51,424 @@
   </div>
 </template>
 <script setup>
-  import {
-    pageWithAttrs,
-    getDataResource,
-    selectInfrastructureList,
-    selectCollectComponentList,
-    selectCollectResourceList
-  } from '@/api/home.js'
-  import { ref, reactive } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
-  import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
-  import { message, Upload } from 'ant-design-vue'
-  import mybus from '@/myplugins/mybus'
-  const store = useStore()
-  const router = useRouter()
-  const zjList = ref([])
-  const jcList = ref([])
-  const sjList = ref([])
-  const yyList = ref([])
-  // 知识库模块数据
-  const zsList = ref([])
-  // const jcList = ref([])
-  const paramsGetResources = {
-    districtId: '',
-    pageNum: 1,
-    pageSize: 5,
-    type: '',
-    name: '',
-    infoList: [],
-    orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-    orderType: 'DESC', // ASC 升序  DESC 降序
-  }
-  console.log('dataShowdev==========================>', whoShow)
-  // eslint-disable-next-line no-undef
-  const whoShow1 = ref(whoShow)
-  const interfaceSuccess = ref(0)
-  const object = reactive({
-    yyNum: '',
-    zjNum: '',
-    jcNum: '',
-    sjNum: '',
-    zsNum: '',
-  })
-  const getAppResources = (type, obj) => {
-    paramsGetResources.type = type
-    if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
-      getDataResource({
-        serviceName: paramsGetResources.name || '', //资源名称
-        orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
-        orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-        pageNum: paramsGetResources.pageNum, //页码
-        pageSize: paramsGetResources.pageSize, //分页大小
-      }).then((res) => {
-        console.log('数据资源==================>', res.data.data)
-        if (whoShow1.value.itShowQingDao) {
-          res.data.data.data.forEach((val) => {
-            val.id = val.guid // id
-            val.name = val.zyname // 名字
-            val.sjlCount = val.sjcczl // 数据量
-            val.applyCount = val.syqk // 申请量
-            val.deptName = val.TGBM // 部门
-            val.createDate = val.fbrq // 发布时间
-            val.description = val.xgxt // 描述
-          })
-          obj.value = res.data.data.data || []
-          object.sjNum = res.data.data.rows
-        } else if (whoShow1.value.itShowXiHaiAn) {
-          res.data.data.list.forEach((val) => {
-            val.id = val.serviceId // id
-            val.name = val.serviceName // 名字
-            val.sjlCount = val.requestQuantity // 数据量
-            val.applyCount = val.requestCount // 申请量
-            val.deptName = val.departmentName // 部门
-            val.createTime = val.createTime.split('.')[0]
-            val.createDate = val.createTime // 发布时间
-          })
-          obj.value = res.data.data.list || []
-          object.sjNum = res.data.data.total
-        }
-      })
-    } else {
-      let type = paramsGetResources.type
-   
-      if (type == '基础设施') {
-        jcList.value = []
-        selectInfrastructureList().then((res) => {
-          console.log('基础设施==========>', res.data.data)
-          for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
-                jcList.value.push({
-                  name: key,
-                  num: res.data.data[key],
-                })
-              }
-            } else {
+import {
+  pageWithAttrs,
+  getDataResource,
+  selectInfrastructureList,
+  selectCollectComponentList,
+  selectCollectResourceList
+} from '@/api/home.js'
+import { ref, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
+import { message, Upload } from 'ant-design-vue'
+import mybus from '@/myplugins/mybus'
+const store = useStore()
+const router = useRouter()
+const zjList = ref([])
+const jcList = ref([])
+const sjList = ref([])
+const yyList = ref([])
+// 知识库模块数据
+const zsList = ref([])
+// const jcList = ref([])
+const paramsGetResources = {
+  districtId: '',
+  pageNum: 1,
+  pageSize: 5,
+  type: '',
+  name: '',
+  infoList: [],
+  orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+  orderType: 'DESC', // ASC 升序  DESC 降序
+}
+console.log('dataShowdev==========================>', whoShow)
+// eslint-disable-next-line no-undef
+const whoShow1 = ref(whoShow)
+const interfaceSuccess = ref(0)
+const object = reactive({
+  yyNum: '',
+  zjNum: '',
+  jcNum: '',
+  sjNum: '',
+  zsNum: '',
+})
+const getAppResources = (type, obj) => {
+  paramsGetResources.type = type
+  if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
+    getDataResource({
+      serviceName: paramsGetResources.name || '', //资源名称
+      orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
+      orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+      pageNum: paramsGetResources.pageNum, //页码
+      pageSize: paramsGetResources.pageSize, //分页大小
+    }).then((res) => {
+      console.log('数据资源==================>', res.data.data)
+      if (whoShow1.value.itShowQingDao) {
+        res.data.data.data.forEach((val) => {
+          val.id = val.guid // id
+          val.name = val.zyname // 名字
+          val.sjlCount = val.sjcczl // 数据量
+          val.applyCount = val.syqk // 申请量
+          val.deptName = val.TGBM // 部门
+          val.createDate = val.fbrq // 发布时间
+          val.description = val.xgxt // 描述
+        })
+        obj.value = res.data.data.data || []
+        object.sjNum = res.data.data.rows
+      } else if (whoShow1.value.itShowXiHaiAn) {
+        res.data.data.list.forEach((val) => {
+          val.id = val.serviceId // id
+          val.name = val.serviceName // 名字
+          val.sjlCount = val.requestQuantity // 数据量
+          val.applyCount = val.requestCount // 申请量
+          val.deptName = val.departmentName // 部门
+          val.createTime = val.createTime.split('.')[0]
+          val.createDate = val.createTime // 发布时间
+        })
+        obj.value = res.data.data.list || []
+        object.sjNum = res.data.data.total
+      }
+    })
+  } else {
+    let type = paramsGetResources.type
+
+    if (type == '基础设施') {
+      jcList.value = []
+      selectInfrastructureList().then((res) => {
+        console.log('基础设施------res------>', res);
+        for (const key in res.data.data) {
+          if (whoShow1.value.itShowXiHaiAn) {
+            if (key === '视频资源') {
               jcList.value.push({
                 name: key,
                 num: res.data.data[key],
               })
             }
+          } else {
+            jcList.value.push({
+              name: key,
+              num: res.data.data[key],
+            })
           }
-          // 西海岸-单兵设备、无人机 获取数量
-          if (whoShow1.value.itShowXiHaiAn) {
-            getSoldierData('无人机')
-              .then((res) => {
-                let { total = 0 } = res.data.data
-                jcList.value.push({
-                  name: '无人机',
-                  num: total,
-                })
+        }
+        // 西海岸-单兵设备、无人机 获取数量
+        if (whoShow1.value.itShowXiHaiAn) {
+          getSoldierData('无人机')
+            .then((res) => {
+              let { total = 0 } = res.data.data
+              jcList.value.push({
+                name: '无人机',
+                num: total,
               })
-              .catch((err) => {
-                console.log('err--无人机---------->', err)
+            })
+            .catch((err) => {
+              console.log('err--无人机---------->', err)
+            })
+          getSoldierData('单兵设备')
+            .then((res) => {
+              let { total = 0 } = res.data.data
+              jcList.value.push({
+                name: '单兵设备',
+                num: total,
               })
-            getSoldierData('单兵设备')
-              .then((res) => {
-                let { total = 0 } = res.data.data
-                jcList.value.push({
-                  name: '单兵设备',
-                  num: total,
-                })
-              })
-              .catch((err) => {
-                console.log('err--单兵设备---------->', err)
-              })
-          }
-        })
-      }   
-      else if (type == '组件服务') {
-        zjList.value = []
-        selectCollectComponentList().then((res) => {
-          for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
-                zjList.value.push({
-                  name: key,
-                  num: res.data.data[key],
-                })
-              }
-            } else {
-              zjList.value.push({
-                name: key,
-                num: res.data.data[key],
-              })
-            }
-          }
-        })
-      }     
-      else if (type == '应用资源') {
-        yyList.value = []
-        selectCollectResourceList().then((res) => {
-          for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
-                yyList.value.push({
-                  name: key,
-                  num: res.data.data[key],
-                })
-              }
-            } else {
-              yyList.value.push({
-                name: key,
-                num: res.data.data[key],
-              })
-            }
-          }
-        })
-      } 
-      else {
-        pageWithAttrs(paramsGetResources).then((res) => {
-          console.log('object个数======>', type)
-          obj.value = res.data.data.records
-          switch (type) {
-            case '组件服务':
-              assignmentMethod('zjNum', res)
-              break
-            case '应用资源':
-              assignmentMethod('yyNum', res)
-              break
-            case '基础设施':
-              assignmentMethod('jcNum', res)
-              break
-            case '知识库':
-              assignmentMethod('zsNum', res)
-              break
-          }
-        })
-      }
-    }
-  }
-
-  // todo 获取无人机、单兵设备
-  const getSoldierData = (name) => {
-    let _params = {
-      type: name,
-      page: 1,
-      limit: 10,
-    }
-    return new Promise((resolve, reject) => {
-      getSoldierList(_params)
-        .then((res) => {
-          resolve(res)
-          console.log('res---获取无人机、单兵设备--------->', res)
-          if (res.data.code !== 0) {
-            return message.error(res.data.msg)
-          }
-        })
-        .catch((err) => {
-          reject(err)
-        })
-    })
-  }
-
-  const openHref = (item) => {
-    console.log(item.id, 'wowowo')
-    console.log(item.visits, 'wowowo')
-    browsingInsert({ resourceId: item.id }).then((res) => {
-      // console.log(res)
-    })
-    const arrList = ref([])
-    arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
-    if (arrList.value.indexOf(item.id) === -1) {
-      arrList.value.push(item.id)
-      updateVisits({
-        id: item.id,
-        visits: item.visits || '0',
-      }).then(() => {
-        window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
+            })
+            .catch((err) => {
+              console.log('err--单兵设备---------->', err)
+            })
+        }
+      })
+    }
+    else if (type == '组件服务') {
+      zjList.value = []
+      selectCollectComponentList().then((res) => {
+        console.log('组件服务----res-------->', res);
+        for (const key in res.data.data) {
+          console.log('key------------>', key);
+          zjList.value.push({
+            name: key,
+            num: res.data.data[key],
+          })
+        }
+        console.log('zjList------------>', zjList);
+      })
+    }
+    else if (type == '应用资源') {
+      yyList.value = []
+      selectCollectResourceList().then((res) => {
+        console.log('应用资源---res--------->', res);
+        for (const key in res.data.data) {
+          yyList.value.push({
+            name: key,
+            num: res.data.data[key],
+          })
+        }
+      })
+    }
+    else {
+      pageWithAttrs(paramsGetResources).then((res) => {
+        console.log('object个数======>', type)
+        obj.value = res.data.data.records
+        switch (type) {
+          case '组件服务':
+            assignmentMethod('zjNum', res)
+            break
+          case '应用资源':
+            assignmentMethod('yyNum', res)
+            break
+          case '基础设施':
+            assignmentMethod('jcNum', res)
+            break
+          case '知识库':
+            assignmentMethod('zsNum', res)
+            break
+        }
       })
     }
-    window.open(item.link)
-    // window.open(
-    //   window.SITE_CONFIG.previewUrl +
-    //     'hisense_office/onlinePreview?url=' +
-    //     btoa(encodeURI(item.fileHref))
-    // )
   }
-  const assignmentMethod = (type, res) => {
-    object[type] = res.data.data.total
-    // interfaceSuccess.value++
-    // console.log('object个数======>', object, interfaceSuccess.value, type)
-    // if (interfaceSuccess.value >= 4) {
-    //   mybus.emit('chagneNum', object)
-    // }
-  }
-  getAppResources('组件服务', zjList)
-  getAppResources('应用资源', yyList)
-  getAppResources('基础设施', jcList)
-  getAppResources('数据资源', sjList)
-  getAppResources('知识库', zsList)
+}
 
-  function jumpPage(type) {
-    // 点击内存入store
-    store.commit('home/selectCardsData', {
-      selectCardsnum: type,
-    })
-    console.log(
-      '选中===================>',
-      store.getters['home/selectCardsnum']
-    )
-    // router.push({ path: '/DetailsPageconetent' })
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        select: type,
-      },
-    })
-  }
-  const selectOne = (id) => {
-    console.log('点击===============》', id)
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-      },
-    })
-  }
-  const selectOne1 = (name) => {
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        type: name,
-        select: '组件服务',
-      },
-    })
-  }
-  const selectOne11 = (name) => {
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        type: name,
-        select: '应用资源',
-      },
-    })
-  }
-  const selectOne2 = (name) => {
-    console.log('点击===============》', name)
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        type: name,
-        select: '基础设施',
-      },
-    })
-  }
-  const selectOne3 = (name) => {
-    console.log('点击===============》', name)
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        str: name,
-        select: '数据资源',
-      },
+// todo 获取无人机、单兵设备
+const getSoldierData = (name) => {
+  let _params = {
+    type: name,
+    page: 1,
+    limit: 10,
+  }
+  return new Promise((resolve, reject) => {
+    getSoldierList(_params)
+      .then((res) => {
+        resolve(res)
+        console.log('res---获取无人机、单兵设备--------->', res)
+        if (res.data.code !== 0) {
+          return message.error(res.data.msg)
+        }
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+const openHref = (item) => {
+  console.log(item.id, 'wowowo')
+  console.log(item.visits, 'wowowo')
+  browsingInsert({ resourceId: item.id }).then((res) => {
+    // console.log(res)
+  })
+  const arrList = ref([])
+  arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+  if (arrList.value.indexOf(item.id) === -1) {
+    arrList.value.push(item.id)
+    updateVisits({
+      id: item.id,
+      visits: item.visits || '0',
+    }).then(() => {
+      window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
     })
   }
+  window.open(item.link)
+}
+const assignmentMethod = (type, res) => {
+  object[type] = res.data.data.total
+}
+getAppResources('组件服务', zjList)
+getAppResources('应用资源', yyList)
+getAppResources('基础设施', jcList)
+getAppResources('数据资源', sjList)
+getAppResources('知识库', zsList)
+
+function jumpPage(type) {
+  // 点击内存入store
+  store.commit('home/selectCardsData', {
+    selectCardsnum: type,
+  })
+  console.log(
+    '选中===================>',
+    store.getters['home/selectCardsnum']
+  )
+  // router.push({ path: '/DetailsPageconetent' })
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      select: type,
+    },
+  })
+}
+const selectOne = (id) => {
+  console.log('点击===============》', id)
+  router.push({
+    path: '/details',
+    query: {
+      id: id,
+    },
+  })
+}
+const selectOne1 = (name) => {
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      type: name,
+      select: '组件服务',
+    },
+  })
+}
+const selectOne11 = (name) => {
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      type: name,
+      select: '应用资源',
+    },
+  })
+}
+const selectOne2 = (name) => {
+  console.log('点击===============》', name)
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      type: name,
+      select: '基础设施',
+    },
+  })
+}
+const selectOne3 = (name) => {
+  console.log('点击===============》', name)
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      str: name,
+      select: '数据资源',
+    },
+  })
+}
 </script>
 <style lang="less" scoped>
-  .capability-convergence {
-    height: 7.2rem;
-    background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
-    background-size: 100%;
-    display: flex;
-    justify-content: center;
+.capability-convergence {
+  height: 7.2rem;
+  background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
+  background-size: 100%;
+  display: flex;
+  justify-content: center;
 
-    .main {
-      width: 13rem;
-      margin-top: 1.8rem;
+  .main {
+    width: 13rem;
+    margin-top: 1.8rem;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+
+    .top {
+      font-size: 0.3rem;
+      color: #212121;
+      text-align: center;
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
+      justify-content: center;
+      align-items: center;
 
-      .top {
-        font-size: 0.3rem;
-        color: #212121;
-        text-align: center;
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-        justify-content: center;
-        align-items: center;
+      .line {
+        width: 0.34rem;
+        height: 0.03rem;
+        background-color: #0058e1;
+        margin-top: 0.08rem;
+      }
+    }
 
-        .line {
-          width: 0.34rem;
-          height: 0.03rem;
-          background-color: #0058e1;
-          margin-top: 0.08rem;
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 0.4rem;
+
+      .item {
+        width: 2.44rem;
+        height: 3.91rem;
+        font-size: 0.16rem;
+        background-color: #fff;
+        border-radius: 0.02rem;
+        box-shadow: 0 0.05rem 0.2rem #ccc;
+        position: relative;
+
+        div:nth-of-type(1) {
+          height: 1.02rem;
+          line-height: 1.02rem;
+          font-size: 0.2rem;
+          color: #fff;
+          padding-left: 0.15rem;
+          background-size: 100%;
+        }
+
+        .jc {
+          background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
+        }
+
+        .sj {
+          background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
+        }
+
+        .zj {
+          background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
+        }
+
+        .yy {
+          background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
+        }
+
+        .zs {
+          background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
+        }
+
+        .name {
+          height: 0.47rem;
+          line-height: 0.47rem;
+          margin: 0 0.16rem;
+          border-bottom: 0.01rem solid #e9e9e9;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+
+        .name:hover {
+          color: #0058e1;
+          cursor: pointer;
+        }
+
+        .name-last {
+          border-bottom: none;
+        }
+
+        .btn {
+          cursor: pointer;
+          width: 0.8rem;
+          height: 0.24rem;
+          border: 0.01rem solid #0058e1;
+          font-size: 0.14rem;
+          color: #0058e1;
+          border-radius: 0.02rem;
+          text-align: center;
+          margin-top: 0.1rem;
+          margin-left: 0.85rem;
+          position: absolute;
+          bottom: 0.2rem;
+        }
+
+        .btn:hover {
+          background: rgba(0, 88, 225, 0.3);
+          color: #000;
         }
       }
 
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 0.4rem;
-
-        .item {
-          width: 2.44rem;
-          height: 3.91rem;
-          font-size: 0.16rem;
-          background-color: #fff;
-          border-radius: 0.02rem;
-          box-shadow: 0 0.05rem 0.2rem #ccc;
-          position: relative;
-
-          div:nth-of-type(1) {
-            height: 1.02rem;
-            line-height: 1.02rem;
-            font-size: 0.2rem;
-            color: #fff;
-            padding-left: 0.15rem;
-            background-size: 100%;
-          }
-
-          .jc {
-            background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
-          }
-
-          .sj {
-            background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
-          }
-
-          .zj {
-            background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
-          }
-
-          .yy {
-            background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
-          }
-
-          .zs {
-            background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
-          }
-
-          .name {
-            height: 0.47rem;
-            line-height: 0.47rem;
-            margin: 0 0.16rem;
-            border-bottom: 0.01rem solid #e9e9e9;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-line-clamp: 1;
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
-
-          .name:hover {
-            color: #0058e1;
-            cursor: pointer;
-          }
-
-          .name-last {
-            border-bottom: none;
-          }
-
-          .btn {
-            cursor: pointer;
-            width: 0.8rem;
-            height: 0.24rem;
-            border: 0.01rem solid #0058e1;
-            font-size: 0.14rem;
-            color: #0058e1;
-            border-radius: 0.02rem;
-            text-align: center;
-            margin-top: 0.1rem;
-            margin-left: 0.85rem;
-            position: absolute;
-            bottom: 0.2rem;
-          }
-
-          .btn:hover {
-            background: rgba(0, 88, 225, 0.3);
-            color: #000;
-          }
-        }
-
-        .item:hover {
-          border-radius: 0.02rem;
-          border: 0.01rem solid #0058e1;
-          box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
-        }
+      .item:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
       }
     }
   }
+}
 </style>
diff --git a/front/src/views/newHome/components/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue
index c765c810..08310675 100644
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@@ -7,7 +7,7 @@
         <div class="name">组件服务</div>
         <div class="sl">
           <span class="num">{{ zjNum || 0 }}</span>
-          个
+          项
         </div>
       </div>
     </a-tooltip>
@@ -18,7 +18,7 @@
         <div class="name">应用资源</div>
         <div class="sl">
           <span class="num">{{ yyNum || 0 }}</span>
-          个
+          项
         </div>
       </div>
     </a-tooltip>
@@ -29,7 +29,7 @@
         <div class="name">基础设施</div>
         <div class="sl">
           <span class="num">{{ jcNum || 0 }}</span>
-          个
+          项
         </div>
       </div>
     </a-tooltip>
@@ -51,7 +51,7 @@
         <div class="name">知识库</div>
         <div class="sl">
           <span class="num">{{ zsNum || 0 }}</span>
-          个
+          条
         </div>
       </div>
     </a-tooltip>
diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue
index f9b7ef49..2baeff7a 100644
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@@ -32,9 +32,9 @@
               <div class="img" :class="item.imgType"></div>
             </div>
             <div class="item-right">
-              <div class="fw" v-if="select == '浏览量'">
+              <!-- <div class="fw" v-if="select == '浏览量'">
                 {{ select }}:{{ item.visits }}
-              </div>
+              </div> -->
               <div class="fw" v-if="select == '申请量'">
                 {{ select }}:{{ item.applyCount }}
               </div>
@@ -139,7 +139,7 @@
       path: '/DetailsPageconetent',
       query: {
         // select: '组件服务',
-        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
       },
     })
   }
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 1b91b1d9..fd66c448 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -65,7 +65,7 @@
             <a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="是" cancel-text="否"
               @confirm="endThis(item.instanceId)" @cancel="cancel">
               <a-button type="primary" danger style="margin-left: 10px">
-                流程终止
+                撤回申请
               </a-button>
             </a-popconfirm>
           </div>
@@ -271,10 +271,10 @@ console.log(props.refObj, '=====================================')
 const endThis = (instanceId) => {
   endProcess({ instanceId: instanceId }).then((res) => {
     if (res.data.code == 0) {
-      message.success('流程终止成功！')
+      message.success('撤回申请成功！')
       mybus.emit('closeModal', { type: '能力申请', index: 0 })
     } else {
-      message.warning('流程终止失败！')
+      message.warning('撤回申请失败！')
     }
   })
 }
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 66a7bc81..46e032f6 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -643,7 +643,7 @@ const delList = () => {
 }
 //ceshiFunction
 const ceshiFunction = () => {
-  debugger
+  // debugger
   if (checkedListAbility.value.length == 0) {
     message.warning('请先选择需要操作的数据！')
   }
@@ -660,7 +660,7 @@ const handleDelete = (item, index) => {
     if (checkedListAbility.value.length == 0) {
       return message.warning('请先选择需要操作的数据！')
     } else {
-      delArr = checkedListAbility.value
+      delArr = checkedListAbility.value.map(v=>v.id)
     }
   }
   sgcDel({
diff --git a/front/src/views/personalCenter/components/PutOnTheShelf .vue b/front/src/views/personalCenter/components/PutOnTheShelf .vue
index aba774fb..cc37393a 100644
--- a/front/src/views/personalCenter/components/PutOnTheShelf .vue	
+++ b/front/src/views/personalCenter/components/PutOnTheShelf .vue	
@@ -19,7 +19,7 @@
         @confirm="endThis"
         @cancel="cancel"
       >
-        <a-button type="primary" danger>流程终止</a-button>
+        <a-button type="primary" danger>撤回申请</a-button>
       </a-popconfirm>
       <div v-else></div>
     </div>
@@ -54,10 +54,10 @@
   const endThis = () => {
     endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => {
       if (res.data.code == 0) {
-        message.success('流程终止成功！')
+        message.success('撤回申请成功！')
         mybus.emit('closeModal', { type: '能力上架', index: 2 })
       } else {
-        message.warning('流程终止失败！')
+        message.warning('撤回申请失败！')
       }
     })
   }