From 96b3f3197e4568192164386ac411188cb8d80b19 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 2 Nov 2022 18:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/basicConfig.js     | 10 +--
 front/public/static/config/location.js        |  6 +-
 front/src/api/file.js                         |  4 +-
 front/src/global/GlobalConfig.js              |  6 +-
 .../components/ResourceAggregation.vue        | 30 +++----
 front/src/views/home/DetailsPageconetent.vue  | 78 +++++++++----------
 front/src/views/home/algorithmCompare.vue     |  6 +-
 front/src/views/home/apply.vue                |  2 +-
 .../home/components/DetailsView_backL.vue     |  2 +-
 front/src/views/home/components/header.vue    | 20 ++---
 front/src/views/home/constantData/showData.js | 15 +++-
 .../components/TheOverallProcess.vue          |  2 +-
 .../components/CapabilityConvergence.vue      | 74 +++++++++---------
 front/src/views/newHome/components/Header.vue |  4 +-
 .../views/newHome/components/Navigation.vue   | 12 +--
 .../views/newHome/components/Navigation2.vue  | 48 ++++++------
 .../components/RecommendationAbility.vue      | 10 +--
 .../views/newHome/components/WorkDynamics.vue | 29 +++----
 .../components/TheNewRelease.vue              |  6 +-
 19 files changed, 184 insertions(+), 180 deletions(-)

diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 85697a8b..55240d20 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.wuhongjian
- * @LastEditTime: 2022-10-27 16:04:46
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-02 17:15:39
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
   // version: 'xihaian', // 西海岸
-  version: 'qingdao', // 开发
+  version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
@@ -86,8 +86,8 @@ var CONFIGITEM = {
         userPwd: '',
       },
       backUrl: 'http://localhost:8001',
-      previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/ucs-admin',
+      previewUrl: 'http://192.168.124.233:9796/',
+      websocketURL: '192.168.124.233:8888/ucs-admin',
       // websocketURL: '10.18.1.99:8889/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index bb935c74..975e12f0 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -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 4640320c..825757ef 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/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..e74d7dbd 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'),
+      GIS图层: 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'),
+      云网资源: require('../../../assets/abilityStatistics/banner-zs.png'),
     }
     res.data.data.total.forEach((val) => {
       let _obj = {
@@ -117,39 +117,39 @@
         photo: val.type && imgObj[val.type],
         amount: val.count,
       }
-      if (val.type == '基础设施') {
+      if (val.type == '视频资源') {
         if (uavAndIndividualSoldier.num) {
           _obj.amount = val.count - 0 + uavAndIndividualSoldier.num
         }
       }
-      if (val.type == '知识库') {
+      if (val.type == '云网资源') {
         _obj.organization = '条'
       }
       dataList.value.dataList.push(_obj)
       // switch (val.type) {
-      //   case '组件服务':
+      //   case 'GIS图层':
       //     dataList.value.dataList.push({
       //       organization: '项',
-      //       type: '组件服务',
+      //       type: 'GIS图层',
       //       photo: require('../../../assets/abilityStatistics/banner-zj.png'),
       //       amount: val.count,
       //     })
       //     break
-      //   case '应用资源':
+      //   case '应用系统':
       //     dataList.value.dataList.push({
       //       organization: '项',
-      //       type: '应用资源',
+      //       type: '应用系统',
       //       photo: require('../../../assets/abilityStatistics/banner-yy.png'),
       //       amount: val.count,
       //     })
       //     break
-      //   case '基础设施':
+      //   case '视频资源':
       //     if (uavAndIndividualSoldier.num) {
       //       val.count = val.count - 0 + uavAndIndividualSoldier.num
       //     }
       //     dataList.value.dataList.push({
       //       organization: '项',
-      //       type: '基础设施',
+      //       type: '视频资源',
       //       photo: require('../../../assets/abilityStatistics/banner-jc.png'),
       //       amount: val.count,
       //     })
@@ -162,17 +162,17 @@
       //       amount: val.count,
       //     })
       //     break
-      //   case '知识库':
+      //   case '云网资源':
       //     dataList.value.dataList.push({
       //       organization: '项',
-      //       type: '知识库',
+      //       type: '云网资源',
       //       photo: require('../../../assets/abilityStatistics/banner-zs.png'),
       //       amount: val.count,
       //     })
       //     break
       // }
     })
-    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 57a235de..13ddbfc0 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">
           模糊搜索
@@ -30,7 +30,7 @@
             全局搜索
           </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">
           模糊搜索
@@ -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 = ''
@@ -1145,14 +1139,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 === '视频资源'
           ) {
             flag = false
           } else {
@@ -1175,7 +1169,7 @@
             if (!mapFlag) {
               return
             }
-            if (paramsGetResources.type == '基础设施') {
+            if (paramsGetResources.type == '视频资源') {
               console.log('camera1', camera.value)
               camera.value.getCamera(true, searchValue.value)
             } else {
@@ -1206,7 +1200,7 @@
         mybus.emit('changeRoomInput', searchValue.value)
         if (
           whoShow1.value.itShowQingDao &&
-          paramsGetResources.type == '基础设施'
+          paramsGetResources.type == '视频资源'
         ) {
           console.log('camera2', camera)
           camera.value.getCamera(true, searchValue.value)
@@ -1224,7 +1218,7 @@
         }
         select = router.currentRoute.value.query.select
         if (
-          (select == '应用资源' &&
+          (select == '应用系统' &&
             (paramsGetResources.orderField == '' ||
               paramsGetResources.orderField == 'deptSort' ||
               paramsGetResources.orderField == 'pin_top')) ||
@@ -1263,14 +1257,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
@@ -1312,7 +1306,7 @@
               })
             } else if (
               paramsGetResources.type !== '数据资源' &&
-              (paramsGetResources.type !== '基础设施' ||
+              (paramsGetResources.type !== '视频资源' ||
                 !whoShow1.value.itShowXiHaiAn)
             ) {
               if (switchIndex != '分页查询') {
@@ -1329,7 +1323,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
@@ -1339,7 +1333,7 @@
                 }
               })
             } else if (
-              paramsGetResources.type === '基础设施' &&
+              paramsGetResources.type === '视频资源' &&
               whoShow1.value.itShowXiHaiAn
             ) {
               if (switchIndex != '分页查询') {
@@ -1390,7 +1384,7 @@
               })
             } else if (
               paramsGetResources.type !== '数据资源' &&
-              (paramsGetResources.type !== '基础设施' ||
+              (paramsGetResources.type !== '视频资源' ||
                 !whoShow1.value.itShowXiHaiAn)
             ) {
               if (switchIndex != '分页查询') {
@@ -1407,7 +1401,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
@@ -1417,7 +1411,7 @@
                 }
               })
             } else if (
-              paramsGetResources.type === '基础设施' &&
+              paramsGetResources.type === '视频资源' &&
               whoShow1.value.itShowXiHaiAn
             ) {
               if (switchIndex != '分页查询') {
@@ -1469,7 +1463,7 @@
             })
           } else if (
             paramsGetResources.type !== '数据资源' &&
-            (paramsGetResources.type !== '基础设施' ||
+            (paramsGetResources.type !== '视频资源' ||
               !whoShow1.value.itShowXiHaiAn)
           ) {
             if (switchIndex != '分页查询') {
@@ -1483,7 +1477,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
@@ -1493,7 +1487,7 @@
               }
             })
           } else if (
-            paramsGetResources.type === '基础设施' ||
+            paramsGetResources.type === '视频资源' ||
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -1649,11 +1643,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
@@ -1722,7 +1716,7 @@
         // 西海岸-特殊处理
         if (whoShow1.value.itShowXiHaiAn) {
           if (
-            name !== '基础设施' &&
+            name !== '视频资源' &&
             !xhaHasPermissionUser.list.includes(user.value.username)
           ) {
             return message.warn('暂无权限')
@@ -1772,7 +1766,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..b11a2198 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({
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..9101f830 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-11-02 14:34:07
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-02 18:00:03
+ * @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/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/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 5cfa10e3..20c5c055 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)"
@@ -30,10 +17,23 @@
           >
             {{ item.name + '-' + item.num + '项' }}
           </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 + '项' }}
+          </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)"
@@ -52,7 +52,7 @@
                 : '项')
             }}
           </div>
-          <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
+          <div class="btn" @click="jumpPage('视频资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
@@ -68,7 +68,7 @@
           <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 +78,7 @@
           >
             {{ index + 1 }}-{{ item.name }}
           </div>
-          <div class="btn" @click="jumpPage('知识库')">查看更多</div>
+          <div class="btn" @click="jumpPage('云网资源')">查看更多</div>
         </div>
       </div>
     </div>
@@ -104,7 +104,7 @@
   const jcList = ref([])
   const sjList = ref([])
   const yyList = ref([])
-  // 知识库模块数据
+  // 云网资源模块数据
   const zsList = ref([])
   // const jcList = ref([])
   const paramsGetResources = {
@@ -168,10 +168,10 @@
     } else {
       let type = paramsGetResources.type
 
-      if (type == '基础设施') {
+      if (type == '视频资源') {
         jcList.value = []
         selectInfrastructureList().then((res) => {
-          console.log('基础设施------res------>', res)
+          console.log('视频资源------res------>', res)
           for (const key in res.data.data) {
             if (whoShow1.value.itShowXiHaiAn) {
               if (key === '视频资源') {
@@ -217,10 +217,10 @@
               })
           }
         })
-      } else if (type == '组件服务') {
+      } else if (type == 'GIS图层') {
         zjList.value = []
         selectCollectComponentList().then((res) => {
-          console.log('组件服务----res-------->', res)
+          console.log('GIS图层----res-------->', res)
           for (const key in res.data.data) {
             console.log('key------------>', key)
             zjList.value.push({
@@ -230,10 +230,10 @@
           }
           console.log('zjList------------>', zjList)
         })
-      } else if (type == '应用资源') {
+      } else if (type == '应用系统') {
         yyList.value = []
         selectCollectResourceList().then((res) => {
-          console.log('应用资源---res--------->', res)
+          console.log('应用系统---res--------->', res)
           for (const key in res.data.data) {
             yyList.value.push({
               name: key,
@@ -246,16 +246,16 @@
           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 +308,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 +345,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: name,
-        select: '组件服务',
+        select: 'GIS图层',
       },
     })
   }
@@ -354,7 +354,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: name,
-        select: '应用资源',
+        select: '应用系统',
       },
     })
   }
@@ -371,7 +371,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 a7dacf61..24a518aa 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([
@@ -281,7 +281,7 @@
     technosphereDataList.value = []
     qeihuan.value = !qeihuan.value
   }
-  const mohuchaxun = ref('组件服务')
+  const mohuchaxun = ref('GIS图层')
   function onSearch() {
     // if (text.value) {
     snum.value.str = text.value
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/RecommendationAbility.vue b/front/src/views/newHome/components/RecommendationAbility.vue
index 3b87a72d..0b202a90 100644
--- a/front/src/views/newHome/components/RecommendationAbility.vue
+++ b/front/src/views/newHome/components/RecommendationAbility.vue
@@ -57,17 +57,17 @@
       dataList.value.map((item, index) => {
         // debugger
         switch (item.type) {
-          case '组件服务':
+          case 'GIS图层':
             dataList.value[
               index
             ].tupian = require('../../../assets/newHome/zujianfuwu.png')
             break
-          case '应用资源':
+          case '应用系统':
             dataList.value[
               index
             ].tupian = require('../../../assets/newHome/yingyongziyuan.png')
             break
-          case '基础设施':
+          case '视频资源':
             dataList.value[
               index
             ].tupian = require('../../../assets/newHome/jichusheshi.png')
@@ -85,7 +85,7 @@
   function jumpPage() {
     // 点击内存入store
     store.commit('home/selectCardsData', {
-      selectCardsnum: '组件服务',
+      selectCardsnum: 'GIS图层',
     })
     console.log(
       '选中===================>',
@@ -95,7 +95,7 @@
     router.push({
       path: '/DetailsPageconetent',
       query: {
-        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
       },
     })
   }
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index bea6bc44..fa935745 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,14 +164,20 @@
   // ])
   //能力上架弹窗
   function handlecancel() {
-    abilityToTypeFunctionData.value = '组件服务'
+    abilityToTypeFunctionData.value = '应用系统'
     componentTypeValue.value = ''
   }
-  let abilityToTypeFunctionData = ref('组件服务')
+  let abilityToTypeFunctionData = ref('应用系统')
   function abilityToTypeFunction(item) {
     abilityToTypeFunctionData.value = item
   }
-  let abilityToType = ref(['组件服务', '应用资源'])
+  let abilityToType = ref([
+    '应用系统',
+    'GIS图层',
+    '视频资源',
+    '数据资源',
+    '云网资源',
+  ])
   let abilitySquare = ref(['智能算法', '图层服务', '应用资源'])
   let componentType = ref([
     '智能算法',
@@ -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(
       '选中===================>',
diff --git a/front/src/views/personalCenter/components/TheNewRelease.vue b/front/src/views/personalCenter/components/TheNewRelease.vue
index ee298aa3..f1a47d3a 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 18:06:10
  * @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 =