From 72c4f249c0203b15b17ca4904b38bf065f6be864 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 16:38:11 +0800 Subject: [PATCH 01/10] [update] --- jero-web/src/common/lang/en-us.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b8afbfa7e..68ce382c2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -723,7 +723,7 @@ module.exports = { Dropdownradio: 'Drop down radio', Dropdownmultipleselection: 'Drop down multiple selection', a: '+', - positiveInteger: 'positive integer', + positiveInteger: 'Positive integer', ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', @@ -731,8 +731,8 @@ module.exports = { theCurrent: 'The current status of this data is', thisbuttonCompleted: 'This button can only be operated when the status is completed', Frozenstatus: 'Frozen status, can only be viewed', - chinese: 'chinese', - integerOrDecimal: 'integer Or Decimal', + chinese: 'Chinese', + integerOrDecimal: 'Integer Or Decimal', OneDecimalPlace: 'One Decimal Place', TwoDecimalplaces: 'Two Decimal places', Threedecimalplaces: 'Threedecimalplaces', From c9538cfb5a86d8d6397a2fa4e9e8240c061a69d4 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 17:10:41 +0800 Subject: [PATCH 02/10] =?UTF-8?q?[update]=20=E4=B8=8A=E5=AE=9D=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 | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../parameter/escalationlibrary/index.vue | 105 +++--------------- 3 files changed, 16 insertions(+), 91 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68ce382c2..0f5be5026 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -981,4 +981,5 @@ module.exports = { // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest update time', + Exporthistory: 'Exporthistory', } \ 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 0c5eff3cb..1441b8d7a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -986,4 +986,5 @@ module.exports = { // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', + Exporthistory: '导出历史', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index e1cb9c182..3b08661c4 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -4,22 +4,20 @@
-
- {{$t('zoneOfApplication')}} +
+ {{$t('entryName')}}
- +
-
- {{$t('parameterTemplate')}} +
+ {{$t('ListTitle')}}
- +
@@ -30,20 +28,6 @@
-
-
- - {{$t('newlyAdded')}} -
-
- - {{$t('copy')}} -
-
- - {{$t('BatchDelete')}} -
-
30 ? text.slice(0, 29) + '...' : text }} - {{$t('edit')}} - {{$t('deleteLib')}} + {{$t('Exporthistory')}} + {{$t('See')}}
@@ -138,7 +122,7 @@ export default { dataSource: [], confirmLoading: false, url: { - list: 'params/template/page', + list: 'params/report/page', add: 'params/template/add', edit: 'params/template/edit', deleteBatch: 'params/template/delete', @@ -154,19 +138,17 @@ export default { title: this.$t('entryName'), align: 'center', width: '10%', - dataIndex: 'region_dictText', + dataIndex: 'projectName', }, { title: this.$t('ListTitle'), align: 'center', - dataIndex: 'paramsTemplateName', - scopedSlots: { customRender: 'projectName' } + dataIndex: 'title', }, { title: this.$t('Version'), align: 'center', - dataIndex: 'description', - scopedSlots: { customRender: 'titleName' } + dataIndex: 'version', }, { title: this.$t('operation'), @@ -214,68 +196,9 @@ export default { this.selectedRowKeys = value this.selectedRowKeysArray = this.selectedRowKeys.join(',') }, - //添加 - 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; }, - //批量删除 - handleDel() { - let param={ - ids: this.selectedRowKeysArray - } - if (this.selectedRowKeys.length > 0) { - let _this = this - this.$confirm({ - content: _this.$t('ConfirmBatchDeletion'), - onOk() { - axios({ - url: '/jero-boot/params/template/deleteBatch', - method: 'post', - data: param, - transformRequest: [function (data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token':_this.token - } - }) - .then( (res) =>{ - if (res.data.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - }else{ - _this.$message.warning(_this.$t('operationFailed')) - } - }) - .catch( (error) =>{ - console.log(error); - }); - } - }) - } else { - this.$message.warning(this.$t('selectLeastOne')) - } - }, //编辑 edit(item) { this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item))) From c9d0a2c8da819bbcd3f5d4c71ec56151876f513e Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 17:58:11 +0800 Subject: [PATCH 03/10] =?UTF-8?q?[update]=20=E4=B8=8A=E5=AE=9D=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 | 5 +- jero-web/src/common/lang/zh-cn.js | 3 + .../src/components/exporthistory/index.vue | 361 ++++++++++++++++++ .../parameter/escalationlibrary/index.vue | 47 +-- 4 files changed, 380 insertions(+), 36 deletions(-) create mode 100644 jero-web/src/components/exporthistory/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0f5be5026..f3f8736f8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -618,7 +618,7 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'NiO number', + NiONumber: 'NIO number', ParameterName: 'Parameter name', ParameterDescription: 'Parameter description', Version: 'Version', @@ -982,4 +982,7 @@ module.exports = { Enable: 'Enable', Latestupdatetime: 'Latest update time', Exporthistory: 'Exporthistory', + Exporttype: 'Export Type', + Exporttime: 'Export Time', + file: 'File' } \ 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 1441b8d7a..99106720c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -987,4 +987,7 @@ module.exports = { Enable: '启用', Latestupdatetime: '最新更新时间', Exporthistory: '导出历史', + Exporttype: '导出类型', + Exporttime: '导出时间', + file: '文件' } \ No newline at end of file diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue new file mode 100644 index 000000000..2b0eb4638 --- /dev/null +++ b/jero-web/src/components/exporthistory/index.vue @@ -0,0 +1,361 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 3b08661c4..900f58345 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -45,11 +45,8 @@ {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} - - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} - - {{$t('Exporthistory')}} + {{$t('Exporthistory')}} {{$t('See')}} @@ -65,37 +62,16 @@ @showSizeChange="SizeChange" />
- - - - - -
-
- * - {{$t('templateName')}} -
- - - -
- - - -
- {{$t('cancel')}} - {{$t('submit')}} -
+ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 83c82ca50..bbd18a05a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -81,6 +81,7 @@ +
@@ -92,8 +93,13 @@