From d58bb131d43ecef38e01f01bb49edc142ba1b38e Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 14:26:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[update]=20=E4=B8=8A=E6=8A=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../parameterexport/components/addModel.vue | 6 +- .../views/parameter/parameterexport/index.vue | 56 ++++++------------- 4 files changed, 24 insertions(+), 43 deletions(-) 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) { From a1499306b68ea20d2d190d6b8fbefcabd3f7f4ed Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 14:45:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 11 + jero-web/src/common/lang/zh-cn.js | 33 ++- .../components/RegulationMonthlyFill.vue | 156 ++++++++++---- .../components/modules/fillTable.vue | 155 ++++++++++++++ .../components/modules/fillTableAdd.vue | 198 ++++++++++++++++++ 5 files changed, 505 insertions(+), 48 deletions(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f3a61598e..092305e9a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -962,6 +962,17 @@ module.exports = { releaseStatus:'Release status', uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', + chapterContents:'Chapter contents', + chineseTitle:'Chinese title', + englishTitle:'English title', + regulatoryContact:'Regulatory contact', + exportStatus:'Export status', + monthlyTitleTemplate:'Monthly title template', + monthlyIntegrationAndExport:'Monthly integration and export', + addContent:'Add content', + monthSelection:'Month selection', + moveUp:'Move up', + moveDown:'Move down', // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest update time', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f73c1ffe3..989c47c63 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -727,7 +727,7 @@ module.exports = { // 认证状态 timeoperation: '时，才有权限操作此按钮。', NiOnumberis: 'NIO编号为', - NoOperationPermissionForthisbutton:'没有此按钮的操作权限', + NoOperationPermissionForthisbutton: '没有此按钮的操作权限', Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。', Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', Datastatusis: '数据状态为', @@ -956,17 +956,28 @@ module.exports = { documentLibraryDetails: '文档库详情', question: '催办', ConfirmQuestion: '确认催办？', - OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', - disableInput:'禁止输入', + OnlyOrTaskconfirmationOut: '只有清单确认状态或任务确认状态为待确认时才可以进行催办', + disableInput: '禁止输入', or: '或', - warningTime:'预警时间', - RegulationMonthlyManagement:'法规月报管理', - RegulationMonthlyFill:'法规月报填写', - RegulationMonthlyName:'法规月报名称', - monthlyLanguage:'月报语种', - releaseStatus:'发布状态', - uploadedBy:'上传人', - uploadMonthly:'上传月报', + warningTime: '预警时间', + RegulationMonthlyManagement: '法规月报管理', + RegulationMonthlyFill: '法规月报填写', + RegulationMonthlyName: '法规月报名称', + monthlyLanguage: '月报语种', + releaseStatus: '发布状态', + uploadedBy: '上传人', + uploadMonthly: '上传月报', + chapterContents: '章节目录', + chineseTitle: '中文标题', + englishTitle: '英文标题', + regulatoryContact:'法规联系人', + exportStatus:'导出状态', + monthlyTitleTemplate:'月报标题模板', + monthlyIntegrationAndExport:'月报整合导出', + addContent:'新增内容', + monthSelection:'月份选择', + moveUp:'上移', + moveDown:'下移', // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 74f026074..b7a31ca20 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -5,11 +5,12 @@
-
- {{$t('RegulationMonthlyName')}} +
+ {{$t('monthSelection')}}
- +
@@ -22,9 +23,17 @@
-
- - {{$t('uploadMonthly')}} +
+ + {{$t('monthlyTitleTemplate')}} +
+
+ + {{$t('monthlyIntegrationAndExport')}} +
+
+ + {{$t('addContent')}}
@@ -43,6 +52,11 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + {{$t('view')}} + {{$t('edit')}} + {{$t('deleteLib')}} +
+ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue new file mode 100644 index 000000000..628453061 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -0,0 +1,198 @@ + + + + + + \ No newline at end of file