diff --git a/back/public/index.html b/back/public/index.html index 17d1b9da..fba74530 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ diff --git a/back/src/assets/img/putOnTheShelf/del.png b/back/src/assets/img/putOnTheShelf/del.png new file mode 100644 index 00000000..643446b2 Binary files /dev/null and b/back/src/assets/img/putOnTheShelf/del.png differ diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 4e4d4ee8..661f116b 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -27,6 +27,13 @@ >挂接 + + 上架 + + + 智能算法 + 图层服务 + 开发组件 + 业务组件 + + 取 消 + 确 定 + + + + + + 取 消 + 确 定 + + @@ -135,10 +171,28 @@ import AddOrUpdate from './bsabilityai-add-or-update' import dictionaries from '@/utils/dictionaries' import qs from 'qs' import RelateApplication from './bsabilityai-relate-application.vue' +import putOnTheShelf from '@/views/modules/putOnTheShelf' export default { mixins: [mixinViewModule], data () { return { + insertList: [], + putOnTheShelfList: [], + radio: '', + showPutOnTheShelfFlag: false, + showPutOnTheShelfFlag2: false, + submitFrom: { + type: '组件服务', + deptId: '', + delFlag: 0, + infoList: [ + { + attrType: '组件类型', + attrValue: '', + delFlag: 0 + } + ] + }, mixinViewModuleOptions: { getDataListURL: '/resource/page', getDataListIsPage: true, @@ -170,7 +224,8 @@ export default { watch: {}, components: { AddOrUpdate, - RelateApplication + RelateApplication, + putOnTheShelf }, created () { this.dataForm.name = '' @@ -181,6 +236,10 @@ export default { this.fullScreen() }, methods: { + changeInfoList (obj) { + this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType) + this.submitFrom.infoList.push(obj) + }, reset () { this.$http .get( @@ -343,6 +402,40 @@ export default { // 是否展示关联应用弹窗 handleIsShowRelatePopup (type) { this.relateApplicationVisible = type + }, + // 新挂载 + clear () { + this.showPutOnTheShelfFlag = false + this.showPutOnTheShelfFlag2 = false + this.radio = '' + this.submitFrom = { + type: '组件服务', + deptId: '', + delFlag: 0, + infoList: [ + { + attrType: '组件类型', + attrValue: '', + delFlag: 0 + } + ] + } + }, + showPutOnTheShelf () { + this.showPutOnTheShelfFlag = true + this.$http.get('/category/getCategoryTree').then(res => { + this.insertList = res.data.data.filter(item => item.name === '组件服务一')[0] + }) + }, + showPutOnTheShelfVue () { + this.showPutOnTheShelfFlag = false + this.showPutOnTheShelfFlag2 = true + this.submitFrom.infoList[0].attrValue = this.radio + this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children + console.log('radio', this.radio) + }, + submitData () { + console.log('表单数据=================>', this.submitFrom, this.putOnTheShelfList) } } } @@ -351,7 +444,7 @@ export default { .el-tooltip__popper { max-width: 50%; } -::v-deep .el-table .cell{ +::v-deep .el-table .cell { width: 200px; } diff --git a/back/src/views/modules/bscatalogue/ManagementPop.vue b/back/src/views/modules/bscatalogue/ManagementPop.vue index faab5067..dfbbfdf2 100644 --- a/back/src/views/modules/bscatalogue/ManagementPop.vue +++ b/back/src/views/modules/bscatalogue/ManagementPop.vue @@ -6,130 +6,206 @@ * @Description: 编目弹窗 --> - diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue new file mode 100644 index 00000000..22561ec1 --- /dev/null +++ b/back/src/views/modules/components/upload/index.vue @@ -0,0 +1,96 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue new file mode 100644 index 00000000..0da3a386 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue new file mode 100644 index 00000000..3c0a1ed3 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue new file mode 100644 index 00000000..6f936524 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/CommentModeration.vue b/back/src/views/modules/hasToDoTasks/CommentModeration.vue new file mode 100644 index 00000000..2de57bdc --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/CommentModeration.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue new file mode 100644 index 00000000..1cf2d2b5 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/myAgent/AbilityResourceShelf.vue b/back/src/views/modules/myAgent/AbilityResourceShelf.vue new file mode 100644 index 00000000..39410b15 --- /dev/null +++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue new file mode 100644 index 00000000..1a1154ed --- /dev/null +++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue new file mode 100644 index 00000000..245903a5 --- /dev/null +++ b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/CommentModeration.vue b/back/src/views/modules/myAgent/CommentModeration.vue new file mode 100644 index 00000000..d592773a --- /dev/null +++ b/back/src/views/modules/myAgent/CommentModeration.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue new file mode 100644 index 00000000..5681064c --- /dev/null +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -0,0 +1,273 @@ + + + + diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue new file mode 100644 index 00000000..1c72aebe --- /dev/null +++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue @@ -0,0 +1,177 @@ + + + + diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue new file mode 100644 index 00000000..35c138ab --- /dev/null +++ b/back/src/views/modules/putOnTheShelf/components/special.vue @@ -0,0 +1,311 @@ + + + + diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue new file mode 100644 index 00000000..12f9d511 --- /dev/null +++ b/back/src/views/modules/putOnTheShelf/index.vue @@ -0,0 +1,212 @@ + + + + diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index 98acdc7a..75368b2d 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -28,108 +28,108 @@ \ No newline at end of file + diff --git a/front/public/index.html b/front/public/index.html index 8ad43c42..6912706a 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-06 18:44:35 + * @LastEditTime: 2022-07-09 10:36:03 * @Description: 告诉大家这是什么 --> @@ -28,10 +28,10 @@ diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue index 135cff66..81ad5792 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue @@ -2,17 +2,34 @@ diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue index b63bb510..6a5816ae 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue @@ -18,9 +18,15 @@

- {{ props.dataList.type }} - {{ props.dataList.shareType }} - {{ props.dataList.shareCondition }} + + {{ props.dataList.type }} + + + {{ props.dataList.shareType }} + + + {{ props.dataList.shareCondition }} +

diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue index 6a919c09..ca179210 100644 --- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue +++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue @@ -18,11 +18,15 @@

- - {{ componentType || props.dataList.type }} + + {{ props.dataList.type }} + + + {{ props.dataList.shareType }} + + + {{ props.dataList.shareCondition }} - {{ props.dataList.shareType }} - {{ props.dataList.shareCondition }}

@@ -59,215 +63,216 @@ diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 053d6e75..06a2f533 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -2,7 +2,10 @@
- +
@@ -84,281 +87,297 @@ diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue index 0655035e..fd75008e 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue @@ -18,11 +18,15 @@

- - {{ componentType || props.dataList.type }} + + {{ props.dataList.type }} + + + {{ props.dataList.shareType }} + + + {{ props.dataList.shareCondition }} - {{ props.dataList.shareType }} - {{ props.dataList.shareCondition }}

diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue index b0e395c3..b0585b8f 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -8,7 +8,12 @@