From 94dad9ec77734e256d178880408fb254bde6fee6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 15:17:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/changeExtensionModel.vue | 2 +- .../projectLibrary/index.vue | 27 ++++++++++++++++++- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0e8ba619b..bb486614c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1324,4 +1324,6 @@ module.exports = { softwareVersion:'Software version', versionStatistics:'Version statistics', addSubproject:'Add Subproject', + Topping:'Topping', + cancelTopping:'Cancel Topping', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2aa54842d..b9960edde 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1425,4 +1425,6 @@ module.exports = { softwareVersion:'软件版本', versionStatistics:'版本统计', addSubproject:'添加子项目', + Topping:'置顶', + cancelTopping:'取消置顶', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue index a7734d0bd..47ffd5479 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue @@ -100,7 +100,7 @@ editModel(value) { this.visible = true this.formInline = {} - this.formInline.id = value.id + this.formInline.id = value.parentId || value.id if (!value.versionLast) { this.formInline.projectVersion = '01' } else if (value.versionLast) { diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 27b7cb97b..78717c720 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -129,6 +129,11 @@ + + {{record.flag == '1'?$t('cancelTopping'):$t('Topping')}} + {{$t('addSubproject')}} @@ -254,7 +259,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 160, + width: 252, scopedSlots: { customRender: 'operation' } } ], @@ -271,6 +276,26 @@ handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, + toppingClick(row) { + let flag = '' + if (row.flag == '1') { + flag = '0' + } else { + flag = '1' + } + let query = { + flag: flag, + id: row.id + } + getAction('/project/projectLibraryBase/top', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, changeExtensionClick(val) { this.$refs.changeExtensionModelRef.editModel(JSON.parse(JSON.stringify(val))) },