Merge branch 'hi-ucs-pre' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-pre

# Conflicts:
#	front/src/views/newHome/components/Navigation.vue

back/src/views/modules/ability/bsabilityai.vue

@@ -487,7 +487,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total

back/src/views/modules/ability/bsabilityservice.vue

@@ -364,7 +364,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total

back/src/views/modules/abilityStatistics/index.vue

@@ -31,7 +31,7 @@
           </el-date-picker>
         </el-form-item>
         <!--审核状态-->
-        <el-form-item>
+        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <span>审核状态：</span>
           <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
             <el-option label="全部" value="-1"></el-option>
@@ -53,7 +53,7 @@
         </el-form-item>
 
         <!--类型-->
-        <el-form-item>
+        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <span>类型：</span>
           <el-select  @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>

back/src/views/modules/algorithm/algorithm-management.vue

@@ -249,7 +249,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total

back/src/views/modules/canassigncase/index.vue

@@ -131,54 +131,54 @@
 </template>
 
 <script>
-import mixinViewModule from "@/mixins/view-module";
-import AddOrUpdate from "./canassigncase-add-or-update";
-import dictionaries from "@/utils/dictionaries";
-import qs from "qs";
-import { type } from "os";
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './canassigncase-add-or-update'
+import dictionaries from '@/utils/dictionaries'
+import qs from 'qs'
+import { type } from 'os'
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/resource/page",
+        getDataListURL: '/resource/page',
         getDataListIsPage: true,
-        exportURL: "/ability/bsabilityai/export",
-        deleteURL: "/resource/delete",
-        deleteIsBatch: true,
+        exportURL: '/ability/bsabilityai/export',
+        deleteURL: '/resource/delete',
+        deleteIsBatch: true
       },
       disabled: false,
       sceneArr: dictionaries.sceneArr,
       fieldArr: dictionaries.fieldArr,
       shareFormArr: dictionaries.shareFormArr,
       dataForm: {
-        name: "",
-        creator: "",
+        name: '',
+        creator: '',
         selectType: 0,
         delFlag: 0,
-        type: "赋能案例",
+        type: '赋能案例'
       },
-      qp: false,
-    };
+      qp: false
+    }
   },
   watch: {},
   components: {
-    AddOrUpdate,
+    AddOrUpdate
   },
-  created() {
-    this.dataForm.name = "";
-    this.dataForm.type = "赋能案例";
+  created () {
+    this.dataForm.name = ''
+    this.dataForm.type = '赋能案例'
   },
-  mounted() {
-    window.addEventListener("resize", this.a);
-    this.fullScreen();
+  mounted () {
+    window.addEventListener('resize', this.a)
+    this.fullScreen()
   },
   methods: {
-    reset() {
+    reset () {
       this.$http
         .get(
           this.mixinViewModuleOptions.getDataListURL +
-            "?" +
+            '?' +
             qs.stringify({
               // order: this.order,
               // orderField: this.orderField,
@@ -187,138 +187,138 @@ export default {
               selectType: 0,
               limit: 10,
               delFlag: 0,
-              creator: "",
-              type: "赋能案例",
-              name: "",
+              creator: '',
+              type: '赋能案例',
+              name: ''
             })
         )
         .then(({ data: res }) => {
-          this.dataForm.name = "";
+          this.dataForm.name = ''
           if (res.code !== 0) {
-            this.dataList = [];
-            this.total = 0;
-            return this.$message.error(res.msg);
+            this.dataList = []
+            this.total = 0
+            return this.$message.error(res.msg)
           }
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.list
-            : res.data;
+            : res.data
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
-            : 0;
+            : 0
           if (this.mixinViewModuleOptions.requestCallback) {
-            this.mixinViewModuleOptions.requestCallback(res.data);
+            this.mixinViewModuleOptions.requestCallback(res.data)
           }
-          this.dataListLoading = false;
+          this.dataListLoading = false
         })
         .catch(() => {
-          this.dataListLoading = false;
-        });
+          this.dataListLoading = false
+        })
     },
-    showDetail(val) {
-      this.addOrUpdateVisible = true;
-      this.disabled = false;
+    showDetail (val) {
+      this.addOrUpdateVisible = true
+      this.disabled = false
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false;
-        this.$refs.addOrUpdate.dataFormShowDetails = val;
-        this.$refs.addOrUpdate.init();
-      });
-      this.disabled = true;
+        this.$refs.addOrUpdate.UpdateState = false
+        this.$refs.addOrUpdate.dataFormShowDetails = val
+        this.$refs.addOrUpdate.init()
+      })
+      this.disabled = true
     },
-    showDocument(val) {
-      console.log(val);
+    showDocument (val) {
+      console.log(val)
       window.open(
-        window.SITE_CONFIG.frontUrl + "?id=" + val.id + "&&type=" + val.type,
-        "_blank"
-      );
+        window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
+        '_blank'
+      )
     },
-    findValue(list, type) {
-      const found = list.find((item) => item.attrType === type);
+    findValue (list, type) {
+      const found = list.find((item) => item.attrType === type)
       if (found) {
-        return found.attrValue;
+        return found.attrValue
       } else {
-        return "暂无数据";
+        return '暂无数据'
       }
     },
-    getDataList2(names) {
+    getDataList2 (names) {
       if (names != null) {
         this.$http
           .get(
             this.mixinViewModuleOptions.getDataListURL +
-              "?" +
+              '?' +
               qs.stringify({
                 // order: this.order,
                 // orderField: this.orderField,
                 // type: '组件服务',
                 pageNum: 1,
                 pageSize: this.limit,
-                type: "赋能案例",
-                creator: "",
+                type: '赋能案例',
+                creator: '',
                 selectType: 0,
                 delFlag: 0,
-                name: names,
+                name: names
               })
           )
           .then(({ data: res }) => {
             if (res.code !== 0) {
-              this.dataList = [];
-              this.total = 0;
-              return this.$message.error(res.msg);
+              this.dataList = []
+              this.total = 0
+              return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
-              this.dataList = res.data.list;
+            if (res.data.list.length >= 0) {
+              this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
-                : 0;
+                : 0
               if (this.mixinViewModuleOptions.requestCallback) {
-                this.mixinViewModuleOptions.requestCallback(res.data);
+                this.mixinViewModuleOptions.requestCallback(res.data)
               }
-              this.dataListLoading = false;
+              this.dataListLoading = false
             } else {
-              this.$message.error("未查询到相关信息");
-              this.reset();
+              this.$message.error('未查询到相关信息')
+              this.reset()
             }
           })
           .catch(() => {
-            this.dataListLoading = false;
-          });
+            this.dataListLoading = false
+          })
       } else {
-        this.$message.error("查询不能输入为空");
+        this.$message.error('查询不能输入为空')
       }
     },
-    fullScreen() {
+    fullScreen () {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
           console.log(
-            "全屏1",
+            '全屏1',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
-          this.qp = false;
+          )
+          this.qp = false
         } else {
           console.log(
-            "不是全屏2",
+            '不是全屏2',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
-          this.qp = true;
+          )
+          this.qp = true
         }
       } else {
         console.log(
-          "不是全屏3",
+          '不是全屏3',
           window.outerHeight,
           screen.availHeight,
           window.outerWidth,
           screen.availWidth
-        );
-        this.qp = true;
+        )
+        this.qp = true
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .el-tooltip__popper {

back/src/views/modules/capabilityTraceability/index.vue

@@ -16,7 +16,7 @@
       <div class="overview">
         <div class="top"><i></i>总体情况</div>
         <div class="main">
-          <div class="item" v-for="item in allSituation" :key="item">
+          <div class="item" v-for="item in allSituation" :key="item" @click="openTab(item)">
             <div class="left"></div>
             <div class="right">
               <div>{{item.name}}</div>
@@ -169,6 +169,66 @@
           </div>
         </div>
       </div>
+      <!--GIS图层资源-->
+      <el-dialog title="GIS图层资源" :visible.sync="yunshow"  class="status_change">
+        <div>
+        <el-table
+        :data="dataList1"
+        border
+        style="width: 100%"
+        height="500px"
+      >
+      
+        <el-table-column
+          prop="a"
+          label="能力名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+        min-width="150%"
+          prop="b"
+          label="能力描述"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="归属系统"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="归属项目"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="归属部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="f"
+          label="注册者"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        </el-table>
+        <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(9)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+      </div>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -223,6 +283,82 @@ export default {
   },
   data () {
     return {
+      dataList1: [ 
+        {
+            "a": "草地GIS服务",
+            "b": "以草地生态系统为研究区域，整合多源信息，为草地生态系统管理提供技术支持",
+            "c": "CM平台",
+            "d": "城市信息模型（CM）平台建设项目",
+            "e": "住房与建设保障局",
+            "f": "孙**"
+        },
+        {
+            "a": "行政区-街道",
+            "b": "街道行政边界",
+            "c": "CM平台",
+            "d": "城市信息模型（CM）平台建设项目",
+            "e": "住房与建设保障局",
+            "f": "孙**"
+        },
+        {
+            "a": "单元网格（城管网络）",
+            "b": "城管网络图层",
+            "c": "CM平台",
+            "d": "城市信息模型（CM）平台建设项目",
+            "e": "住房与建设保障局",
+            "f": "孙**"
+        },
+        {
+            "a": "核心部件图层",
+            "b": "核心部件图层",
+            "c": "CM平台",
+            "d": "城市信息模型（CM）平台建设项目",
+            "e": "住房与建设保障局",
+            "f": "孙**"
+        },
+        {
+            "a": "商圈及其缓冲区",
+            "b": "商圈及其缓冲区",
+            "c": "CM平台",
+            "d": "城市信息模型（CM）平台建设项目",
+            "e": "住房与建设保障局",
+            "f": "孙**"
+        },
+        {
+            "a": "商圈数据",
+            "b": "商圈图层数据",
+            "c": "CM平台",
+            "d": "城市信息模型平台建设项目",
+            "e": "工业和信息化局",
+            "f": "孙**"
+        },
+        {
+            "a": "政务版电子地图（蓝黑版球面坐标系）",
+            "b": "政务版电子地图（暗黑风格），2021年更新，CGCS2000球面坐标系",
+            "c": "智慧时空信息云平台",
+            "d": "智慧时空信息云平台建设项目",
+            "e": "自然资源和规划局",
+            "f": "孙**"
+        },
+        {
+          "a": "影像地图（平面坐标系）",
+            "b": "影像地图，CGCS2000球面坐标系，2021年更新",
+            "c": "智慧时空信息云平台",
+            "d": "智慧时空信息云平台建设项目",
+            "e": "自然资源和规划局",
+            "f": "孙**"
+        },
+        {
+          "a": "影像地图（球面坐标系）",
+            "b": "影像地图，CGCS2000球面坐标系，2021年更新",
+            "c": "智慧时空信息云平台",
+            "d": "智慧时空信息云平台建设项目",
+            "e": "自然资源和规划局",
+            "f": "孙**"
+        },
+      
+    ],
+      yunshow:false,
       tabList: ['总体情况', '部门情况', '地市情况'],
       selectTab: '总体情况',
       allSituation: [{ name: '注册项目', num: '100个' }, { name: '注册系统', num: '100个' }, { name: '视频资源', num: '100万路' }, { name: 'GIS图层', num: '100项' }, { name: '云网资源', num: '100个' }, { name: '组件资源', num: '100项' }],
@@ -541,6 +677,11 @@ export default {
     }
   },
   methods: {
+    openTab(item){
+if(item.name==='GIS图层'){
+  this.yunshow=true
+}
+    },
     myEcharts () {
       var chartDom1 = document.getElementById('echarts1')
       var chartDom2 = document.getElementById('echarts2')
@@ -573,6 +714,19 @@ export default {
 }
 </script>
 <style lang='scss' scoped>
+.status_change {
+  ::v-deep  .el-dialog__header{
+    background-color:#dee1e3;
+    padding: 10px 10px 10px;
+    .el-dialog__title,.el-dialog__headerbtn i{
+      color: #000;
+    }
+    
+  }
+  .dialog-footer{
+    text-align: center;
+  }
+}
 .capabilityTraceability {
   .top {
     display: flex;
@@ -617,6 +771,7 @@ export default {
       justify-content: center;
       align-items: center;
       .item {
+        cursor:pointer;
         margin: 10px 0;
         padding: 0 45px 0 40px;
         display: flex;

back/src/views/modules/myAgent/AbilityResourceShelf.vue

@@ -154,7 +154,6 @@ export default {
   methods: {
     // 处理
     taskHandle (row) {
-      console.log('row======================>', row, this.forwardHandleUrl)
       if (!row.businessKey) {
         return this.$message.error(this.$t('task.businessKeyError'))
       }
@@ -171,7 +170,9 @@ export default {
     bus.$off('abilityResourceShelfInit')
     bus.$on('abilityResourceShelfInit', () => {
       this.getDataList()
+      bus.$emit('updateTaskNum')
     })
+   
   }
 }
 </script>

back/src/views/modules/myAgent/AbilityResourcesRemoved.vue

@@ -171,6 +171,7 @@ export default {
     bus.$off('AbilityResourcesRemovedInit')
     bus.$on('AbilityResourcesRemovedInit', () => {
       this.getDataList()
+      bus.$emit('updateTaskNum')
     })
   }
 }

back/src/views/modules/myAgent/demo/ResourcesAndServices.vue

@@ -7,84 +7,62 @@
           <div class="dataTitleSon">
             {{ itemson.name }}
           </div>
-          <div
-            class="dataContent"
-            v-if="
-              itemson.name !== '算法优势' &&
-              itemson.name !== '应用场景' &&
-              itemson.name !== '功能介绍'
-            "
-          >
-            <el-form-item
-              v-for="itemsonson in itemson.children"
-              :key="itemsonson.name"
-              :label="
-                itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-              "
-              v-show="
-                !(
-                  itemsonson.name === '平台地址' ||
-                  itemsonson.name === 'SDK安装包' ||
-                  itemsonson.name === '接口请求方式' ||
-                  itemsonson.name === '服务接口'
-                )
-              "
-            >
-              <div
-                class="videoAndImgCss"
-                v-if="
-                  itemsonson.type === 'video' || itemsonson.type === 'image'
-                "
-                @click="videoAndImg(itemsonson.note1)"
-              >
+          <div class="dataContent" v-if="
+            itemson.name !== '算法优势' &&
+            itemson.name !== '应用场景' &&
+            itemson.name !== '功能介绍'
+          ">
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
+              itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
+            " v-show="
+  !(
+    itemsonson.name === '平台地址' ||
+    itemsonson.name === 'SDK安装包' ||
+    itemsonson.name === '接口请求方式' ||
+    itemsonson.name === '服务接口'
+  )
+">
+              <div class="videoAndImgCss" v-if="
+                itemsonson.type === 'video' || itemsonson.type === 'image'
+              " @click="videoAndImg(itemsonson.note1)">
                 浏览
               </div>
-               <div
-                class="videoAndImgCss"
-                v-if="
-                  itemsonson.name === '上传附件'
-                "
-                @click="videoAndImg(itemsonson.note1)"
-              >
+              <div class="videoAndImgCss" v-if="
+                itemsonson.name === '上传附件'
+              " @click="videoAndImg(itemsonson.note1)">
                 下载
               </div>
-              <div
-                v-else-if="itemsonson.type === ' multipleAdditions'"
-                class="multipleAdditionsClass"
-              >
-                <div
-                  v-for="multipleAdditionsItem in itemsonson.note1"
-                  :key="multipleAdditionsItem"
-                >
+              <div v-else-if="itemsonson.type === ' multipleAdditions'" class="multipleAdditionsClass">
+                <div v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem">
                   <el-tooltip placement="top">
                     <div slot="content">
                       {{
-                        multipleAdditionsItem.question ||
-                        multipleAdditionsItem.type ||
-                        multipleAdditionsItem.name
+                          multipleAdditionsItem.question ||
+                          multipleAdditionsItem.type ||
+                          multipleAdditionsItem.name
                       }}
                     </div>
                     <div>
                       {{
-                        multipleAdditionsItem.question ||
-                        multipleAdditionsItem.type ||
-                        multipleAdditionsItem.name
+                          multipleAdditionsItem.question ||
+                          multipleAdditionsItem.type ||
+                          multipleAdditionsItem.name
                       }}
                     </div>
                   </el-tooltip>
                   <el-tooltip placement="top">
                     <div slot="content">
                       {{
-                        multipleAdditionsItem.answer ||
-                        multipleAdditionsItem.price ||
-                        multipleAdditionsItem.img
+                          multipleAdditionsItem.answer ||
+                          multipleAdditionsItem.price ||
+                          multipleAdditionsItem.img
                       }}
                     </div>
                     <div>
                       {{
-                        multipleAdditionsItem.answer ||
-                        multipleAdditionsItem.price ||
-                        multipleAdditionsItem.img
+                          multipleAdditionsItem.answer ||
+                          multipleAdditionsItem.price ||
+                          multipleAdditionsItem.img
                       }}
                     </div>
                   </el-tooltip>
@@ -95,54 +73,31 @@
                   <!-- <div>{{ multipleAdditionsItem }}</div> -->
                 </div>
               </div>
-              <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1">
+              <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null ? false : true"
+                :content="itemsonson.note1">
                 <!-- <div slot="content" v-show="itemsonson.note1">{{ itemsonson.note1 }}</div> -->
-                <el-input
-                  v-model="itemsonson.note1"
-                  disabled="disabled"
-                ></el-input>
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
               </el-tooltip>
             </el-form-item>
-            <el-form-item
-              v-for="itemsonson in itemson.children"
-              :key="itemsonson.name"
-              :label="
-                itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-              "
-              v-show="
-                (itemsonson.name === '平台地址' && showDocking) ||
-                (itemsonson.name === 'SDK安装包' && showSDK) ||
-                (itemsonson.name === '接口请求方式' && showInterface) ||
-                (itemsonson.name === '服务接口' && showInterface)
-              "
-            >
-            <el-tooltip placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1">
-              <el-input
-                v-model="itemsonson.note1"
-                disabled="disabled"
-              ></el-input>
-            </el-tooltip>
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
+              itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
+            " v-show="
+  (itemsonson.name === '平台地址' && showDocking) ||
+  (itemsonson.name === 'SDK安装包' && showSDK) ||
+  (itemsonson.name === '接口请求方式' && showInterface) ||
+  (itemsonson.name === '服务接口' && showInterface)
+">
+              <el-tooltip placement="top" :disabled="itemsonson.note1 !== null ? false : true" :content="itemsonson.note1">
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
+              </el-tooltip>
 
             </el-form-item>
           </div>
-          <div
-            v-else-if="itemson.name === '算法优势'"
-            style="margin-bottom: 20px"
-          >
-            <div
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '算法优势'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
+          <div v-else-if="itemson.name === '算法优势'" style="margin-bottom: 20px">
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+              <div v-if="itemDataForm.attrType === '算法优势'" class="textAndImg">
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -152,24 +107,11 @@
               </div>
             </div>
           </div>
-          <div
-            v-else-if="itemson.name === '应用场景'"
-            style="margin-bottom: 20px"
-          >
-            <div
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '应用场景'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
+          <div v-else-if="itemson.name === '应用场景'" style="margin-bottom: 20px">
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+              <div v-if="itemDataForm.attrType === '应用场景'" class="textAndImg">
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -180,24 +122,11 @@
               </div>
             </div>
           </div>
-          <div
-            v-else-if="itemson.name === '功能介绍'"
-            style="margin-bottom: 20px"
-          >
-            <div
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '功能介绍'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
+          <div v-else-if="itemson.name === '功能介绍'" style="margin-bottom: 20px">
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+              <div v-if="itemDataForm.attrType === '功能介绍'" class="textAndImg">
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -227,7 +156,7 @@ export default {
       type: Array
     }
   },
-  data () {
+  data() {
     return {
       dataList: [],
       dataView: [],
@@ -242,12 +171,12 @@ export default {
     }
   },
   watch: {
-    dataList (item) {
+    dataList(item) {
       if (item) {
         this.dataList = item
       }
     },
-    insertList (val) {
+    insertList(val) {
       if (val) {
         if (this.dataForm.type === '应用资源') {
           this.dataView = val.filter(
@@ -437,7 +366,7 @@ export default {
   },
   computed: {},
   methods: {
-    videoAndImg (link) {
+    videoAndImg(link) {
       if (link) {
         window.open(link)
       } else {
@@ -447,7 +376,7 @@ export default {
         })
       }
     },
-    deptName () {
+    deptName() {
       console.log(this.dataForm.deptId)
       this.$http
         .get(`/sys/dept/${this.dataForm.deptId}`)
@@ -456,13 +385,13 @@ export default {
           this.unit = res.data.name
         })
     },
-    queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
+    queryPartAppByKeyIdFunction(index, indexSon, indexSonSon) {
       if (this.dataForm.type === '组件服务') {
         this.$http
           .get(
             '/dataResourceRel/queryApp4PartByKeyId' +
-              '?keyId=' +
-              this.dataForm.id
+            '?keyId=' +
+            this.dataForm.id
           )
           .then(({ data: res }) => {
             this.dataView.children[index].children[indexSon].children[
@@ -478,9 +407,9 @@ export default {
         this.$http
           .get(
             '/dataResourceRel/queryPart4AppByKeyId?keyId=' +
-              this.dataForm.id +
-              '&type=' +
-              '组件服务'
+            this.dataForm.id +
+            '&type=' +
+            '组件服务'
           )
           .then(({ data: res }) => {
             this.dataView.children[index].children[indexSon].children[
@@ -495,8 +424,8 @@ export default {
       }
     }
   },
-  created () {},
-  mounted () {
+  created() { },
+  mounted() {
     this.deptName()
   }
 }
@@ -514,6 +443,7 @@ export default {
     font-size: 22px;
     margin-bottom: 25px;
   }
+
   .dataTitleSon {
     padding-left: 30px;
     color: #333333;
@@ -522,9 +452,11 @@ export default {
     background: url("~@/assets/img/sj-jx.png") no-repeat;
     background-position-x: 15px;
   }
+
   .multipleAdditionsClass {
     display: flex;
-    & > div {
+
+    &>div {
       margin-right: 30px;
       border: 1px solid #3c9bcd;
       width: 212px;
@@ -534,7 +466,8 @@ export default {
       align-items: center;
       padding: 10px;
       overflow: hidden;
-      & > div:first-child {
+
+      &>div:first-child {
         margin-bottom: 10px;
         font-weight: bold;
         line-height: 14px;
@@ -544,7 +477,8 @@ export default {
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 2;
       }
-      & > div:nth-child(2) {
+
+      &>div:nth-child(2) {
         overflow: hidden;
         text-overflow: ellipsis;
         display: -webkit-box;
@@ -552,7 +486,8 @@ export default {
         -webkit-line-clamp: 6;
         line-height: initial;
       }
-      & > div:nth-child(3) {
+
+      &>div:nth-child(3) {
         width: 90%;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -563,6 +498,7 @@ export default {
       }
     }
   }
+
   .videoAndImgCss {
     cursor: pointer;
     font-size: 12px;
@@ -571,10 +507,13 @@ export default {
     padding: 5px;
     margin-top: 10px;
     background: rgba(60, 155, 205, 0.1);
+    display: inline-block;
   }
+
   .textAndImg {
     display: flex;
     padding-left: 30px;
+
     .textAndImgSon {
       width: 212px;
       height: 182px;
@@ -584,7 +523,8 @@ export default {
       align-items: center;
       padding: 10px;
       position: relative;
-      & > div {
+
+      &>div {
         -webkit-line-clamp: 5;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -592,11 +532,13 @@ export default {
         -webkit-box-orient: vertical;
         word-break: break-all;
       }
-      & > div:first-child {
+
+      &>div:first-child {
         margin-bottom: 10px;
         font-weight: bold;
       }
-      & > div:nth-child(3) {
+
+      &>div:nth-child(3) {
         margin-top: 10px;
         position: absolute;
         bottom: 8px;
@@ -610,13 +552,27 @@ export default {
       }
     }
   }
+
   .dataContent {
-    display: grid;
-    grid-template-columns: repeat(3, 33%);
-    padding-left: 30px;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+
   }
+
+  ::v-deep .el-form-item {
+    flex: 1;
+    display: flex;
+    justify-content: flex-start;
+  }
+
+  ::v-deep .el-form-item__label {
+    width: 112px;
+  }
+
   ::v-deep .el-form-item__content {
     display: inline-block;
+
     input {
       width: 400px;
     }

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-10-27 16:04:01
+ * @LastEditTime: 2022-11-01 15:00:19
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -63,6 +63,7 @@
     <!-- 申请能力 -->
     <div class="AbilityApply">
       <h3>申请能力</h3>
+      <div style="font-size:18px;font-weight:600;margin-top:20px;">{{deptName}}</div>
       <ul v-for="item in dataList" :key="item.id">
         <!-- <li class="title">{{item.address}}</li> -->
         <li class="clearfix">
@@ -157,6 +158,7 @@ export default {
         content: {}
       },
       dataList: [],
+      deptName: '',
       inputAgree: '',
       inputNo: '',
       agreeOrList: '同意'
@@ -228,6 +230,7 @@ export default {
       })
     },
     showDialog (title) {
+      this.input = title
       this.dialogVisible = true
       this.dialogType = title
     },
@@ -270,6 +273,7 @@ export default {
               this.dataForm,
               'elas============================'
             )
+            this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
             this.$http
               .get(
             `/act/task/getTaskVariables?${params}&variableName=allowEntrust`

front/public/static/config/location.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: Light
- * @LastEditTime: 2022-11-01 15:39:13
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-13 20:53:24
  * @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' },

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`,

front/src/api/home.js

@@ -425,7 +425,7 @@ export function updateIntegrationServices(data) {
   })
 }
 
-// 全文检索
+// 全局搜索
 export function getCountByFuzzyQuery(params, flag) {
   return request({
     url:

front/src/config/default/net.config.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: Light
- * @LastEditTime: 2022-11-02 09:59:26
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-01 10:47:06
  * @Description: 告诉大家这是什么
  */
 /**
@@ -14,7 +14,7 @@ const network = {
   //消息框消失时间
   messageDuration: 3000,
   //最长请求时间
-  requestTimeout: 300000,
+  requestTimeout: 60000,
   //操作正常code，支持String、Array、int多种类型
   successCode: [200, 0],
 }

front/src/config/default/setting.config.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: Light
- * @LastEditTime: 2022-11-01 15:37:34
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-20 16:10:57
  * @Description: 告诉大家这是什么
  */
 /**
@@ -32,7 +32,7 @@ const setting = {
   //     ? 'http://15.2.21.158:9101'
   //     : 'mock-server',
   //标题 （包括初次加载雪花屏的标题 页面的标题 浏览器的标题）
-  title: '政务信息系统生态运营平台',
+  title: '城市云脑能力中心管理平台',
   //标题分隔符
   titleSeparator: ' - ',
   //标题是否反转 如果为false:"page - title"，如果为ture:"title - page"

front/src/global/GlobalConfig.js

@@ -506,8 +506,6 @@ 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 ? '基础设施' : '应用资源'

front/src/views/abilityStatistics/components/ResourceAggregation.vue

@@ -104,11 +104,11 @@
       return message.error(res.data.msg)
     }
     let imgObj = {
-      应用系统: require('../../../assets/abilityStatistics/banner-yy.png'),
-      GIS图层: require('../../../assets/abilityStatistics/banner-zj.png'),
-      视频资源: require('../../../assets/abilityStatistics/banner-jc.png'),
+      组件服务: 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 = {
@@ -172,8 +172,7 @@
       //     break
       // }
     })
-    // let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
-    let arr = ['应用系统', 'GIS图层', '视频资源', '数据资源', '云网资源']
+    let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
     dataList.value.dataList.sort((a, b) => {
       return arr.indexOf(a.type) - arr.indexOf(b.type)
     })

front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue

@@ -151,7 +151,7 @@
     console.log('收藏===================》', props.dataList)
     if (scFlag2.value) {
       scFlag2.value = false
-      if (props.dataList.isCollect) {
+      if (props.dataList.isCollect == 'true') {
         scDel([props.dataList.id]).then((res) => {
           if (res.data.msg === 'success') {
             message.success('取消成功')

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,7 +71,9 @@
       <div class="top-content-father" :key="listKey">
         <template
           v-if="
-            Cardsname == 'GIS图层' || Cardsname == '应用系统' || Cardsname == ''
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
           "
         >
           <div class="top-content-son">
@@ -153,7 +155,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">
           模糊搜索
@@ -172,7 +174,7 @@
             style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
-            全文检索
+            全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
@@ -232,7 +234,7 @@
             style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
-            全文检索
+            全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
@@ -296,13 +298,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"
@@ -339,7 +341,9 @@
       <div class="top-content-father" :key="listKey">
         <template
           v-if="
-            Cardsname == 'GIS图层' || Cardsname == '应用系统' || Cardsname == ''
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
           "
         >
           <div class="top-content-son">
@@ -421,7 +425,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"
@@ -501,7 +505,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"
@@ -542,7 +546,9 @@
         <!-- todo -->
         <template
           v-if="
-            Cardsname == 'GIS图层' || Cardsname == '应用系统' || Cardsname == ''
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
           "
         >
           <div class="top-content-son">
@@ -735,7 +741,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'
@@ -782,7 +788,7 @@
         router.currentRoute.value.query.select ||
         DETAIL_PAGE_CONTENT_DEFAULT_TAB
       console.log('select------------>', select)
-      // 例如：GIS图层是大类型，selectSubType是GIS图层的智能算法或图层服务等...
+      // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
       const selectSubType = router.currentRoute.value.query.type || ''
       const queryName = ref('')
       const str = router.currentRoute.value.query.str
@@ -1077,9 +1083,9 @@
           ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
           ListContent.records = []
           ListContent.records = JSON.parse(JSON.stringify(dataCopy))
-          if (select == 'GIS图层') {
+          if (select == '组件服务') {
             queryName.value = '组件类型'
-          } else if (select == '应用系统') {
+          } else if (select == '应用资源') {
             queryName.value = '应用领域'
           } else {
             queryName.value = ''
@@ -1127,7 +1133,7 @@
       const resourceList = reactive({ data: [] })
       const videoList = reactive({ data: [] })
       const resourceTotal = ref('')
-      // 全文检索
+      // 全局搜索
       const camera = ref(null)
       const globalData = reactive({ data: [] })
       const globalFlag = ref(false)
@@ -1139,33 +1145,37 @@
           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) => {
               if (mapFlag && val.count != 0) {
                 mapFlag = false
-                changeCards(val.type)
+                if (Cardsname.value === val.type) {
+                  getAppResources2()
+                } else {
+                  changeCards(val.type)
+                }
               }
             })
             if (!mapFlag) {
               return
             }
-            if (paramsGetResources.type == '视频资源') {
+            if (paramsGetResources.type == '基础设施') {
               console.log('camera1', camera.value)
               camera.value.getCamera(true, searchValue.value)
             } else {
@@ -1177,7 +1187,7 @@
             )
           })
         } else {
-          message.warning('全文检索必须输入关键词！')
+          message.warning('全局搜索必须输入关键词！')
         }
       }
       // 校验
@@ -1196,7 +1206,7 @@
         mybus.emit('changeRoomInput', searchValue.value)
         if (
           whoShow1.value.itShowQingDao &&
-          paramsGetResources.type == '视频资源'
+          paramsGetResources.type == '基础设施'
         ) {
           console.log('camera2', camera)
           camera.value.getCamera(true, searchValue.value)
@@ -1214,7 +1224,7 @@
         }
         select = router.currentRoute.value.query.select
         if (
-          (select == '应用系统' &&
+          (select == '应用资源' &&
             (paramsGetResources.orderField == '' ||
               paramsGetResources.orderField == 'deptSort' ||
               paramsGetResources.orderField == 'pin_top')) ||
@@ -1253,14 +1263,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
@@ -1302,7 +1312,7 @@
               })
             } else if (
               paramsGetResources.type !== '数据资源' &&
-              (paramsGetResources.type !== '视频资源' ||
+              (paramsGetResources.type !== '基础设施' ||
                 !whoShow1.value.itShowXiHaiAn)
             ) {
               if (switchIndex != '分页查询') {
@@ -1319,7 +1329,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
@@ -1329,7 +1339,7 @@
                 }
               })
             } else if (
-              paramsGetResources.type === '视频资源' &&
+              paramsGetResources.type === '基础设施' &&
               whoShow1.value.itShowXiHaiAn
             ) {
               if (switchIndex != '分页查询') {
@@ -1380,7 +1390,7 @@
               })
             } else if (
               paramsGetResources.type !== '数据资源' &&
-              (paramsGetResources.type !== '视频资源' ||
+              (paramsGetResources.type !== '基础设施' ||
                 !whoShow1.value.itShowXiHaiAn)
             ) {
               if (switchIndex != '分页查询') {
@@ -1397,7 +1407,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
@@ -1407,7 +1417,7 @@
                 }
               })
             } else if (
-              paramsGetResources.type === '视频资源' &&
+              paramsGetResources.type === '基础设施' &&
               whoShow1.value.itShowXiHaiAn
             ) {
               if (switchIndex != '分页查询') {
@@ -1459,7 +1469,7 @@
             })
           } else if (
             paramsGetResources.type !== '数据资源' &&
-            (paramsGetResources.type !== '视频资源' ||
+            (paramsGetResources.type !== '基础设施' ||
               !whoShow1.value.itShowXiHaiAn)
           ) {
             if (switchIndex != '分页查询') {
@@ -1473,7 +1483,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
@@ -1483,7 +1493,7 @@
               }
             })
           } else if (
-            paramsGetResources.type === '视频资源' ||
+            paramsGetResources.type === '基础设施' ||
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -1639,11 +1649,11 @@
       const judgeHasSubSelectType = () => {
         if (selectSubType) {
           paramsGetResources.infoList = []
-          if (select == 'GIS图层') {
+          if (select == '组件服务') {
             queryName.value = '组件类型'
-          } else if (select == '应用系统') {
+          } else if (select == '应用资源') {
             queryName.value = '应用领域'
-          } else if (select == '视频资源') {
+          } else if (select == '基础设施') {
             searchType.value = selectSubType
           } else {
             queryName.value = selectSubType
@@ -1712,7 +1722,7 @@
         // 西海岸-特殊处理
         if (whoShow1.value.itShowXiHaiAn) {
           if (
-            name !== '视频资源' &&
+            name !== '基础设施' &&
             !xhaHasPermissionUser.list.includes(user.value.username)
           ) {
             return message.warn('暂无权限')
@@ -1762,7 +1772,7 @@
       const abilitySquareFunction = (e) => {
         let snumSquare = ref({})
         if (e === '应用广场') {
-          abilitySquareFunctionData.value = '应用系统'
+          abilitySquareFunctionData.value = '应用资源'
         } else if (e === '算法广场') {
           abilitySquareFunctionData.value = '智能算法'
         } else if (e === 'GIS广场') {

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;

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;
+#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 {
     display: flex;
     justify-content: space-between;
+  }
 
-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
+  .flex-row-start {
+    justify-content: flex-start;
+    align-items: center;
+  }
 
-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% auto;
-    }
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
 
-    .form-container {
-      padding: 20px 20px 30px 20px;
-
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
+      &::after {
+        content: '';
       }
     }
-
-    .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;
-    }
   }
 
-  .applicationScene {
-    :deep(.ant-select-selector) {
-      overflow-x: scroll;
-    }
-
-    :deep(.ant-select-selection-overflow) {
-      flex-wrap: nowrap;
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
     }
   }
 
-  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;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
     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;
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
     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;
+  }
+}
+
+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>

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>

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>(Government information ecological operation platform)</p>
+        <p>城市云脑通用能力服务平台</p>
+        <p>(United Capacity System)</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: {

front/src/views/home/constantData/showData.js

@@ -1,22 +1,15 @@
-/*
- * @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: 'GIS图层',
+    name: '组件服务',
   },
   {
     photo: require('@/assets/newHome/banner-jc.png'),
-    name: '视频资源',
+    name: '基础设施',
   },
   {
     photo: require('@/assets/newHome/banner-sj.png'),
@@ -24,7 +17,7 @@ export const titleNameArray = [
   },
   {
     photo: require('@/assets/newHome/banner-zs.png'),
-    name: '云网资源',
+    name: '知识库',
   },
 ]
 

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,7 +169,6 @@
                 }
                 switch (val.type) {
                   case '市级':
-                  case '省级':
                   case '企业':
                   case '其他':
                     generateChildren(val, obj)
@@ -187,33 +186,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++
           })
         }
@@ -223,6 +222,7 @@
       })
       // 生成children
       const generateChildren = (val, obj) => {
+      
         if (val.dataList.length > 0) {
           val.dataList.forEach((child) => {
             let children = {
@@ -232,13 +232,14 @@
               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 = {
@@ -258,7 +259,7 @@
                   select: false,
                   key: child.deptId,
                 }
-
+              
                 children.children.push(children2)
               })
             }

front/src/views/home/infrastructurePage.vue

@@ -1052,7 +1052,7 @@
           roomResult.value = true
           onSearch()
         } else {
-          tabClick(0, '政务云资源')
+          tabClick(0, '城市云脑会客厅')
         }
       }
     }
@@ -1106,14 +1106,14 @@
       content: isXiHaiAn
         ? ['视频资源']
         : username == 'admin'
-        ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
-        : ['政务云资源', '视频资源', '城市云脑会客厅'],
+        ? ['城市云脑会客厅', '视频资源', '政务云资源', '视频会议']
+        : ['城市云脑会客厅', '视频资源', '政务云资源'],
     },
   ])
   let clickList = ref([]) //存储点击的tab
   if (!isXiHaiAn) {
     tabList.value.push({
-      title: '政务云资源',
+      title: '城市云脑会客厅',
       content: [],
     })
   }

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>

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

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -7,21 +7,7 @@
       </div>
       <div class="bottom">
         <div class="item">
-          <div class="yy">应用系统</div>
-          <div
-            class="name"
-            v-for="(item, index) in yyList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne11(item.name)"
-          >
-            <!-- {{ item.name + '-' + item.num + '项' }} -->
-            {{ index + 1 }}-{{ item.name }}
-          </div>
-          <div class="btn" @click="jumpPage('应用系统')">查看更多</div>
-        </div>
-        <div class="item">
-          <div class="zj">GIS图层</div>
+          <div class="zj">组件服务</div>
           <div
             class="name"
             v-for="(item, index) in zjList.slice(0, 5)"
@@ -29,13 +15,25 @@
             :class="index == 4 ? 'name-last' : ''"
             @click="selectOne1(item.name)"
           >
-            <!-- {{ item.name + '-' + item.num + '项' }} -->
-            {{ index + 1 }}-{{ item.name }}
+            {{ item.name + '-' + item.num + '项' }}
           </div>
-          <div class="btn" @click="jumpPage('GIS图层')">查看更多</div>
+          <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
         <div class="item">
-          <div class="jc">视频资源</div>
+          <div class="yy">应用资源</div>
+          <div
+            class="name"
+            v-for="(item, index) in yyList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne11(item.name)"
+          >
+            {{ item.name + '-' + item.num + '项' }}
+          </div>
+          <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
+        </div>
+        <div class="item">
+          <div class="jc">基础设施</div>
           <div
             class="name"
             v-for="(item, index) in jcList.slice(0, 5)"
@@ -43,7 +41,7 @@
             :class="index == 2 ? 'name-last' : ''"
             @click="selectOne2(item.name)"
           >
-            <!-- {{
+            {{
               item.name +
               '-' +
               item.num +
@@ -52,10 +50,9 @@
                 : 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>
@@ -66,13 +63,12 @@
             :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"
@@ -82,7 +78,7 @@
           >
             {{ index + 1 }}-{{ item.name }}
           </div>
-          <div class="btn" @click="jumpPage('云网资源')">查看更多</div>
+          <div class="btn" @click="jumpPage('知识库')">查看更多</div>
         </div>
       </div>
     </div>
@@ -108,7 +104,7 @@
   const jcList = ref([])
   const sjList = ref([])
   const yyList = ref([])
-  // 云网资源模块数据
+  // 知识库模块数据
   const zsList = ref([])
   // const jcList = ref([])
   const paramsGetResources = {
@@ -135,196 +131,131 @@
   const getAppResources = (type, obj) => {
     paramsGetResources.type = type
     if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
-      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
-      //   }
-      // })
+      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 = [
-          {
-            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],
-        //     })
-        //   }
-        // })
+      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],
+            })
+          }
+        })
       } else {
         pageWithAttrs(paramsGetResources).then((res) => {
           console.log('object个数======>', type)
           obj.value = res.data.data.records
           switch (type) {
-            case 'GIS图层':
+            case '组件服务':
               assignmentMethod('zjNum', res)
               break
-            case '应用系统':
+            case '应用资源':
               assignmentMethod('yyNum', res)
               break
-            case '视频资源':
+            case '基础设施':
               assignmentMethod('jcNum', res)
               break
-            case '云网资源':
+            case '知识库':
               assignmentMethod('zsNum', res)
               break
           }
@@ -377,11 +308,11 @@
   const assignmentMethod = (type, res) => {
     object[type] = res.data.data.total
   }
-  getAppResources('GIS图层', zjList)
-  getAppResources('应用系统', yyList)
-  getAppResources('视频资源', jcList)
+  getAppResources('组件服务', zjList)
+  getAppResources('应用资源', yyList)
+  getAppResources('基础设施', jcList)
   getAppResources('数据资源', sjList)
-  getAppResources('云网资源', zsList)
+  getAppResources('知识库', zsList)
 
   function jumpPage(type) {
     // 点击内存入store
@@ -414,7 +345,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: name,
-        select: 'GIS图层',
+        select: '组件服务',
       },
     })
   }
@@ -423,7 +354,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: name,
-        select: '应用系统',
+        select: '应用资源',
       },
     })
   }
@@ -440,7 +371,7 @@
       path: '/DetailsPageconetent',
       query: {
         type: names,
-        select: '视频资源',
+        select: '基础设施',
       },
     })
   }

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: {

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([

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 yy"></div>
-        <div class="name">应用系统</div>
-        <div class="sl">
-          <span class="num">{{ yyNum || 0 }}</span>
-          项
-        </div>
-      </div>
-    </a-tooltip>
-    <a-tooltip>
-      <template #title>点击进入GIS图层</template>
-      <div class="item" @click="jumpPage('GIS图层')">
+      <template #title>点击进入组件服务</template>
+      <div class="item" @click="jumpPage('组件服务')">
         <div class="img zj"></div>
-        <div class="name">GIS图层</div>
+        <div class="name">组件服务</div>
         <div class="sl">
           <span class="num">{{ zjNum || 0 }}</span>
           项
@@ -23,10 +12,21 @@
       </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="sl">
+          <span class="num">{{ yyNum || 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 'GIS图层':
+        case '组件服务':
           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
       }

front/src/views/newHome/components/WorkDynamics.vue

@@ -92,12 +92,17 @@
               </div>
             </div>
           </div>
-          <!-- <div
+          <div
             class="component-type"
-            v-if="abilityToTypeFunctionData == 'GIS图层'"
+            v-if="abilityToTypeFunctionData == '组件服务'"
           >
             <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)"
@@ -109,7 +114,7 @@
                 </a-radio>
               </a-radio-group>
             </div>
-          </div> -->
+          </div>
         </a-modal>
       </div>
       <!-- <div @click="showAbilitySquare">
@@ -164,29 +169,23 @@
   // ])
   //能力上架弹窗
   function handlecancel() {
-    abilityToTypeFunctionData.value = 'GIS图层'
+    abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
   }
-  let abilityToTypeFunctionData = ref('GIS图层')
+  let abilityToTypeFunctionData = ref('组件服务')
   function abilityToTypeFunction(item) {
     abilityToTypeFunctionData.value = item
   }
-  let abilityToType = ref([
-    '应用系统',
-    'GIS图层',
-    '视频资源',
-    '数据资源',
-    '云网资源',
+  let abilityToType = ref(['组件服务', '应用资源'])
+  let abilitySquare = ref(['智能算法', '图层服务', '应用资源'])
+  let componentType = ref([
+    '智能算法',
+    '图层服务',
+    '开发组件',
+    // '办公组件',
+    '业务组件',
+    // '其他',
   ])
-  let abilitySquare = ref(['智能算法', '图层服务', '应用系统'])
-  // let componentType = ref([
-  //   '智能算法',
-  //   '图层服务',
-  //   '开发组件',
-  //   // '办公组件',
-  //   '业务组件',
-  //   // '其他',
-  // ])
   const visible = ref(false)
   const showModal = () => {
     visible.value = true
@@ -208,7 +207,7 @@
   let componentTypeValue = ref('')
   const handleOk = (e) => {
     let snum = ref({})
-    if (abilityToTypeFunctionData.value == 'GIS图层') {
+    if (abilityToTypeFunctionData.value == '组件服务') {
       if (!componentTypeValue.value || componentTypeValue.value == '') {
         message.error('请选择组件类型！')
         return
@@ -237,7 +236,7 @@
     })
     window.open(applypage.href, '_blank')
     visible.value = false
-    abilityToTypeFunctionData.value = 'GIS图层'
+    abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
     console.log(e)
   }
@@ -271,7 +270,7 @@
   function jumpPage() {
     // 点击内存入store
     // store.commit('WorkDynList', {
-    //   selectCardsnum: 'GIS图层',
+    //   selectCardsnum: '组件服务',
     // })
     console.log(
       '选中===================>',
@@ -380,7 +379,6 @@
           border: unset;
           background: unset;
           div {
-            margin-bottom: 10px;
             margin-right: 0.15rem;
             cursor: pointer;
             font-size: 0.14rem;

front/src/views/personalCenter/components/ApplyDetails.vue

@@ -120,36 +120,43 @@
       title: '任务名称',
       dataIndex: 'activityName',
       key: 'activityName',
+      width: '180px',
     },
     {
       title: '处理部门',
       dataIndex: 'assigneeDeptName',
       key: 'assigneeDeptName',
+      width: '180px',
     },
     {
       title: '处理人',
       dataIndex: 'assigneeName',
       key: 'assigneeName',
+      width: '180px',
     },
     {
       title: '任务开始时间',
       dataIndex: 'startTime',
       key: 'startTime',
+      width: '180px',
     },
     {
       title: '任务结束时间',
       dataIndex: 'endTime',
       key: 'endTime',
+      width: '180px',
     },
     {
       title: '审核意见',
       dataIndex: 'comment',
       key: 'comment',
+      width: '180px',
     },
     {
       title: '任务时长',
       dataIndex: 'duration',
       key: 'duration',
+      width: '180px',
     },
   ]
   const getInfo = () => {

front/src/views/personalCenter/components/TheNewRelease.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-01 17:49:38
- * @LastEditors: Light
- * @LastEditTime: 2022-11-02 13:59:46
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-22 17:01:25
  * @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 =