diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3c6c1ee00..f3a61598e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -963,5 +963,6 @@ module.exports = { uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', // 上报库 - Enable: '启用', + Enable: 'Enable', + Latestupdatetime: 'Latest update time', } \ 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 0d434b1aa..f73c1ffe3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -969,5 +969,5 @@ module.exports = { uploadMonthly:'上传月报', // 上报库 Enable: '启用', - + Latestupdatetime: '最新更新时间', } \ 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 2ba12c0c5..5e56b2185 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -33,8 +33,8 @@ * {{$t('status')}} - - + + {{$t('Enable')}} {{$t('disable')}} @@ -137,7 +137,7 @@ export default { this.visible = true this.title = '新增' this.formInline = {} - this.formInline.status = '0' + this.formInline.state = '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 7feb1988f..bda62d382 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -24,10 +24,6 @@ {{$t('newlyAdded')}} -
- - {{$t('copy')}} -
{{$t('BatchDelete')}} @@ -46,12 +42,7 @@ :columns="columns" > - - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} - - - - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} + {{ text && text.length > 100 ? text.slice(0, 99) + '...' : text }} {{$t('edit')}} @@ -138,17 +129,17 @@ export default { pageNo: 1, title: '新增', columns: [ - { - title: this.$t('serialNumber'), - dataIndex: '', - key: 'rowIndex', - width: 50, - ellipsis: true, - align: 'center', - customRender: function(t, r, index) { - return parseInt(index) + 1 - } - }, + // { + // title: this.$t('serialNumber'), + // dataIndex: '', + // key: 'rowIndex', + // width: 50, + // ellipsis: true, + // align: 'center', + // customRender: function(t, r, index) { + // return parseInt(index) + 1 + // } + // }, { title: this.$t('templateName'), align: 'center', @@ -158,22 +149,22 @@ export default { title: this.$t('contentDescription'), align: 'center', dataIndex: 'description', - scopedSlots: { customRender: 'titleName' } + scopedSlots: { customRender: 'projectName' } }, { title: this.$t('status'), align: 'center', width: '5%', - dataIndex: 'createTime' + dataIndex: 'state' }, { - title: this.$t('createTime'), + title: this.$t('creater'), align: 'center', width: '10%', - dataIndex: 'createTime' + dataIndex: 'createBy' }, { - title: this.$t('updateTime'), + title: this.$t('Latestupdatetime'), align: 'center', width: '10%', dataIndex: 'updateTime' @@ -228,17 +219,6 @@ export default { handleAdd() { this.$refs.addModelRef.addModel() }, - // 复制 - handlecody(){ - if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) - } else if(this.selectedRowKeys.length == 0){ - this.$message.warning(this.$t('pleaseSelectData')) - } else { - this.areaVisible=true - this.formInline = {} - } - }, hideModal(){ this.visible = false; }, @@ -253,7 +233,7 @@ export default { content: _this.$t('ConfirmBatchDeletion'), onOk() { axios({ - url: '/jero-boot/params/template/deleteBatch', + url: '/jero-boot/report/exportTemplate/deleteBatch', method: 'post', data: param, transformRequest: [function (data) {