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

back/src/mixins/view-module.js

@@ -20,13 +20,10 @@ export default {
             flag: false,
             time: null,
             // 默认属性
-      dataForm: {
-      },               // 查询条件
-      dataList: [
-        {
+            dataForm: {}, // 查询条件
+            dataList: [{
                 infoList: []
-        }
-      ],               // 数据列表
+            }], // 数据列表
             order: '', // 排序，asc／desc
             orderField: '', // 排序，字段
             page: 1, // 当前页码
@@ -73,19 +70,35 @@ export default {
                 this.dataList.map((item, index) => {
                         if (this.dataList[index].type != null) {
                             switch (item.type) {
-              case 1: this.dataList[index].type = '省'; break
-              case 2: this.dataList[index].type = '市'; break
-              case 3: this.dataList[index].type = '区'; break
-              case 4: this.dataList[index].type = '企业'; break
+                                case 1:
+                                    this.dataList[index].type = '省';
+                                    break
+                                case 2:
+                                    this.dataList[index].type = '市';
+                                    break
+                                case 3:
+                                    this.dataList[index].type = '区';
+                                    break
+                                case 4:
+                                    this.dataList[index].type = '企业';
+                                    break
                             }
                         }
                         if (item.children != null) {
                             item.children.map((item2, index2) => {
                                 switch (item2.type) {
-                case 1: this.dataList[index].children[index2].type = '省'; break
-                case 2: this.dataList[index].children[index2].type = '市'; break
-                case 3: this.dataList[index].children[index2].type = '区'; break
-                case 4: this.dataList[index].children[index2].type = '企业'; break
+                                    case 1:
+                                        this.dataList[index].children[index2].type = '省';
+                                        break
+                                    case 2:
+                                        this.dataList[index].children[index2].type = '市';
+                                        break
+                                    case 3:
+                                        this.dataList[index].children[index2].type = '区';
+                                        break
+                                    case 4:
+                                        this.dataList[index].children[index2].type = '企业';
+                                        break
                                 }
                             })
                         }
@@ -116,6 +129,14 @@ export default {
                     this.dataList.map(val => {
                         val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
                     })
+                } else if (this.dataList[0].type === '应用系统') {
+                    this.dataList.forEach((item) => {
+                        item.belongProject = "城市信息模型";
+                        item.belongSystem = "信息模型技术平台";
+                    });
+                    this.dataList.map(val => {
+                        val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
+                    })
                 }
                 if (this.mixinViewModuleOptions.requestCallback) {
                     this.mixinViewModuleOptions.requestCallback(res.data)

back/src/views/modules/ability/bsabilityai-relate-application.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :visible.sync="visible"
-      title="关联应用"
+      title="关联标签"
       @close="close"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -13,7 +13,7 @@
           v-model="transferValue"
           filterable
           :filter-method="filterMethod"
-          filter-placeholder="请输入应用名称"
+          filter-placeholder="请输入标签名称"
           :titles="nameArray"
           :props="{
             key: 'id',
@@ -24,7 +24,7 @@
       </div>
       <template slot="footer">
         <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
-        <el-button type="primary" @click="confirmSubmitHandle()">{{
+        <el-button type="primary" @click="visible = false">{{
           $t("confirm")
         }}</el-button>
       </template>
@@ -42,6 +42,140 @@ export default {
       visible: true,
       transferData: [], //穿梭框所有数据
       transferValue: [], //已关联的数据id
+      linkedData:[
+    {
+        id: "1534805370156834818",
+        dictTypeId: "1534805229031088130",
+        name: "视频类",
+        dictValue: "1",
+        remark: "",
+        sort: 0,
+        createDate: "2022-06-09 15:51:30",
+        updateDate: "2022-07-01 14:20:04",
+        status: 1
+    },
+    {
+        id: "1536670196898336769",
+        dictTypeId: "1534805229031088130",
+        name: "图片类",
+        dictValue: "2",
+        remark: "",
+        sort: 1,
+        createDate: "2022-06-14 19:21:40",
+        updateDate: "2022-07-01 14:20:27",
+        status: 1
+    },
+    {
+        id: "1534805309289095170",
+        dictTypeId: "1534805229031088130",
+        name: "文本类",
+        dictValue: "3",
+        remark: "",
+        sort: 2,
+        createDate: "2022-06-09 15:51:16",
+        updateDate: "2022-07-01 14:19:52",
+        status: 1
+    },
+    {
+        id: "1542753737822306305",
+        dictTypeId: "1534805229031088130",
+        name: "语音类",
+        dictValue: "4",
+        remark: "",
+        sort: 3,
+        createDate: "2022-07-01 14:15:29",
+        updateDate: "2022-07-01 14:15:29",
+        status: 1
+    },
+    {
+        id: "1536670305505644545",
+        dictTypeId: "1534805229031088130",
+        name: "其他",
+        dictValue: "5",
+        remark: "",
+        sort: 4,
+        createDate: "2022-06-14 19:22:05",
+        updateDate: "2022-07-01 14:15:11",
+        status: 1
+    }
+],//已关联标签
+ labelData:[{
+        id: "1513714443263451137",
+        dictTypeId: "1513714403530809346",
+        name: "接口",
+        dictValue: "1",
+        remark: "",
+        sort: 1,
+        createDate: "2022-04-12 11:03:41",
+        updateDate: "2022-04-12 11:03:41",
+        status: 1
+    },
+    {
+        id: "1513714474334855170",
+        dictTypeId: "1513714403530809346",
+        name: "SDK",
+        dictValue: "2",
+        remark: "",
+        sort: 2,
+        createDate: "2022-04-12 11:03:49",
+        updateDate: "2022-04-12 11:03:49",
+        status: 1
+    },
+    {
+        id: "1513714504261214210",
+        dictTypeId: "1513714403530809346",
+        name: "Web页面",
+        dictValue: "3",
+        remark: "",
+        sort: 3,
+        createDate: "2022-04-12 11:03:56",
+        updateDate: "2022-04-12 11:03:56",
+        status: 1
+    },
+    {
+        id: "1513714541603102722",
+        dictTypeId: "1513714403530809346",
+        name: "其他",
+        dictValue: "99",
+        remark: "",
+        sort: 99,
+        createDate: "2022-04-12 11:04:05",
+        updateDate: "2022-04-12 11:04:05",
+        status: 1
+    }, {
+        id: "1539453444552638466",
+        dictTypeId: "1539453183746621441",
+        name: "视频资源",
+        dictValue: "1",
+        remark: "",
+        sort: 0,
+        createDate: "2022-06-22 11:41:18",
+        updateDate: "2022-06-22 11:41:18",
+        status: 1
+    },
+    {
+        id: "1539453481407987714",
+        dictTypeId: "1539453183746621441",
+        name: "感知资源",
+        dictValue: "2",
+        remark: "",
+        sort: 0,
+        createDate: "2022-06-22 11:41:26",
+        updateDate: "2022-06-22 11:41:26",
+        status: 1
+    },
+    {
+        id: "1539453516610781185",
+        dictTypeId: "1539453183746621441",
+        name: "云资源",
+        dictValue: "3",
+        remark: "",
+        sort: 0,
+        createDate: "2022-06-22 11:41:35",
+        updateDate: "2022-06-22 11:41:35",
+        status: 1
+    }
+    ]
     };
   },
   props: {
@@ -51,7 +185,7 @@ export default {
     },
     nameArray: {
       type: Array,
-      default: ["未关联应用名称", "已关联应用名称"],
+      default: ["未关联标签名称", "已关联标签名称"],
     },
   },
   computed: {},
@@ -86,16 +220,15 @@ export default {
     },
   },
   mounted() {
-    if (this.relateInfo && this.relateInfo.responseData) {
-      const alreadLinkedArr = this.relateInfo.responseData.alreadLinked || [];
+     if (this.relateInfo) {
+       const alreadLinkedArr = this.linkedData;
        this.transferData = alreadLinkedArr.concat(
-        this.relateInfo.responseData.notLinked || []
+         this.labelData
        );
          alreadLinkedArr.length &&
          alreadLinkedArr.forEach((item) => {
            this.transferValue.push(item.id);
-        });
-    }
+         }); } 
   },
 };
 </script>

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

@@ -73,14 +73,14 @@
         ></el-table-column>
          <el-table-column
           :show-overflow-tooltip="true"
-          prop="deptName"
+          prop="belongProject"
           label="归属项目"
           header-align="center"
           align="center"
         ></el-table-column>
          <el-table-column
           :show-overflow-tooltip="true"
-          prop="deptName"
+          prop="belongSystem"
           label="归属系统"
           header-align="center"
           align="center"
@@ -303,10 +303,16 @@ export default {
             orderType: 'DESC',
             pageNum: this.currentPage,
             pageSize: 10,
-            type: '组件服务',
+            type: 'GIS图层',
           };
        this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
           this.dataList = res.data.data.records;
+          if(this.dataList.length>0){
+            this.dataList.forEach((item)=>{
+              item.belongProject = "城市信息模型";
+              item.belongSystem = "信息模型技术平台";
+            });
+          }
           this.total = parseInt(res.data.data.total);
         }) 
     },

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

@@ -75,14 +75,14 @@
         ></el-table-column>
          <el-table-column
           :show-overflow-tooltip="true"
-          prop="deptName"
+          prop="belongProject"
           label="归属项目"
           header-align="center"
           align="center"
         ></el-table-column>
          <el-table-column
           :show-overflow-tooltip="true"
-          prop="deptName"
+          prop="belongSystem"
           label="归属系统"
           header-align="center"
           align="center"
@@ -222,18 +222,18 @@ export default {
         creator: '',
         selectType: 0,
         delFlag: 0,
-        type: '应用资源'
+        type: '应用系统'
       },
       qp: false,
       relateApplicationResourceVisible: false,
       relationData: {}, // 打开穿梭框时传递的参数
       topNameArray: [], //
-      radio: '应用资源',
+      radio: '应用系统',
       insertList: [],
       putOnTheShelfList: [],
       showPutOnTheShelfFlag2: false,
       submitFrom: {
-        type: '应用资源',
+        type: '应用系统',
         deptId: '',
         delFlag: 0,
         infoList: [
@@ -244,7 +244,7 @@ export default {
           // }
         ]
       },
-      typeInput: '应用资源'
+      typeInput: '应用系统'
     }
   },
   watch: {},
@@ -255,7 +255,7 @@ export default {
   },
   created () {
     this.dataForm.name = ''
-    this.dataForm.type = '应用资源'
+    this.dataForm.type = '应用系统'
   },
   mounted () {
     // window.addEventListener('resize', this.a)
@@ -276,7 +276,7 @@ export default {
               limit: 10,
               delFlag: 0,
               creator: '',
-              type: '应用资源',
+              type: '应用系统',
               name: ''
             })
         )
@@ -292,7 +292,13 @@ export default {
             : res.data 
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
-            : 0
+            : 0;
+          if(this.dataList.length>0){
+            this.dataList.forEach((item)=>{
+              item.belongProject = "城市信息模型";
+              item.belongSystem = "信息模型技术平台";
+            });
+          }
           if (this.mixinViewModuleOptions.requestCallback) {
             this.mixinViewModuleOptions.requestCallback(res.data)
           }
@@ -351,7 +357,7 @@ export default {
                 // type: '组件服务',
                 pageNum: 1,
                 pageSize: this.limit,
-                type: '应用资源',
+                type: '应用系统',
                 creator: '',
                 selectType: 0,
                 delFlag: 0,
@@ -453,7 +459,7 @@ export default {
             linkType: '1',
             responseData: res.data
           }
-          this.topNameArray = ['未关联组件名称', '已关联组件名称']
+          this.topNameArray = ['未关联标签名称', '已关联标签名称']
           console.log(' this.relationData', this.relationData)
           // 将数据传递给引入的组件
         })
@@ -526,9 +532,9 @@ export default {
       this.showPutOnTheShelfFlag2 = false
       this.insertList = []
       this.putOnTheShelfList = []
-      this.radio = '应用资源'
+      this.radio = '应用系统'
       this.submitFrom = {
-        type: '应用资源',
+        type: '应用系统',
         deptId: '',
         delFlag: 0,
         infoList: [
@@ -719,8 +725,8 @@ export default {
     UpdateData (item) {
       this.$http.get('/category/getCategoryTree').then(res => {
         this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
-        this.radio = '应用资源'
-        // this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue
+        this.radio = '应用系统'
+        // this.radio = item.infoList.filter(val => val.attrType === '应用系统')[0].attrValue
         this.putOnTheShelfList = this.insertList.children
         // this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
         this.putOnTheShelfList.map(parent => {

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

@@ -70,20 +70,6 @@
           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"
@@ -303,7 +289,7 @@ export default {
             orderType: 'DESC',
             pageNum: this.currentPage,
             pageSize: 10,
-            type: '组件服务',
+            type: 'GIS图层',
           };
        this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
           this.dataList = res.data.data.records;

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

@@ -293,7 +293,7 @@ export default {
             orderType: 'DESC',
             pageNum: this.currentPage,
             pageSize: 10,
-            type: '组件服务',
+            type: 'GIS图层',
           };
        this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
           this.dataList = res.data.data.records;