diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1c4f25207..3c6c1ee00 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -962,4 +962,6 @@ module.exports = { releaseStatus:'Release status', uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', +// 上报库 + Enable: '启用', } \ 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 96d70a9fc..0d434b1aa 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -967,4 +967,7 @@ module.exports = { releaseStatus:'发布状态', uploadedBy:'上传人', uploadMonthly:'上传月报', +// 上报库 + Enable: '启用', + } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 940a9f193..2ba12c0c5 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -19,11 +19,11 @@ {{$t('parameterTemplate')}} - + + v-model="formInline.templateName" + :placeholder="$t('PleaseEnter')+$t('templateName')"/> @@ -31,14 +31,15 @@ * - {{$t('zoneOfApplication')}} + {{$t('status')}} - - + + + {{$t('Enable')}} + + {{$t('disable')}} + + @@ -60,6 +61,23 @@ + + + + + * + {{$t('parameterTemplate')}} + + + + + + + @@ -86,19 +104,16 @@ export default { confirmLoading: false, visible: false, rules: { - paramsTemplateName:[ + templateName:[ { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'change' }, { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' }, ], description:[ - { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], - state: [ + status: [ { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' }, ], - region: [ - { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' }, - ] }, disabled: false, projectNameList: [], @@ -122,6 +137,8 @@ export default { this.visible = true this.title = '新增' this.formInline = {} + this.formInline.status = '0' + this.formInline = {...this.formInline} this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() }) diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index fb91ec868..7feb1988f 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -4,22 +4,11 @@ - - {{$t('zoneOfApplication')}} + + {{$t('templateName')}} - - - - - - - {{$t('parameterTemplate')}} - - + @@ -138,12 +127,11 @@ export default { dataSource: [], confirmLoading: false, url: { - list: 'params/template/page', - add: 'params/template/add', - edit: 'params/template/edit', - deleteBatch: 'params/template/delete', - deleteAll: 'params/template/deleteBatch', - copy: 'params/template/copyById' + list: 'report/exportTemplate/page', + add: 'report/exportTemplate/add', + edit: 'report/exportTemplate/edit', + deleteBatch: 'report/exportTemplate/delete', + deleteAll: 'report/exportTemplate/deleteBatch', }, total: 0, pageSize: 10, @@ -164,8 +152,7 @@ export default { { title: this.$t('templateName'), align: 'center', - dataIndex: 'paramsTemplateName', - scopedSlots: { customRender: 'projectName' } + dataIndex: 'templateName' }, { title: this.$t('contentDescription'),