back/src/i18n/zh-CN.js

@@ -3,8 +3,8 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '生态运营平台'
+t.brand.lg = '能力管理中心'
-t.brand.mini = '政务信息系统'
+t.brand.mini = '一体化综合指挥'
 
 t.add = '新增'
 t.delete = '删除'

back/src/i18n/zh-TW.js

@@ -3,8 +3,10 @@ const t = {}
 t.loading = '加載中...'
 
 t.brand = {}
-t.brand.lg = '生态运营平台'
+    // t.brand.lg = '能力管理中心'
-t.brand.mini = '政务信息系统'
+    // t.brand.mini = '一体化综合指挥'
+t.brand.lg = '通用服务平台'
+t.brand.mini = '城市云脑'
 
 t.add = '新增'
 t.delete = '刪除'

back/src/views/main-navbar.vue

@@ -12,7 +12,7 @@
           $t("brand.lg")
         }}</a>
         <span>——</span>
-        <span class="back-title-text">能力知识库</span>
+        <span class="back-title-text">后台管理系统</span>
       </h1>
     </div>
     <div class="aui-navbar__body">

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

@@ -29,7 +29,7 @@
         </el-form-item> -->
         <el-form-item>
           <el-button type="primary" @click="showPutOnTheShelf()"
-            >盘点入库</el-button
+            >上架</el-button
           >
         </el-form-item>
         <el-form-item>
@@ -48,6 +48,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
+        style="width: 100%"
         height="650px"
         @selection-change="handleSelectionChange"
       >
@@ -59,6 +60,7 @@
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="name"
           label="图层名称"
           header-align="center"
@@ -66,40 +68,29 @@
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="description"
-          label="能力描述"
+          label="描述"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-         <el-table-column
-          :show-overflow-tooltip="true"
-          prop="deptName"
-          label="归属项目"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-         <el-table-column
-          :show-overflow-tooltip="true"
-          prop="deptName"
-          label="归属系统"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="deptName"
-          label="归属部门"
+          label="上架部门"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="deptContacts"
-          label="注册者"
+          label="联系人"
           header-align="center"
           align="center"
         ></el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           :show-overflow-tooltip="true"
           width="280"
           prop="deptPhone"
@@ -114,12 +105,13 @@
           label="上架时间"
           header-align="center"
           align="center"
-        ></el-table-column> -->
+        ></el-table-column>
         <el-table-column
           label="操作"
           fixed="right"
           header-align="center"
           align="center"
+          width="150"
         >
           <template slot-scope="scope">
             <el-button
@@ -128,17 +120,17 @@
               @click="UpdateData(scope.row)"
               >{{ $t('update') }}</el-button
             >
-            <!-- <el-button
+            <el-button
               type="text"
               size="small"
               @click="deleteHandle2(scope.row.id)"
               >{{ $t('delete') }}</el-button
-            > -->
+            >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
               >详情</el-button
             >
-            <el-button type="text" size="small" 
+            <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >标签化</el-button
+              >设置</el-button
             >
           </template>
         </el-table-column>
@@ -302,7 +294,7 @@ export default {
             orderField: 'total',
             orderType: 'DESC',
             pageNum: this.currentPage,
-            pageSize: 10,
+            pageSize: 15,
             type: '组件服务',
           };
        this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {

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

@@ -31,7 +31,7 @@
           <el-button
             type="primary"
             @click="showPutOnTheShelf()"
-            >盘点入库</el-button
+            >上架</el-button
           >
         </el-form-item>
         <el-form-item>
@@ -51,6 +51,7 @@
         :data="dataList"
         border
         @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
         height="650px"
       >
         <el-table-column
@@ -61,58 +62,56 @@
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="name"
-          label="系统名称"
+          label="应用名称"
           header-align="center"
           align="center"
         ></el-table-column>
-        <el-table-column
+        <af-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="description"
-          label="能力描述"
+          label="应用描述"
           header-align="center"
           align="center"
-        ></el-table-column>
+        ></af-table-column>
-         <el-table-column
+        <af-table-column
-          :show-overflow-tooltip="true"
-          prop="deptName"
-          label="归属项目"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-         <el-table-column
-          :show-overflow-tooltip="true"
-          prop="deptName"
-          label="归属系统"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="deptName"
           label="归属部门"
           header-align="center"
           align="center"
-        ></el-table-column>
+        ></af-table-column>
-        <el-table-column
+        <af-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="deptContacts"
-          label="注册者"
+          label="部门联系人"
           header-align="center"
           align="center"
-        ></el-table-column>
+        ></af-table-column>
-        <!-- <el-table-column
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptPhone"
+          label="部门联系人电话"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
           :show-overflow-tooltip="true"
           width="280"
           prop="shareCondition"
           label="共享条件"
           header-align="center"
           align="center"
-        ></el-table-column> 
+        ></af-table-column>
         <template v-if="dataList[0] && dataList[0].infoList2">
           <el-table-column
             v-for="(item, index) in dataList[0].infoList2"
-            :key="Math.random()"
+            :key="index"
             :label="item.attrType"
             header-align="center"
             align="center"
@@ -123,20 +122,29 @@
               {{ findValue(scope.row.infoList2, item.attrType) }}
             </template>
           </el-table-column>
-        </template>-->
+        </template>
         <el-table-column
-          label="操作"
+          :label="$t('handle')"
           fixed="right"
           header-align="center"
           align="center"
+          width="300"
         >
           <template slot-scope="scope">
             <el-button
+              v-if="$hasPermission('ability:bsabilityai:update')"
               type="text"
               size="small"
               @click="UpdateData(scope.row)"
               >{{ $t("update") }}</el-button
             >
+            <el-button
+              v-if="$hasPermission('ability:bsabilityai:delete')"
+              type="text"
+              size="small"
+              @click="deleteHandle2(scope.row.id)"
+              >{{ $t("delete") }}</el-button
+            >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
               >详情</el-button
             >
@@ -144,7 +152,30 @@
               type="text"
               size="small"
               @click="applyAndAssembly(scope.row)"
-              >标签化</el-button
+              >应用与GIS图层</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="applyAndDataResource(scope.row)"
+              >应用与数据</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="applyAndProject(scope.row)"
+              >应用与项目</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="applyAndInfrastructure(scope.row)"
+              >应用与视频资源</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              >设置</el-button
             >
           </template>
         </el-table-column>

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

@@ -29,7 +29,7 @@
         </el-form-item> -->
         <el-form-item>
           <el-button type="primary" @click="showPutOnTheShelf()"
-            >盘点入库</el-button
+            >上架</el-button
           >
         </el-form-item>
         <el-form-item>
@@ -48,6 +48,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
+        style="width: 100%"
         height="650px"
         @selection-change="handleSelectionChange"
       >
@@ -59,47 +60,37 @@
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="name"
-          label="组件名称"
+          label="图层名称"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="description"
-          label="能力描述"
+          label="描述"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-         <el-table-column
-          :show-overflow-tooltip="true"
-          prop="deptName"
-          label="归属项目"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-         <el-table-column
-          :show-overflow-tooltip="true"
-          prop="deptName"
-          label="归属系统"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="deptName"
-          label="归属部门"
+          label="上架部门"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="deptContacts"
-          label="注册者"
+          label="联系人"
           header-align="center"
           align="center"
         ></el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           :show-overflow-tooltip="true"
           width="280"
           prop="deptPhone"
@@ -114,12 +105,13 @@
           label="上架时间"
           header-align="center"
           align="center"
-        ></el-table-column> -->
+        ></el-table-column>
         <el-table-column
           label="操作"
           fixed="right"
           header-align="center"
           align="center"
+          width="150"
         >
           <template slot-scope="scope">
             <el-button
@@ -128,17 +120,17 @@
               @click="UpdateData(scope.row)"
               >{{ $t('update') }}</el-button
             >
-            <!-- <el-button
+            <el-button
               type="text"
               size="small"
               @click="deleteHandle2(scope.row.id)"
               >{{ $t('delete') }}</el-button
-            > -->
+            >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
               >详情</el-button
             >
-            <el-button type="text" size="small" 
+            <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >标签化</el-button
+              >设置</el-button
             >
           </template>
         </el-table-column>
@@ -302,7 +294,7 @@ export default {
             orderField: 'total',
             orderType: 'DESC',
             pageNum: this.currentPage,
-            pageSize: 10,
+            pageSize: 15,
             type: '组件服务',
           };
        this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
@@ -310,12 +302,13 @@ export default {
           this.total = parseInt(res.data.data.total);
         }) 
     },
+    //翻页
       handleCurrentChange (val) {
       console.log('val------------>', val)
       this.currentPage = val;
       this.getDataList();
     },
-     //删除，可以批量删除
+      //删除，可以批量删除
     deleteHandle2 (id) {
       console.log('删除========================》', id, this.dataListSelections)
       const ids = []
@@ -333,7 +326,7 @@ export default {
         this.getDataList()
       })
     },
-    //多选多选
+      //多选多选
     handleSelectionChange(val){
       this.dataListSelections = val;
     },
@@ -355,7 +348,7 @@ export default {
       })
     },
     reset () {
-      this.getDataList();
+       this.getDataList();
     },
     findValue (list, type) {
       const found = list.find((item) => item.attrType === type)
@@ -520,7 +513,6 @@ export default {
         this.$message.error('查询信息不能为空')
       }
     },
-    // fullScreen () {
     //   if (window.outerHeight === screen.availHeight) {
     //     if (window.outerWidth === screen.availWidth) {
     //       this.qp = false

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

@@ -5,7 +5,7 @@
         <el-form-item>
           <el-input
             v-model="dataForm.name"
-            placeholder="名称"
+            placeholder="图层名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -29,7 +29,7 @@
         </el-form-item> -->
         <el-form-item>
           <el-button type="primary" @click="showPutOnTheShelf()"
-            >盘点入库</el-button
+            >上架</el-button
           >
         </el-form-item>
         <el-form-item>
@@ -48,6 +48,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
+        style="width: 100%"
         height="650px"
         @selection-change="handleSelectionChange"
       >
@@ -59,36 +60,37 @@
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
+          width="280"
           prop="name"
-          label="组件名称"
+          label="图层名称"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
-        
+          width="280"
           prop="description"
-          label="能力描述"
+          label="描述"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
-        
+          width="280"
           prop="deptName"
-          label="归属部门"
+          label="上架部门"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
           :show-overflow-tooltip="true"
-      
+          width="280"
           prop="deptContacts"
-          label="注册者"
+          label="联系人"
           header-align="center"
           align="center"
         ></el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           :show-overflow-tooltip="true"
           width="280"
           prop="deptPhone"
@@ -103,13 +105,13 @@
           label="上架时间"
           header-align="center"
           align="center"
-        ></el-table-column> -->
+        ></el-table-column>
         <el-table-column
           label="操作"
           fixed="right"
           header-align="center"
           align="center"
-        
+          width="150"
         >
           <template slot-scope="scope">
             <el-button
@@ -118,17 +120,17 @@
               @click="UpdateData(scope.row)"
               >{{ $t('update') }}</el-button
             >
-            <!-- <el-button
+            <el-button
               type="text"
               size="small"
               @click="deleteHandle2(scope.row.id)"
               >{{ $t('delete') }}</el-button
-            > -->
+            >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
               >详情</el-button
             >
-            <el-button type="text" size="small" 
+            <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >标签化</el-button
+              >设置</el-button
             >
           </template>
         </el-table-column>
@@ -292,7 +294,7 @@ export default {
             orderField: 'total',
             orderType: 'DESC',
             pageNum: this.currentPage,
-            pageSize: 10,
+            pageSize: 15,
             type: '组件服务',
           };
        this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
@@ -305,7 +307,7 @@ export default {
       this.currentPage = val;
       this.getDataList();
     },
-     //删除，可以批量删除
+         //删除，可以批量删除
     deleteHandle2 (id) {
       console.log('删除========================》', id, this.dataListSelections)
       const ids = []
@@ -323,7 +325,7 @@ export default {
         this.getDataList()
       })
     },
-    //多选多选
+      //多选多选
     handleSelectionChange(val){
       this.dataListSelections = val;
     },
@@ -345,7 +347,7 @@ export default {
       })
     },
     reset () {
-      this.getDataList();
+       this.getDataList();
     },
     findValue (list, type) {
       const found = list.find((item) => item.attrType === type)
@@ -510,7 +512,6 @@ export default {
         this.$message.error('查询信息不能为空')
       }
     },
-    // fullScreen () {
     //   if (window.outerHeight === screen.availHeight) {
     //     if (window.outerWidth === screen.availWidth) {
     //       this.qp = false