diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue index 5e713d2b..e6ddedec 100644 --- a/back/src/views/modules/ability/IntegratedServices-add.vue +++ b/back/src/views/modules/ability/IntegratedServices-add.vue @@ -53,10 +53,8 @@
组合能力
- + :modalType="modalType" ref="jcssDom"> v.attrType == '服务图片') || {}; this.imageUrl = _imgObj.attrValue; + + // 组合能力 + Object.keys(this.getListParams).map(k => { + let arr = data.fuseResourceList.filter(v => v.type == k); + let arr2 = []; + arr.map(v => { + arr2.push(v.resourceId) + }) + this.abilityListObj[k] = arr2 + }) + console.log('this.dataForm----详情-------->', this.dataForm); }) }, @@ -287,14 +296,10 @@ export default { file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png' - // const isLt2M = file.size / 1024 / 1024 < 2 if (!isImage) { this.$message.error('上传头像图片只能是 jpg/png 格式!') } - // if (!isLt2M) { - // this.$message.error('上传头像图片大小不能超过 2MB!') - // } return isImage }, addUploadRemoveFile(file, fileList) { @@ -306,14 +311,9 @@ export default { file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png' - // const isLt2M = file.size / 1024 / 1024 < 2 - if (!isImage) { this.$message.error('上传头像图片只能是 jpg/png 格式!') } - // if (!isLt2M) { - // this.$message.error('上传头像图片大小不能超过 2MB!') - // } return isImage }, editUploadRemoveFile(file, fileList) { diff --git a/back/src/views/modules/ability/IntegratedServices.vue b/back/src/views/modules/ability/IntegratedServices.vue index 093f4156..e18a939b 100644 --- a/back/src/views/modules/ability/IntegratedServices.vue +++ b/back/src/views/modules/ability/IntegratedServices.vue @@ -55,8 +55,8 @@ import qs from "qs"; import { type } from "os"; export const tableColumns = { - 'name': '融合服务名称', - 'description': '融合服务描述', + 'name': '名称', + 'description': '描述', 'applicationArea': '应用领域', } @@ -140,7 +140,7 @@ export default { }, // 详情 showDetail(val) { - window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id) + window.open(window.SITE_CONFIG.previewUrl + '#/packagingDetails?id=' + val.id) }, // showDocument(val) { // console.log(val); diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue index d093a402..beb88688 100644 --- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue +++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue @@ -62,7 +62,7 @@ 组合能力 + :modalType="modalType" ref="jcssDom"> ', this.dataForm); this.$http [methodsObj[this.modalType]]("/fuse", _obj) .then(({ data: res }) => { @@ -360,14 +362,24 @@ export default { ), // 详情 getDetail(data) { + console.log('data---详情--------->', data); this.dataForm = data; this.$nextTick(() => { for (const key in this.refsParseArray) { this.$refs[key] && this.$refs[key].getDataInfo && this.$refs[key].getDataInfo(data) } let _imgObj = data.fuseAttrList.find(v => v.attrType == '服务图片') || {}; - this.imageUrl = _imgObj.attrValue - console.log('this.dataForm----详情-------->', this.dataForm); + this.imageUrl = _imgObj.attrValue; + + // 组合能力--特殊处理 + Object.keys(this.getListParams).map(k => { + let arr = data.fuseResourceList.filter(v => v.type == k); + let arr2 = []; + arr.map(v => { + arr2.push(v.resourceId) + }) + this.abilityListObj[k] = arr2 + }) }) }, handleAvatarSuccess(res, file) { @@ -381,14 +393,9 @@ export default { file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png' - // const isLt2M = file.size / 1024 / 1024 < 2 - if (!isImage) { this.$message.error('上传头像图片只能是 jpg/png 格式!') } - // if (!isLt2M) { - // this.$message.error('上传头像图片大小不能超过 2MB!') - // } return isImage }, addUploadRemoveFile(file, fileList) { @@ -400,14 +407,10 @@ export default { file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png' - // const isLt2M = file.size / 1024 / 1024 < 2 if (!isImage) { this.$message.error('上传头像图片只能是 jpg/png 格式!') } - // if (!isLt2M) { - // this.$message.error('上传头像图片大小不能超过 2MB!') - // } return isImage }, editUploadRemoveFile(file, fileList) { @@ -419,7 +422,6 @@ export default { return this.$message.error(res.msg) } this.imageUrl = res.data - // this.imageUrl = URL.createObjectURL(file.raw); }, }, beforeDestroy() { diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue index 6c78daa0..bf8d6c71 100644 --- a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue +++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue @@ -2,7 +2,8 @@
{{ type }}
- 添加 + {{ modalType == 'add' ? '添加' : '编辑' }} +
@@ -34,8 +35,8 @@
关键词
- + 搜索 @@ -59,8 +60,8 @@ - @@ -75,7 +76,7 @@ - +
@@ -98,6 +99,10 @@ export default { type: String, default: "基础设施" }, + modalType: { + type: String, + default: 'add' + } }, data() { const getYunList = () => { @@ -109,9 +114,7 @@ export default { return { showKey: 0, showModal: false, - transferData: [], // 穿梭框所有数据 selectedArray: [], // 已选择的数据id - allData: [], displayList: [], // 用于展示的list btnList: ['视频资源', '云资源', '感知资源'], showText: { @@ -133,35 +136,41 @@ export default { list: [] }, ], - activeBtn: '视频资源', - checkList: [], currentList: [], dataListLoading: false, dataList: [], pageData: { - limit: 10, - page: 1, total: 0, }, cameraName: '', + postData: {}, + activeBtn: '视频资源', + checkList: [], + searchData: { + cameraName: '', + pageSize: 10, + pageNum: 1, + parentId: '' + }, + dataFormCopy: {} } }, watch: { async showModal(newVal) { if (newVal) { - await this.getData(); // 默认选中复选框 this.$nextTick(() => { this.selectCheckbox() }) + if (this.modalType == 'add') { + this.clear() + } } } }, mounted() { // 获取视频资源 this.getVideoBtn() - // 获取列表 - this.getData() }, methods: { selectCheckbox() { @@ -176,24 +185,24 @@ export default { }) if (list.length) { list.forEach((row) => { - this.$refs.dataTable.toggleRowSelection(row, true) + this.$refs.dataTable && this.$refs.dataTable.toggleRowSelection(row, true) }) } } }, + showAction() { + this.showModal = true; + }, + // 详情 async getDataInfo(dataForm) { + this.modalType == 'edit' + this.dataFormCopy = dataForm; await this.getVideoBtn(); - await this.getData(); let arr = []; let attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type); if (attrValue.length > 0) { attrValue.map(val => { - let item = this.dataList.find(v => v.idtCameraChannel == val.resourceId) || {}; - let _obj = { - type: val.type, - idtCameraChannel: val.resourceId, - name: item.channelName - }; + let _obj = Object.assign({}, val, val.resource) arr.push(_obj); }); } @@ -201,28 +210,31 @@ export default { this.displayList = JSON.parse(JSON.stringify(arr)); // 已选中 this.selectedArray = arr.map(v => v.idtCameraChannel); - }, - handleShowModal() { - this.showModal = true; + this.dataList = JSON.parse(JSON.stringify(arr)); + this.pageData.total = arr.length; + // 默认选中复选框 + this.$nextTick(() => { + this.selectCheckbox() + }) }, // 点击复选框 dataListSelectionChangeHandle(data) { this.selectedArray = data; }, - pageCurrentChangeHandle(page) { - this.pageData.page = page; + pageCurrentChangeHandle(pageNum) { + this.searchData.pageNum = pageNum; this.getData() }, - pageSizeChangeHandle(limit) { - this.pageData.limit = limit; + pageSizeChangeHandle(pageSize) { + this.searchData.pageSize = pageSize; this.getData() }, changeBtn(btn) { this.activeBtn = btn; + this.currentList = this.tabData.find(v => v.tabName == btn).list || []; this.checkList = []; - this.cameraName = ''; + this.searchData.cameraName = ''; this.getData() - this.currentList = this.tabData.find(v => v.tabName == btn).list || [] }, // 获取视频标签列表 getVideoBtn() { @@ -234,7 +246,12 @@ export default { } this.tabData[0].list = res.data.data || []; - this.changeBtn(this.activeBtn) + this.$nextTick(() => { + this.currentList = this.tabData.find(v => v.tabName == this.activeBtn).list || []; + if (this.modalType == 'add') { + this.clear() + } + }) }).catch(err => { reject(err) this.$message.error(err); @@ -255,23 +272,19 @@ export default { } else { this.checkList.push(item.labelCode) } - console.log('this.checkList------------>', this.checkList); - this.getData() + this.$nextTick(() => { + this.getData() + }) }, // 获取列表 - getData(parentId = '') { - this.allData = []; - let postData = { - parentId: parentId, - cameraName: this.cameraName, + getData() { + let postData = Object.assign({}, { checkStatus: 1, - pageNum: this.pageData.page, - pageSize: this.pageData.limit, gpsX: '', gpsY: '', radius: '', labelCodes: this.checkList.join(), - } + }, this.searchData); return new Promise((resolve, reject) => { this.$http.get('/api/project/selectByParentIdNew', { params: postData }).then(res => { resolve(res) @@ -285,10 +298,9 @@ export default { this.$message.error(err); }) }) - }, changeParentId(parentId) { - console.log('parentId------------>', parentId); + this.searchData.parentId = parentId; this.getData(parentId) }, confirmSubmitHandle() { @@ -301,7 +313,7 @@ export default { this.dataList.map(v => { if (idtCameraChannelArray.includes(v.idtCameraChannel)) { this.displayList.push({ - name: v.channelName + channelName: v.channelName }) } }) @@ -312,16 +324,12 @@ export default { }, close() { this.showModal = false; - this.cameraName = '' + this.searchData.cameraName = '' this.selectedArray = []; - this.allData = []; - this.transferData = []; this.$emit('closeModal'); }, clear() { - this.cameraName = '' - this.selectedArray = []; - this.getData() + this.changeBtn('视频资源') }, } diff --git a/back/src/views/modules/ability/assignedScene/index.vue b/back/src/views/modules/ability/assignedScene/index.vue index ba8ad18c..ecd31677 100644 --- a/back/src/views/modules/ability/assignedScene/index.vue +++ b/back/src/views/modules/ability/assignedScene/index.vue @@ -130,7 +130,7 @@ export default { }, // 详情 showDetail(val) { - window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id) + window.open(window.SITE_CONFIG.previewUrl + '#/integrationServicesDetails?id=' + val.id) }, fullScreen() { if (window.outerHeight === screen.availHeight) { diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 1cf82d5d..41bbff3c 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -129,13 +129,13 @@ width="150" > - - -
-
-
- -
- {{ item.name || '--' }} -
- -
-
-
- + @@ -149,8 +136,8 @@ let keyObj = { nameKey: 'zyname' }, '组件服务': { - idKey: 'zycode', - nameKey: 'zyname' + idKey: 'id', + nameKey: 'name' }, } @@ -204,15 +191,15 @@ export default { let attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type); if (attrValue.length > 0) { attrValue.map(val => { - let item = this.allData.find(v => v.id == val.resourceId) || {}; let _obj = { type: val.type, id: val.resourceId, - name: item.name + name: val.resource && val.resource.name }; arr.push(_obj); }); } + // 展示 this.displayList = JSON.parse(JSON.stringify(arr)); // 已选中 @@ -223,27 +210,17 @@ export default { }, // 获取列表 getData() { - // this.allData = []; - // this.transferData = []; - // let arr = JSON.parse(JSON.stringify(sjzyArray)); - // arr.map(v => { - // this.transferData.push({ - // type: this.type, - // id: v[keyObj[this.type].idKey], - // name: v[keyObj[this.type].nameKey] || "--" - // }); - // }); - // this.allData = JSON.parse(JSON.stringify(this.transferData)); - // return; if (this.getDataParams.url === '') { return; } - this.$http[this.getDataParams.methods](this.getDataParams.url, this.getDataParams.postData).then(res => { + this.$http[this.getDataParams.methods](this.getDataParams.url, { + params: this.getDataParams.postData + }).then(res => { console.log('res.data----获取列表-------->', res.data); if (res.data.code !== 0) { return this.$message.error(res.msg); } - this.transferData = []; // allData + this.transferData = []; this.allData = []; (res.data.data || []).map(v => { this.transferData.push({ diff --git a/back/src/views/modules/activiti/RoomExamineAdmin.vue b/back/src/views/modules/activiti/RoomExamineAdmin.vue new file mode 100644 index 00000000..ac6de099 --- /dev/null +++ b/back/src/views/modules/activiti/RoomExamineAdmin.vue @@ -0,0 +1,330 @@ + + + diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue index 0da3a386..9733e857 100644 --- a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue +++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue @@ -86,11 +86,8 @@ width="150" > diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue index 3c0a1ed3..1b54ab9b 100644 --- a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue +++ b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue @@ -86,11 +86,8 @@ width="150" > diff --git a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue index 6f936524..be222352 100644 --- a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue +++ b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue @@ -86,11 +86,8 @@ width="150" > diff --git a/back/src/views/modules/hasToDoTasks/CommentModeration.vue b/back/src/views/modules/hasToDoTasks/CommentModeration.vue index 2de57bdc..cbb0d0fb 100644 --- a/back/src/views/modules/hasToDoTasks/CommentModeration.vue +++ b/back/src/views/modules/hasToDoTasks/CommentModeration.vue @@ -86,11 +86,8 @@ width="150" > diff --git a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue index 1cf2d2b5..d91d7604 100644 --- a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue +++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue @@ -86,11 +86,8 @@ width="150" > diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue new file mode 100644 index 00000000..547c02ea --- /dev/null +++ b/back/src/views/modules/myAgent/ConferenceRoom.vue @@ -0,0 +1,381 @@ + + + diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index fdbd870c..9dff6741 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -48,14 +48,14 @@ {{ dataForm.content.applicationBackground || '--' }}

-

+ + diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index 4dae6e13..04adfb58 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -167,7 +167,8 @@ export default { .dynamic-box { width: 770px; - height: 335px; + height: 285px; + position: relative; } .dynamicView { @@ -223,6 +224,9 @@ export default { width: 100%; color: #2b2b2b; font-size: 14px; + position: absolute; + right: 15px; + bottom: 10px; } .recommendView { diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index a8645c48..e72e18a3 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -1,56 +1,111 @@ + + diff --git a/front/src/views/capacitySquare/components/application.vue b/front/src/views/capacitySquare/components/application.vue new file mode 100644 index 00000000..b21d5686 --- /dev/null +++ b/front/src/views/capacitySquare/components/application.vue @@ -0,0 +1,271 @@ + + + + diff --git a/front/src/views/capacitySquare/components/layer.vue b/front/src/views/capacitySquare/components/layer.vue new file mode 100644 index 00000000..d7402c30 --- /dev/null +++ b/front/src/views/capacitySquare/components/layer.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/front/src/views/capacitySquare/index.vue b/front/src/views/capacitySquare/index.vue new file mode 100644 index 00000000..dddb0bb7 --- /dev/null +++ b/front/src/views/capacitySquare/index.vue @@ -0,0 +1,118 @@ + + + + diff --git a/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue b/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue index 6542e3f3..4fe3a7ff 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue @@ -10,7 +10,7 @@

{{ itemSonTitle.name }} @@ -29,12 +30,20 @@
-