{{$t('zoneOfApplication')}}
@@ -34,9 +91,9 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
{{ $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