From ca603957cb2457fd00eec2a17842570dae8b3825 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 2 Nov 2022 14:03:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=88=B7=E9=9C=80=E6=B1=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js        |  10 +-
 front/src/api/file.js                         |   4 +-
 front/src/api/home.js                         |   2 +-
 front/src/config/default/net.config.js        |   6 +-
 front/src/config/default/setting.config.js    |   6 +-
 front/src/global/GlobalConfig.js              |   6 +-
 .../components/ResourceAggregation.vue        |  11 +-
 front/src/views/home/DetailsPageconetent.vue  |  90 +++--
 front/src/views/home/algorithmCompare.vue     |   6 +-
 front/src/views/home/apply.vue                | 222 +++++------
 .../home/components/DetailsView_backL.vue     |   2 +-
 front/src/views/home/components/header.vue    |  20 +-
 front/src/views/home/constantData/showData.js |  15 +-
 .../views/home/detailsPageconetentTree.vue    |  71 ++--
 .../components/TheOverallProcess.vue          |   2 +-
 .../instructionManual/components/menuBook.vue |   2 +-
 .../components/CapabilityConvergence.vue      | 351 +++++++++++-------
 front/src/views/newHome/components/Header.vue |   4 +-
 .../views/newHome/components/Navigation.vue   |  26 +-
 .../views/newHome/components/Navigation2.vue  |  48 +--
 .../views/newHome/components/WorkDynamics.vue |  46 +--
 .../components/TheNewRelease.vue              |   6 +-
 22 files changed, 515 insertions(+), 441 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index bb935c74..85662af5 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-13 20:53:24
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-01 15:39:13
  * @Description: 数据资源参数配置
  */
 // eslint-disable-next-line no-undef
@@ -32,7 +32,7 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
   infrastructure.deptId = '1067246875800000066'
   navListManagement.navList = [
     { name: '共享门户', key: 'home' },
-    { name: '能力集市', key: 'DetailsPageconetent' },
+    { name: '能力超市', key: 'DetailsPageconetent' },
     // { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
@@ -121,7 +121,7 @@ else if (newLocation === 'baotou') {
   ]
   navListManagement.navList = [
     { name: '共享门户', key: 'home' },
-    { name: '能力集市', key: 'DetailsPageconetent' },
+    { name: '能力超市', key: 'DetailsPageconetent' },
     { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
@@ -492,7 +492,7 @@ else if (newLocation === 'xihaian') {
   ]
   navListManagement.navList = [
     { name: '共享门户', key: 'home' },
-    { name: '能力集市', key: 'DetailsPageconetent' },
+    { name: '能力超市', key: 'DetailsPageconetent' },
     { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
diff --git a/front/src/api/file.js b/front/src/api/file.js
index b4f0d1ce..085a3a7f 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -105,14 +105,14 @@ let _cameraUrl =
     _global.config.camreaInfo &&
     _global.config.camreaInfo.cameraUrl) ||
   '10.134.135.92:9537'
-//能力集市基础设施-左侧列表
+//能力超市基础设施-左侧列表
 export function getCameraInfoByAreaId(params) {
   return axios.get(
     `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
     config2
   )
 }
-//能力集市基础设施-摄像头
+//能力超市基础设施-摄像头
 export function getCameraByCondition(params) {
   return axios.post(
     `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
diff --git a/front/src/api/home.js b/front/src/api/home.js
index 0b8269c3..ae9a6408 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -425,7 +425,7 @@ export function updateIntegrationServices(data) {
   })
 }
 
-// 全局搜索
+// 全文检索
 export function getCountByFuzzyQuery(params, flag) {
   return request({
     url:
diff --git a/front/src/config/default/net.config.js b/front/src/config/default/net.config.js
index 430af251..e7282886 100644
--- a/front/src/config/default/net.config.js
+++ b/front/src/config/default/net.config.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-01 10:47:06
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-02 09:59:26
  * @Description: 告诉大家这是什么
  */
 /**
@@ -14,7 +14,7 @@ const network = {
   //消息框消失时间
   messageDuration: 3000,
   //最长请求时间
-  requestTimeout: 60000,
+  requestTimeout: 300000,
   //操作正常code，支持String、Array、int多种类型
   successCode: [200, 0],
 }
diff --git a/front/src/config/default/setting.config.js b/front/src/config/default/setting.config.js
index 204825b6..fa051c3e 100644
--- a/front/src/config/default/setting.config.js
+++ b/front/src/config/default/setting.config.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-20 16:10:57
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-01 15:37:34
  * @Description: 告诉大家这是什么
  */
 /**
@@ -32,7 +32,7 @@ const setting = {
   //     ? 'http://15.2.21.158:9101'
   //     : 'mock-server',
   //标题 （包括初次加载雪花屏的标题 页面的标题 浏览器的标题）
-  title: '城市云脑能力中心管理平台',
+  title: '政务信息系统生态运营平台',
   //标题分隔符
   titleSeparator: ' - ',
   //标题是否反转 如果为false:"page - title"，如果为ture:"title - page"
diff --git a/front/src/global/GlobalConfig.js b/front/src/global/GlobalConfig.js
index 66bf3de7..29b62918 100644
--- a/front/src/global/GlobalConfig.js
+++ b/front/src/global/GlobalConfig.js
@@ -506,6 +506,8 @@ export const RECOURCE_G_ICON = {
     '/src/assets/resourceManageMap/pic/point-resettlement-circle.png',
 }
 
-// 能力集市-默认选中tab
+// 能力超市-默认选中tab
 // 西海岸-默认基础设施
-export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = whoShow.itShowXiHaiAn ? '基础设施' : '应用资源'
+export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = whoShow.itShowXiHaiAn
+  ? '基础设施'
+  : '应用系统'
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 3d9d4741..012249bb 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -104,11 +104,11 @@
       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-yy.png'),
+      GIS图层: require('../../../assets/abilityStatistics/banner-zj.png'),
+      视频资源: require('../../../assets/abilityStatistics/banner-jc.png'),
       数据资源: require('../../../assets/abilityStatistics/banner-sj.png'),
-      知识库: require('../../../assets/abilityStatistics/banner-zs.png'),
+      云网资源: require('../../../assets/abilityStatistics/banner-zs.png'),
     }
     res.data.data.total.forEach((val) => {
       let _obj = {
@@ -172,7 +172,8 @@
       //     break
       // }
     })
-    let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+    // let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+    let arr = ['应用系统', 'GIS图层', '视频资源', '数据资源', '云网资源']
     dataList.value.dataList.sort((a, b) => {
       return arr.indexOf(a.type) - arr.indexOf(b.type)
     })
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 42474b96..d5e607da 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -2,13 +2,13 @@
   <!-- 青岛 -->
   <div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao">
     <home-header></home-header>
-    <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
+    <div class="details-pageconetent-left" v-if="Cardsname != '视频资源'">
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" v-else>
       <detailsPageInfrastructureTree v-show="flag != '6'" />
     </div>
-    <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
+    <div class="top" v-if="Cardsname != '云网资源' && Cardsname != '视频资源'">
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
@@ -27,10 +27,10 @@
             style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
-            全局搜索
+            全文检索
           </button>
           <button
-            v-if="Cardsname == '应用资源'"
+            v-if="Cardsname == '应用系统'"
             class="button-reset"
             @click="applyAll()"
             style="margin-left: 0.1rem"
@@ -71,9 +71,7 @@
       <div class="top-content-father" :key="listKey">
         <template
           v-if="
-            Cardsname == '组件服务' ||
-            Cardsname == '应用资源' ||
-            Cardsname == ''
+            Cardsname == 'GIS图层' || Cardsname == '应用系统' || Cardsname == ''
           "
         >
           <div class="top-content-son">
@@ -155,7 +153,7 @@
         <a-empty />
       </div>
     </div>
-    <div class="top" v-else-if="Cardsname === '基础设施'">
+    <div class="top" v-else-if="Cardsname === '视频资源'">
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
@@ -174,7 +172,7 @@
             style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
-            全局搜索
+            全文检索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
@@ -234,7 +232,7 @@
             style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
-            全局搜索
+            全文检索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
@@ -298,13 +296,13 @@
     v-else-if="whoShow1 && whoShow1.itShowXiHaiAn"
   >
     <home-header></home-header>
-    <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
+    <div class="details-pageconetent-left" v-if="Cardsname != '视频资源'">
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" v-else>
       <detailsPageInfrastructureTree />
     </div>
-    <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
+    <div class="top" v-if="Cardsname != '云网资源' && Cardsname != '视频资源'">
       <div class="top-title">
         <div
           v-for="item in titleName"
@@ -341,9 +339,7 @@
       <div class="top-content-father" :key="listKey">
         <template
           v-if="
-            Cardsname == '组件服务' ||
-            Cardsname == '应用资源' ||
-            Cardsname == ''
+            Cardsname == 'GIS图层' || Cardsname == '应用系统' || Cardsname == ''
           "
         >
           <div class="top-content-son">
@@ -425,7 +421,7 @@
         <a-empty />
       </div>
     </div>
-    <div class="top" v-else-if="Cardsname === '基础设施'">
+    <div class="top" v-else-if="Cardsname === '视频资源'">
       <div class="top-title">
         <div
           v-for="item in titleName"
@@ -505,7 +501,7 @@
     <div class="details-pageconetent-left">
       <detailsPageconetentTree />
     </div>
-    <div class="top" v-if="Cardsname != '知识库' && Cardsname != '数据资源'">
+    <div class="top" v-if="Cardsname != '云网资源' && Cardsname != '数据资源'">
       <div class="top-title">
         <div
           v-for="item in titleName"
@@ -546,9 +542,7 @@
         <!-- todo -->
         <template
           v-if="
-            Cardsname == '组件服务' ||
-            Cardsname == '应用资源' ||
-            Cardsname == ''
+            Cardsname == 'GIS图层' || Cardsname == '应用系统' || Cardsname == ''
           "
         >
           <div class="top-content-son">
@@ -741,7 +735,7 @@
   import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
   // 数据资源引用
   import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
-  // 基础设施引用
+  // 视频资源引用
   import infrastructurePage from '@/views/home/infrastructurePage.vue'
   import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
@@ -788,7 +782,7 @@
         router.currentRoute.value.query.select ||
         DETAIL_PAGE_CONTENT_DEFAULT_TAB
       console.log('select------------>', select)
-      // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
+      // 例如：GIS图层是大类型，selectSubType是GIS图层的智能算法或图层服务等...
       const selectSubType = router.currentRoute.value.query.type || ''
       const queryName = ref('')
       const str = router.currentRoute.value.query.str
@@ -1083,9 +1077,9 @@
           ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
           ListContent.records = []
           ListContent.records = JSON.parse(JSON.stringify(dataCopy))
-          if (select == '组件服务') {
+          if (select == 'GIS图层') {
             queryName.value = '组件类型'
-          } else if (select == '应用资源') {
+          } else if (select == '应用系统') {
             queryName.value = '应用领域'
           } else {
             queryName.value = ''
@@ -1133,7 +1127,7 @@
       const resourceList = reactive({ data: [] })
       const videoList = reactive({ data: [] })
       const resourceTotal = ref('')
-      // 全局搜索
+      // 全文检索
       const camera = ref(null)
       const globalData = reactive({ data: [] })
       const globalFlag = ref(false)
@@ -1145,21 +1139,21 @@
           let r = null
           if (
             searchValue.value.length >= 2 &&
-            paramsGetResources.type !== '基础设施'
+            paramsGetResources.type !== '视频资源'
           ) {
             str = searchValue.value.substring(0, 2)
             r = re.test(str)
           }
           if (
             (searchValue.value.length > 1 && r) ||
-            paramsGetResources.type === '基础设施'
+            paramsGetResources.type === '视频资源'
           ) {
             flag = false
           } else {
             flag = true
           }
           getCountByFuzzyQuery(searchValue.value || '', flag).then((res) => {
-            console.log('全局搜索==========》', res.data.data)
+            console.log('全文检索==========》', res.data.data)
             globalData.data = res.data.data
             let mapFlag = true
             res.data.data.map((val) => {
@@ -1171,7 +1165,7 @@
             if (!mapFlag) {
               return
             }
-            if (paramsGetResources.type == '基础设施') {
+            if (paramsGetResources.type == '视频资源') {
               console.log('camera1', camera.value)
               camera.value.getCamera(true, searchValue.value)
             } else {
@@ -1183,7 +1177,7 @@
             )
           })
         } else {
-          message.warning('全局搜索必须输入关键词！')
+          message.warning('全文检索必须输入关键词！')
         }
       }
       // 校验
@@ -1202,7 +1196,7 @@
         mybus.emit('changeRoomInput', searchValue.value)
         if (
           whoShow1.value.itShowQingDao &&
-          paramsGetResources.type == '基础设施'
+          paramsGetResources.type == '视频资源'
         ) {
           console.log('camera2', camera)
           camera.value.getCamera(true, searchValue.value)
@@ -1220,7 +1214,7 @@
         }
         select = router.currentRoute.value.query.select
         if (
-          (select == '应用资源' &&
+          (select == '应用系统' &&
             (paramsGetResources.orderField == '' ||
               paramsGetResources.orderField == 'deptSort' ||
               paramsGetResources.orderField == 'pin_top')) ||
@@ -1259,14 +1253,14 @@
           let r = null
           if (
             searchValue.value.length >= 2 &&
-            paramsGetResources.type !== '基础设施'
+            paramsGetResources.type !== '视频资源'
           ) {
             str = searchValue.value.substring(0, 2)
             r = re.test(str)
           }
           if (
             (searchValue.value.length > 1 && r) ||
-            paramsGetResources.type === '基础设施'
+            paramsGetResources.type === '视频资源'
           ) {
             paramsGetResources.nonChinese = false
             paramsGetResources.name = searchValue.value
@@ -1308,7 +1302,7 @@
               })
             } else if (
               paramsGetResources.type !== '数据资源' &&
-              (paramsGetResources.type !== '基础设施' ||
+              (paramsGetResources.type !== '视频资源' ||
                 !whoShow1.value.itShowXiHaiAn)
             ) {
               if (switchIndex != '分页查询') {
@@ -1325,7 +1319,7 @@
                 )
                 resourceList.data = []
                 videoList.data = []
-                if (Cardsname.value === '基础设施') {
+                if (Cardsname.value === '视频资源') {
                   resourceList.data = res.data.data.records || []
                   resourceTotal.value = res.data.data.total || ''
                   loading.value = false
@@ -1335,7 +1329,7 @@
                 }
               })
             } else if (
-              paramsGetResources.type === '基础设施' &&
+              paramsGetResources.type === '视频资源' &&
               whoShow1.value.itShowXiHaiAn
             ) {
               if (switchIndex != '分页查询') {
@@ -1386,7 +1380,7 @@
               })
             } else if (
               paramsGetResources.type !== '数据资源' &&
-              (paramsGetResources.type !== '基础设施' ||
+              (paramsGetResources.type !== '视频资源' ||
                 !whoShow1.value.itShowXiHaiAn)
             ) {
               if (switchIndex != '分页查询') {
@@ -1403,7 +1397,7 @@
                 )
                 resourceList.data = []
                 videoList.data = []
-                if (Cardsname.value === '基础设施') {
+                if (Cardsname.value === '视频资源') {
                   resourceList.data = res.data.data.records || []
                   resourceTotal.value = res.data.data.total || ''
                   loading.value = false
@@ -1413,7 +1407,7 @@
                 }
               })
             } else if (
-              paramsGetResources.type === '基础设施' &&
+              paramsGetResources.type === '视频资源' &&
               whoShow1.value.itShowXiHaiAn
             ) {
               if (switchIndex != '分页查询') {
@@ -1465,7 +1459,7 @@
             })
           } else if (
             paramsGetResources.type !== '数据资源' &&
-            (paramsGetResources.type !== '基础设施' ||
+            (paramsGetResources.type !== '视频资源' ||
               !whoShow1.value.itShowXiHaiAn)
           ) {
             if (switchIndex != '分页查询') {
@@ -1479,7 +1473,7 @@
               )
               resourceList.data = []
               videoList.data = []
-              if (Cardsname.value === '基础设施') {
+              if (Cardsname.value === '视频资源') {
                 resourceList.data = res.data.data.records || []
                 resourceTotal.value = res.data.data.total || ''
                 loading.value = false
@@ -1489,7 +1483,7 @@
               }
             })
           } else if (
-            paramsGetResources.type === '基础设施' ||
+            paramsGetResources.type === '视频资源' ||
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -1645,11 +1639,11 @@
       const judgeHasSubSelectType = () => {
         if (selectSubType) {
           paramsGetResources.infoList = []
-          if (select == '组件服务') {
+          if (select == 'GIS图层') {
             queryName.value = '组件类型'
-          } else if (select == '应用资源') {
+          } else if (select == '应用系统') {
             queryName.value = '应用领域'
-          } else if (select == '基础设施') {
+          } else if (select == '视频资源') {
             searchType.value = selectSubType
           } else {
             queryName.value = selectSubType
@@ -1718,7 +1712,7 @@
         // 西海岸-特殊处理
         if (whoShow1.value.itShowXiHaiAn) {
           if (
-            name !== '基础设施' &&
+            name !== '视频资源' &&
             !xhaHasPermissionUser.list.includes(user.value.username)
           ) {
             return message.warn('暂无权限')
@@ -1768,7 +1762,7 @@
       const abilitySquareFunction = (e) => {
         let snumSquare = ref({})
         if (e === '应用广场') {
-          abilitySquareFunctionData.value = '应用资源'
+          abilitySquareFunctionData.value = '应用系统'
         } else if (e === '算法广场') {
           abilitySquareFunctionData.value = '智能算法'
         } else if (e === 'GIS广场') {
diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue
index 6b155b17..83ebb2c9 100644
--- a/front/src/views/home/algorithmCompare.vue
+++ b/front/src/views/home/algorithmCompare.vue
@@ -10,7 +10,7 @@
       />
       <div class="nav-box">
         <a-breadcrumb>
-          <a-breadcrumb-item>能力集市</a-breadcrumb-item>
+          <a-breadcrumb-item>能力超市</a-breadcrumb-item>
           <a-breadcrumb-item>算法对比</a-breadcrumb-item>
         </a-breadcrumb>
       </div>
@@ -160,7 +160,7 @@
       cancel-text="取消"
       @ok="handleOk"
       @cancel="handleCancel"
-      
+
     >
       <a-table
         :columns="columns"
@@ -662,7 +662,7 @@
 </style>
 
 <style lang="less" scoped>
- 
+
   .bg {
     background: #fff;
     height: 100vh;
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 7f9d5982..308df168 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -469,7 +469,7 @@
         window.history.go(-1)
       }
 
-      // 跳转到能力集市
+      // 跳转到能力超市
       const jumpToDetailsPageconetent = () => {
         setTimeout(() => {
           router.push({
@@ -956,130 +956,130 @@
   }
 </script>
 <style scoped lang="less">
-#apply-container {
-  // background-color: #f5f8fc;
-  height: 100%;
-  width: 100%;
-  margin: 0.8rem auto 0;
-  display: flex;
-  justify-content: space-between;
-
-  aside {
-    width: 282px;
-    height: 96%;
-    overflow-y: auto;
-    background-color: #fff;
-    margin: 1% 0 3%;
-  }
-
-  article {
-    width: 1090px;
-    height: 99%;
-    overflow-y: auto;
-    background-color: #fff;
-    margin: 1% auto;
-  }
-
-  .form-container {
-    padding: 20px 20px 30px 20px;
-
-    .title {
-      font-size: 20px;
-      color: #000;
-      font-weight: bold;
-      margin-bottom: 20px;
-    }
-  }
-
-  .base-info {
+  #apply-container {
+    // background-color: #f5f8fc;
+    height: 100%;
+    width: 100%;
+    margin: 0.8rem auto 0;
     display: flex;
     justify-content: space-between;
-  }
 
-  .flex-row-start {
-    justify-content: flex-start;
-    align-items: center;
-  }
+    aside {
+      width: 282px;
+      height: 96%;
+      overflow-y: auto;
+      background-color: #fff;
+      margin: 1% 0 3%;
+    }
 
-  :deep(.ant-form-item-label) {
-    label {
-      color: #666;
-      font-size: 16px;
+    article {
+      width: 1090px;
+      height: 99%;
+      overflow-y: auto;
+      background-color: #fff;
+      margin: 1% auto;
+    }
 
-      &::after {
-        content: '';
+    .form-container {
+      padding: 20px 20px 30px 20px;
+
+      .title {
+        font-size: 20px;
+        color: #000;
+        font-weight: bold;
+        margin-bottom: 20px;
       }
     }
-  }
 
-  :deep(.ant-form-item-required) {
-    &::before {
-      font-size: 8px;
-      margin-right: 10px;
+    .base-info {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .flex-row-start {
+      justify-content: flex-start;
+      align-items: center;
+    }
+
+    :deep(.ant-form-item-label) {
+      label {
+        color: #666;
+        font-size: 16px;
+
+        &::after {
+          content: '';
+        }
+      }
+    }
+
+    :deep(.ant-form-item-required) {
+      &::before {
+        font-size: 8px;
+        margin-right: 10px;
+      }
+    }
+
+    :deep(.ant-input) {
+      border: 1px solid #e0e0e0;
+      border-radius: 6px;
+    }
+
+    .success {
+      div {
+        width: 100px;
+        margin: 80px auto 40px;
+      }
+
+      text-align: center;
+      font-size: 20px;
+      font-weight: bold;
+      color: #000;
     }
   }
 
-  :deep(.ant-input) {
-    border: 1px solid #e0e0e0;
+  .applicationScene {
+    :deep(.ant-select-selector) {
+      overflow-x: scroll;
+    }
+
+    :deep(.ant-select-selection-overflow) {
+      flex-wrap: nowrap;
+    }
+  }
+
+  textarea {
+    resize: none;
+    font-size: 14px;
+  }
+
+  .bottom-btn {
+    display: flex;
+    justify-content: center;
+    // position: fixed;
+  }
+
+  .cancel-apply {
+    width: 80px;
+    height: 38px;
+    margin-right: 20px;
+    background: #e1edfa;
+    color: #0087ff;
+    font-size: 14px;
     border-radius: 6px;
-  }
-
-  .success {
-    div {
-      width: 100px;
-      margin: 80px auto 40px;
-    }
-
+    border: none;
+    padding: 0;
     text-align: center;
-    font-size: 20px;
-    font-weight: bold;
-    color: #000;
-  }
-}
-
-.applicationScene {
-  :deep(.ant-select-selector) {
-    overflow-x: scroll;
   }
 
-  :deep(.ant-select-selection-overflow) {
-    flex-wrap: nowrap;
+  .confirm-apply {
+    width: 80px;
+    height: 38px;
+    background: #0087ff;
+    color: #fff;
+    font-size: 14px;
+    border-radius: 6px;
+    border: none;
+    padding: 0;
+    text-align: center;
   }
-}
-
-textarea {
-  resize: none;
-  font-size: 14px;
-}
-
-.bottom-btn {
-  display: flex;
-  justify-content: center;
-  // position: fixed;
-}
-
-.cancel-apply {
-  width: 80px;
-  height: 38px;
-  margin-right: 20px;
-  background: #e1edfa;
-  color: #0087ff;
-  font-size: 14px;
-  border-radius: 6px;
-  border: none;
-  padding: 0;
-  text-align: center;
-}
-
-.confirm-apply {
-  width: 80px;
-  height: 38px;
-  background: #0087ff;
-  color: #fff;
-  font-size: 14px;
-  border-radius: 6px;
-  border: none;
-  padding: 0;
-  text-align: center;
-}
 </style>
diff --git a/front/src/views/home/components/DetailsView_backL.vue b/front/src/views/home/components/DetailsView_backL.vue
index f1985325..af0b7beb 100644
--- a/front/src/views/home/components/DetailsView_backL.vue
+++ b/front/src/views/home/components/DetailsView_backL.vue
@@ -2,7 +2,7 @@
   <div class="details-view">
     <div class="main">
       <div class="hander">
-        <span @click="previousPage" style="cursor: pointer">能力集市</span>
+        <span @click="previousPage" style="cursor: pointer">能力超市</span>
         &nbsp;/&nbsp;
         <span style="font-weight: 600; cursor: pointer">查看详情</span>
       </div>
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index bac92f97..9acd5daa 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -10,8 +10,8 @@
       <div class="name-bg" v-if="!itShowXiHaiAn"></div>
       <div class="name-bg-xihaian" v-else></div>
       <div class="name-content">
-        <p>城市云脑通用能力服务平台</p>
-        <p>(United Capacity System)</p>
+        <p>政务信息系统生态运营平台</p>
+        <p>(Government information ecological operation platform)</p>
       </div>
     </div>
     <div
@@ -137,16 +137,16 @@
   const navList = ref(navListManagement.navList)
   const backFlag = ref(false)
   getUserInfo().then((res) => {
-    if(res.data.data.superAdmin =='1'){
+    if (res.data.data.superAdmin == '1') {
       backFlag.value = true
     } else {
-    res.data.data.roleIdList.map((val) => {
-      getRole(val).then((role) => {
-        if (role.data.data.name === '后台管理员') {
-          backFlag.value = true
-        }
+      res.data.data.roleIdList.map((val) => {
+        getRole(val).then((role) => {
+          if (role.data.data.name === '后台管理员') {
+            backFlag.value = true
+          }
+        })
       })
-    })
     }
   })
   console.log('navList------------>', navList)
@@ -209,7 +209,7 @@
           path: '/abilityStatistics',
         })
         break
-      case '能力集市':
+      case '能力超市':
         router.push({
           path: '/DetailsPageconetent',
           query: {
diff --git a/front/src/views/home/constantData/showData.js b/front/src/views/home/constantData/showData.js
index 85602f8a..defad213 100644
--- a/front/src/views/home/constantData/showData.js
+++ b/front/src/views/home/constantData/showData.js
@@ -1,15 +1,22 @@
+/*
+ * @Author: Light
+ * @Date: 2022-09-14 10:48:25
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-01 15:56:52
+ * @Description: 告诉大家这是什么
+ */
 export const titleNameArray = [
   {
     photo: require('@/assets/newHome/banner-yy.png'),
-    name: '应用资源',
+    name: '应用系统',
   },
   {
     photo: require('@/assets/newHome/banner-zj.png'),
-    name: '组件服务',
+    name: 'GIS图层',
   },
   {
     photo: require('@/assets/newHome/banner-jc.png'),
-    name: '基础设施',
+    name: '视频资源',
   },
   {
     photo: require('@/assets/newHome/banner-sj.png'),
@@ -17,7 +24,7 @@ export const titleNameArray = [
   },
   {
     photo: require('@/assets/newHome/banner-zs.png'),
-    name: '知识库',
+    name: '云网资源',
   },
 ]
 
diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue
index d3bd2e2f..59b2e2eb 100644
--- a/front/src/views/home/detailsPageconetentTree.vue
+++ b/front/src/views/home/detailsPageconetentTree.vue
@@ -128,11 +128,11 @@
         title: 'name',
       }
       const store = useStore()
-    // 用户信息
-    const user = ref({
-      deptName: store.getters['user/deptName'],
-      deptId: store.getters['user/deptId'],
-    })
+      // 用户信息
+      const user = ref({
+        deptName: store.getters['user/deptName'],
+        deptId: store.getters['user/deptId'],
+      })
       const showKey = ref(0)
       const treeData = ref([])
       const init = () => {
@@ -145,7 +145,7 @@
         if (select === '123') {
           select = ''
         }
-    
+
         console.log(
           '获取url中的select=====================>',
           router.currentRoute.value.query.select
@@ -169,6 +169,7 @@
                 }
                 switch (val.type) {
                   case '市级':
+                  case '省级':
                   case '企业':
                   case '其他':
                     generateChildren(val, obj)
@@ -186,33 +187,33 @@
               return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
             })
             //根据不同的权限展示不同的能力超市左侧树
-          //  let deptId=user.value.deptId
-        //     treeData.value.forEach((child) => {
-        //       let childern=child.children
-        //       childern.forEach((childs) => {//第一层：市级
-        //    if(childs.key==deptId ){
-        //      childs.show=true
-        //      child.show=true
-        //      mybus.emit('paramsGetResources', [childs.key])
-        //       selectId.value =childs.key
-        //    }
-        //    if(childs.children && childs.children.length>0){//第二层 区级
-        //     let qu=childs.children
-        //     qu.forEach((qu) => {
-        //    if(qu.key==deptId ){
-        //      qu.show=true
-        //      childs.show=true
-        //      child.show=true
-        //       mybus.emit('paramsGetResources', [qu.key])
-        //       selectId.value = qu.key
-        //    }
-        //    })
-        //    }
-        //  })
-          
-        //   })
+            //  let deptId=user.value.deptId
+            //     treeData.value.forEach((child) => {
+            //       let childern=child.children
+            //       childern.forEach((childs) => {//第一层：市级
+            //    if(childs.key==deptId ){
+            //      childs.show=true
+            //      child.show=true
+            //      mybus.emit('paramsGetResources', [childs.key])
+            //       selectId.value =childs.key
+            //    }
+            //    if(childs.children && childs.children.length>0){//第二层 区级
+            //     let qu=childs.children
+            //     qu.forEach((qu) => {
+            //    if(qu.key==deptId ){
+            //      qu.show=true
+            //      childs.show=true
+            //      child.show=true
+            //       mybus.emit('paramsGetResources', [qu.key])
+            //       selectId.value = qu.key
+            //    }
+            //    })
+            //    }
+            //  })
+
+            //   })
             console.log('左侧树结构数据======================>', treeData.value)
-        
+
             showKey.value++
           })
         }
@@ -222,7 +223,6 @@
       })
       // 生成children
       const generateChildren = (val, obj) => {
-      
         if (val.dataList.length > 0) {
           val.dataList.forEach((child) => {
             let children = {
@@ -232,14 +232,13 @@
               total: child.deptCount,
               key: child.deptId,
             }
-  
+
             obj.children.push(children)
           })
         }
       }
       // 区级特殊处理
       const generateChildren2 = (val, obj) => {
-       
         if (val.dataList.length > 0) {
           val.dataList.forEach((dis) => {
             let children = {
@@ -259,7 +258,7 @@
                   select: false,
                   key: child.deptId,
                 }
-              
+
                 children.children.push(children2)
               })
             }
diff --git a/front/src/views/instructionManual/components/TheOverallProcess.vue b/front/src/views/instructionManual/components/TheOverallProcess.vue
index a09fb3e8..7ccb7c2b 100644
--- a/front/src/views/instructionManual/components/TheOverallProcess.vue
+++ b/front/src/views/instructionManual/components/TheOverallProcess.vue
@@ -5,7 +5,7 @@
       <div class="TheOverallProcess-title-line"></div>
     </div>
     <div class="TheOverallProcess-content">
-      <span class="neng-li-ji-shi">能力集市</span>
+      <span class="neng-li-ji-shi">能力超市</span>
       <span class="neng-li-cha-yue">能力查阅</span>
       <span class="shen-he-fa-bu-xia-jia">审核发布/下架</span>
       <span class="shen-qing">申请</span>
diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue
index d27eb5fe..0a70ab56 100644
--- a/front/src/views/instructionManual/components/menuBook.vue
+++ b/front/src/views/instructionManual/components/menuBook.vue
@@ -257,7 +257,7 @@
         path: '/DetailsPageconetent',
         query: {
           // select: '组件服务',
-          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
         },
       })
       window.location.href = newpage.href
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 5cfa10e3..11b4f681 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -7,20 +7,7 @@
       </div>
       <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)"
-          >
-            {{ item.name + '-' + item.num + '项' }}
-          </div>
-          <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
-        </div>
-        <div class="item">
-          <div class="yy">应用资源</div>
+          <div class="yy">应用系统</div>
           <div
             class="name"
             v-for="(item, index) in yyList.slice(0, 5)"
@@ -28,12 +15,27 @@
             :class="index == 4 ? 'name-last' : ''"
             @click="selectOne11(item.name)"
           >
-            {{ item.name + '-' + item.num + '项' }}
+            <!-- {{ item.name + '-' + item.num + '项' }} -->
+            {{ index + 1 }}-{{ item.name }}
           </div>
-          <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
+          <div class="btn" @click="jumpPage('应用系统')">查看更多</div>
         </div>
         <div class="item">
-          <div class="jc">基础设施</div>
+          <div class="zj">GIS图层</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)"
+          >
+            <!-- {{ item.name + '-' + item.num + '项' }} -->
+            {{ index + 1 }}-{{ item.name }}
+          </div>
+          <div class="btn" @click="jumpPage('GIS图层')">查看更多</div>
+        </div>
+        <div class="item">
+          <div class="jc">视频资源</div>
           <div
             class="name"
             v-for="(item, index) in jcList.slice(0, 5)"
@@ -41,7 +43,7 @@
             :class="index == 2 ? 'name-last' : ''"
             @click="selectOne2(item.name)"
           >
-            {{
+            <!-- {{
               item.name +
               '-' +
               item.num +
@@ -50,9 +52,10 @@
                 : item.name == '视频会议'
                 ? '个'
                 : '项')
-            }}
+            }} -->
+            {{ index + 1 }}-{{ item.name }}
           </div>
-          <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
+          <div class="btn" @click="jumpPage('视频资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
@@ -63,12 +66,13 @@
             :class="index == 4 ? 'name-last' : ''"
             @click="selectOne3(item.name)"
           >
+            <!-- {{ index + 1 }}-{{ item.name }} -->
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
-          <div class="zs">知识库</div>
+          <div class="zs">云网资源</div>
           <div
             class="name"
             v-for="(item, index) in zsList"
@@ -78,7 +82,7 @@
           >
             {{ index + 1 }}-{{ item.name }}
           </div>
-          <div class="btn" @click="jumpPage('知识库')">查看更多</div>
+          <div class="btn" @click="jumpPage('云网资源')">查看更多</div>
         </div>
       </div>
     </div>
@@ -104,7 +108,7 @@
   const jcList = ref([])
   const sjList = ref([])
   const yyList = ref([])
-  // 知识库模块数据
+  // 云网资源模块数据
   const zsList = ref([])
   // const jcList = ref([])
   const paramsGetResources = {
@@ -131,131 +135,196 @@
   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
-        }
-      })
+      sjList.value = [
+        {
+          name: '阿斯蒂芬',
+        },
+        {
+          name: '阿斯蒂芬',
+        },
+        {
+          name: '阿斯蒂芬',
+        },
+        {
+          name: '阿斯蒂芬',
+        },
+        {
+          name: '阿斯蒂芬',
+        },
+      ]
+      // 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],
-              })
-            }
-          }
-          //  jcList.value.push({
-          //       name: '会客厅',
-          //       num: 4,
-          //     })
-          // 西海岸-单兵设备、无人机 获取数量
-          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)
-              })
-            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) => {
-          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],
-            })
-          }
-        })
+      if (type == '视频资源') {
+        jcList.value = [
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+        ]
+        // 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],
+        //       })
+        //     }
+        //   }
+        //   //  jcList.value.push({
+        //   //       name: '会客厅',
+        //   //       num: 4,
+        //   //     })
+        //   // 西海岸-单兵设备、无人机 获取数量
+        //   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)
+        //       })
+        //     getSoldierData('单兵设备')
+        //       .then((res) => {
+        //         let { total = 0 } = res.data.data
+        //         jcList.value.push({
+        //           name: '单兵设备',
+        //           num: total,
+        //         })
+        //       })
+        //       .catch((err) => {
+        //         console.log('err--单兵设备---------->', err)
+        // })
+        // }
+        // })
+      } else if (type == 'GIS图层') {
+        zjList.value = [
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+        ]
+        // selectCollectComponentList().then((res) => {
+        //   console.log('GIS图层----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 = [
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+          {
+            name: '阿斯蒂芬',
+          },
+        ]
+        // 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 '组件服务':
+            case 'GIS图层':
               assignmentMethod('zjNum', res)
               break
-            case '应用资源':
+            case '应用系统':
               assignmentMethod('yyNum', res)
               break
-            case '基础设施':
+            case '视频资源':
               assignmentMethod('jcNum', res)
               break
-            case '知识库':
+            case '云网资源':
               assignmentMethod('zsNum', res)
               break
           }
@@ -308,11 +377,11 @@
   const assignmentMethod = (type, res) => {
     object[type] = res.data.data.total
   }
-  getAppResources('组件服务', zjList)
-  getAppResources('应用资源', yyList)
-  getAppResources('基础设施', jcList)
+  getAppResources('GIS图层', zjList)
+  getAppResources('应用系统', yyList)
+  getAppResources('视频资源', jcList)
   getAppResources('数据资源', sjList)
-  getAppResources('知识库', zsList)
+  getAppResources('云网资源', zsList)
 
   function jumpPage(type) {
     // 点击内存入store
@@ -345,7 +414,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: name,
-        select: '组件服务',
+        select: 'GIS图层',
       },
     })
   }
@@ -354,7 +423,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: name,
-        select: '应用资源',
+        select: '应用系统',
       },
     })
   }
@@ -371,7 +440,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: names,
-        select: '基础设施',
+        select: '视频资源',
       },
     })
   }
diff --git a/front/src/views/newHome/components/Header.vue b/front/src/views/newHome/components/Header.vue
index 2bad4823..576186a8 100644
--- a/front/src/views/newHome/components/Header.vue
+++ b/front/src/views/newHome/components/Header.vue
@@ -36,7 +36,7 @@
   const route = useRoute()
   const navList = ref([
     { name: '共享门户', key: 'home' },
-    { name: '能力集市', key: 'DetailsPageconetent' },
+    { name: '能力超市', key: 'DetailsPageconetent' },
     { name: '能力统计', key: 'abilityStatistics' },
     { name: '技术文档', key: 'developmentGuide' },
     { name: '需求中心', key: 'demandCenter' },
@@ -77,7 +77,7 @@
           path: '/abilityStatistics',
         })
         break
-      case '能力集市':
+      case '能力超市':
         router.push({
           path: '/DetailsPageconetent',
           query: {
diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue
index 2c24745d..d98492ba 100644
--- a/front/src/views/newHome/components/Navigation.vue
+++ b/front/src/views/newHome/components/Navigation.vue
@@ -161,13 +161,13 @@
   const store = useStore()
   const router = useRouter()
   const topList = ref([
-    '组件服务',
-    '应用资源',
-    '基础设施',
+    '应用系统',
+    'GIS图层',
+    '视频资源',
     '数据资源',
-    '知识库',
+    '云网资源',
   ])
-  const select = ref(whoShow.itShowQingDao ? '' : '组件服务')
+  const select = ref(whoShow.itShowQingDao ? '' : '应用系统')
   let applicationDataList = ref([])
   let technosphereDataList = ref([])
   const fabubumen = ref([
@@ -283,14 +283,14 @@
   }
   const mohuchaxun = ref('组件服务')
   function onSearch() {
-  // if (text.value) {
-      snum.value.str = text.value
-      console.log('===================>', text.value)
-      store.commit('home/selectCardsData', snum.value)
-      router.push({
-        path: '/DetailsPageconetent',
-        query: snum.value,
-      })
+    // if (text.value) {
+    snum.value.str = text.value
+    console.log('===================>', text.value)
+    store.commit('home/selectCardsData', snum.value)
+    router.push({
+      path: '/DetailsPageconetent',
+      query: snum.value,
+    })
     // } else {
     //   message.warning('请输入查询内容！')
     // }
diff --git a/front/src/views/newHome/components/Navigation2.vue b/front/src/views/newHome/components/Navigation2.vue
index 08310675..d64223ab 100644
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@@ -1,21 +1,10 @@
 <template>
   <div class="navigation2">
     <a-tooltip>
-      <template #title>点击进入组件服务</template>
-      <div class="item" @click="jumpPage('组件服务')">
-        <div class="img zj"></div>
-        <div class="name">组件服务</div>
-        <div class="sl">
-          <span class="num">{{ zjNum || 0 }}</span>
-          项
-        </div>
-      </div>
-    </a-tooltip>
-    <a-tooltip>
-      <template #title>点击进入应用资源</template>
-      <div class="item" @click="jumpPage('应用资源')">
+      <template #title>点击进入应用系统</template>
+      <div class="item" @click="jumpPage('应用系统')">
         <div class="img yy"></div>
-        <div class="name">应用资源</div>
+        <div class="name">应用系统</div>
         <div class="sl">
           <span class="num">{{ yyNum || 0 }}</span>
           项
@@ -23,10 +12,21 @@
       </div>
     </a-tooltip>
     <a-tooltip>
-      <template #title>点击进入基础设施</template>
-      <div class="item" @click="jumpPage('基础设施')">
+      <template #title>点击进入GIS图层</template>
+      <div class="item" @click="jumpPage('GIS图层')">
+        <div class="img zj"></div>
+        <div class="name">GIS图层</div>
+        <div class="sl">
+          <span class="num">{{ zjNum || 0 }}</span>
+          项
+        </div>
+      </div>
+    </a-tooltip>
+    <a-tooltip>
+      <template #title>点击进入视频资源</template>
+      <div class="item" @click="jumpPage('视频资源')">
         <div class="img jc"></div>
-        <div class="name">基础设施</div>
+        <div class="name">视频资源</div>
         <div class="sl">
           <span class="num">{{ jcNum || 0 }}</span>
           项
@@ -45,10 +45,10 @@
       </div>
     </a-tooltip>
     <a-tooltip>
-      <template #title>点击进入知识库</template>
-      <div class="item" @click="jumpPage('知识库')">
+      <template #title>点击进入云网资源</template>
+      <div class="item" @click="jumpPage('云网资源')">
         <div class="img zs"></div>
-        <div class="name">知识库</div>
+        <div class="name">云网资源</div>
         <div class="sl">
           <span class="num">{{ zsNum || 0 }}</span>
           条
@@ -82,13 +82,13 @@
     console.log('selectTotal===============>', res.data.data)
     res.data.data.total.forEach((val) => {
       switch (val.type) {
-        case '组件服务':
+        case 'GIS图层':
           zjNum.value = val.count
           break
-        case '应用资源':
+        case '应用系统':
           yyNum.value = val.count
           break
-        case '基础设施':
+        case '视频资源':
           jcNum.value = val.count
           if (uavAndIndividualSoldier.num) {
             jcNum.value = jcNum.value - 0 + uavAndIndividualSoldier.num
@@ -97,7 +97,7 @@
         case '数据资源':
           sjNum.value = val.count
           break
-        case '知识库':
+        case '云网资源':
           zsNum.value = val.count
           break
       }
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index bea6bc44..22ec8a0b 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -92,17 +92,12 @@
               </div>
             </div>
           </div>
-          <div
+          <!-- <div
             class="component-type"
-            v-if="abilityToTypeFunctionData == '组件服务'"
+            v-if="abilityToTypeFunctionData == 'GIS图层'"
           >
             <div class="title">组件类型选择</div>
             <div class="component-type-content">
-              <!-- <a-checkbox-group
-                v-model:value="value1"
-                name="checkboxgroup"
-                :options="componentType"
-              /> -->
               <a-radio-group v-model:value="componentTypeValue">
                 <a-radio
                   @click="componentTypeValueFunction(item)"
@@ -114,7 +109,7 @@
                 </a-radio>
               </a-radio-group>
             </div>
-          </div>
+          </div> -->
         </a-modal>
       </div>
       <!-- <div @click="showAbilitySquare">
@@ -169,23 +164,29 @@
   // ])
   //能力上架弹窗
   function handlecancel() {
-    abilityToTypeFunctionData.value = '组件服务'
+    abilityToTypeFunctionData.value = 'GIS图层'
     componentTypeValue.value = ''
   }
-  let abilityToTypeFunctionData = ref('组件服务')
+  let abilityToTypeFunctionData = ref('GIS图层')
   function abilityToTypeFunction(item) {
     abilityToTypeFunctionData.value = item
   }
-  let abilityToType = ref(['组件服务', '应用资源'])
-  let abilitySquare = ref(['智能算法', '图层服务', '应用资源'])
-  let componentType = ref([
-    '智能算法',
-    '图层服务',
-    '开发组件',
-    // '办公组件',
-    '业务组件',
-    // '其他',
+  let abilityToType = ref([
+    '应用系统',
+    'GIS图层',
+    '视频资源',
+    '数据资源',
+    '云网资源',
   ])
+  let abilitySquare = ref(['智能算法', '图层服务', '应用系统'])
+  // let componentType = ref([
+  //   '智能算法',
+  //   '图层服务',
+  //   '开发组件',
+  //   // '办公组件',
+  //   '业务组件',
+  //   // '其他',
+  // ])
   const visible = ref(false)
   const showModal = () => {
     visible.value = true
@@ -207,7 +208,7 @@
   let componentTypeValue = ref('')
   const handleOk = (e) => {
     let snum = ref({})
-    if (abilityToTypeFunctionData.value == '组件服务') {
+    if (abilityToTypeFunctionData.value == 'GIS图层') {
       if (!componentTypeValue.value || componentTypeValue.value == '') {
         message.error('请选择组件类型！')
         return
@@ -236,7 +237,7 @@
     })
     window.open(applypage.href, '_blank')
     visible.value = false
-    abilityToTypeFunctionData.value = '组件服务'
+    abilityToTypeFunctionData.value = 'GIS图层'
     componentTypeValue.value = ''
     console.log(e)
   }
@@ -270,7 +271,7 @@
   function jumpPage() {
     // 点击内存入store
     // store.commit('WorkDynList', {
-    //   selectCardsnum: '组件服务',
+    //   selectCardsnum: 'GIS图层',
     // })
     console.log(
       '选中===================>',
@@ -379,6 +380,7 @@
           border: unset;
           background: unset;
           div {
+            margin-bottom: 10px;
             margin-right: 0.15rem;
             cursor: pointer;
             font-size: 0.14rem;
diff --git a/front/src/views/personalCenter/components/TheNewRelease.vue b/front/src/views/personalCenter/components/TheNewRelease.vue
index ee298aa3..e85c66c5 100644
--- a/front/src/views/personalCenter/components/TheNewRelease.vue
+++ b/front/src/views/personalCenter/components/TheNewRelease.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-01 17:49:38
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-22 17:01:25
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-02 13:59:46
  * @Description: 能力上架
 -->
 <template>
@@ -31,7 +31,7 @@
   const router = useRouter()
   const type = ref('')
   const abilityToType = router.currentRoute.value.query.abilityToType
-  if (abilityToType === '应用资源') {
+  if (abilityToType === '应用系统') {
     type.value = 'application'
   } else {
     const componentTypeValue =