diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bb486614c..1b443d691 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -786,6 +786,7 @@ module.exports = { parameter: 'Parameter', changeExtension: 'Change Extension', addDetailList: 'Add', + editDetailList:'Edit DetailList', detailedList: 'DetailedList', copyParamDetailList: 'Copy Parameter List', collectionCompletionTime: 'Collection Completed', @@ -1321,9 +1322,10 @@ module.exports = { secondaryDirectory:'Secondary directory', OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected', projectVersion:'Project Version', - softwareVersion:'Software version', + softwareVersion:'Authentication Software version', versionStatistics:'Version statistics', addSubproject:'Add Subproject', Topping:'Topping', cancelTopping:'Cancel Topping', + relatedProjectVersion:'Related project version', } \ 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 b9960edde..dce5f85ad 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -802,6 +802,7 @@ module.exports = { parameter: '参数', changeExtension: '变更扩展', addDetailList: '添加清单', + editDetailList:'编辑清单', detailedList: '清单', copyParamDetailList: '复制参数清单', collectionCompletionTime: '收集完成时间', @@ -1422,9 +1423,10 @@ module.exports = { secondaryDirectory:'二级目录', OnlyPersonsCanBeSelected:'超出最大上限;最多只能选择100个人员', projectVersion:'项目版本', - softwareVersion:'软件版本', + softwareVersion:'认证软件版本', versionStatistics:'版本统计', addSubproject:'添加子项目', Topping:'置顶', cancelTopping:'取消置顶', + relatedProjectVersion:'相关项目版本', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 49f49a182..f3e6b97fc 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -84,13 +84,21 @@ /> - + - + @@ -98,14 +106,23 @@ - + - + @@ -155,6 +172,13 @@ ellipsis: true, dataIndex: 'paramsTemplateName' }, + { + title: this.$t('relatedProjectVersion'), + align: 'center', + width: 120, + ellipsis: true, + dataIndex: 'projectVersion' + }, { title: this.$t('collectionCompletionTime'), align: 'center', @@ -218,6 +242,7 @@ selectedRowKeysArray: '', templatetitle: '', templatetitleId: '', + areaTitle:'', rowId: '', version: 0, itemId: '', // 配置id @@ -303,12 +328,12 @@ this.$refs.configureRef.addModel(item.id, item) }, handleCancel(val) { - this.areaVisible = val + this.areaVisible = false this.getlist() }, // 项目收集参数 drawerhandleCancel(val) { - this.drawerVisible = val + this.drawerVisible = false }, copysubmit() { this.drawerVisible = false @@ -330,11 +355,13 @@ }, edit(edit) { this.areaVisible = true + this.areaTitle = this.$t('editDetailList') setTimeout(() => { this.$refs.templateRef.editData(edit) }, 50) }, handleAdd() { + this.areaTitle = this.$t('addDetailList') this.areaVisible = true }, // 变更扩展 diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index a4151bd78..f8818d1c4 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -10,21 +10,78 @@ :wrapper-col='wrapperCol' > - - - - + +
+
+ * + {{$t('title')}} +
+ + + + + + + + + + +
+ + + + + +
+ +
+
+ {{$t('relatedProjectVersion')}} +
+ + + + + + {{ item }} + + + + +
+ + +
+
+ {{$t('explain')}} +
+ + + +
+
+
-
+
{{$t('zoneOfApplication')}} @@ -34,9 +91,9 @@ - - - + + +
- - - - - - - - + + + + + + + +
@@ -65,16 +122,17 @@
- - - - - + + + + +
{{ $t('query') }} @@ -92,11 +150,11 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' + :scroll='{x: 600,y:400}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> -
+
{ + if (res.success) { + this.projectVersionList = res.result || [] + } else { + this.projectVersionList = [] + } + }) + }, pageOnChange(page, pageSize) { this.pageNo = page this.loadData() @@ -244,6 +323,11 @@ }, editData(edit) { // 编辑一行的数据 + if (edit.projectVersion) { + edit.projectVersion = edit.projectVersion.split(',') + }else{ + edit.projectVersion = [] + } this.row = edit this.formData = { ...edit } this.selectedRowKeys = edit.paramsTemplateId.split(',') @@ -265,10 +349,17 @@ this.confirmLoading = true let postDate = { title: this.formData.title, + projectVersion: this.formData.projectVersion, + explanation: this.formData.explanation, paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0], paramsTemplatePublishVersion: this.row.version || this.selectedRowKeysDate[0].version, projectId: this.projectId } + Object.keys(postDate).forEach(res => { + if (postDate[res] && postDate[res] instanceof Array) { + postDate[res] = postDate[res].join(',') + } + }) if (this.formData.id) { //编辑 postDate = { @@ -375,14 +466,23 @@ } .drawer-bootom-button { - display: flex; - justify-content: center; + position: absolute; + bottom: 0; + width: 100%; + border-top: 1px solid #e8e8e8; + padding: 10px 16px; + text-align: right; + left: 0; + z-index: 100; + background: #fff; + border-radius: 0 0 2px 2px; } .Required { color: red; margin-right: 4px; } + .box-title-text { line-height: 1.4; display: flex; @@ -390,7 +490,7 @@ } .title-text { - width: 114px; + width: 84px; text-align: right; display: inline-block; font-weight: 500; @@ -410,10 +510,10 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 100px); display: inline-block; margin-top: 2px; - height: 40px; + /*height: 40px;*/ margin-bottom: 24px; } @@ -466,6 +566,19 @@ line-height: 6px; color: #fff; } + + .box-button { + height: 38px; + } + + .itemOption { + display: inline-block; + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index fa940c45d..d6c03ca68 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -10,29 +10,80 @@ :wrapper-col='wrapperCol' > - - - - + +
+
+ * + {{$t('title')}} +
+ + + +
- + +
+
+ {{$t('relatedProjectVersion')}} +
+ + + + + + {{ item }} + + + + +
- +
+ + +
+
+ {{$t('explain')}} +
+ + + +
- - - - + +
+
+ {{$t('entryName')}} +
+ + + +
- - - + + + + + + + + {{ $t('query') }} {{ $t('reset') }} @@ -48,7 +99,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' + :scroll='{x: 600,y:400}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> @@ -60,7 +111,7 @@ -
+
- +
\ No newline at end of file