From 172df9a539e4ff380304a0aea026f2255b13b214 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 15:48:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index efc3a9f0d..9f9c39432 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -28,10 +28,8 @@ @@ -182,12 +180,10 @@
@@ -280,10 +276,8 @@
@@ -390,12 +384,10 @@
@@ -556,11 +548,9 @@
From d9d14128554f67bca29cad9250cd7a2acb90da41 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 5 Jul 2022 15:54:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E8=AF=ADbug55489?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/service/impl/ParamsInfoEOServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index e4a311b2e..7a690c725 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1409,7 +1409,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl!ccDtoAfterDistinct.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); + .filter(e->!ccDtoAfterDistinct.contains(e)) + .map(CertCategoryParamsInfoCnImport::getNioNumber).distinct() + .collect(Collectors.joining(",")); if (StringUtils.isNotBlank(reduceOne)) { if (CutEnum.CN.getValue().equals(cut)) { stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；"); @@ -1428,7 +1430,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl!ccDtoAfterDistinctTwo.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); + .filter(e->!ccDtoAfterDistinctTwo.contains(e)) + .map(CertCategoryParamsInfoCnImport::getNioNumber).distinct() + .collect(Collectors.joining(",")); if (StringUtils.isNotBlank(reduceTwo)) { if (CutEnum.CN.getValue().equals(cut)) { stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；"); From b29e8bc63ab18075e078826d662d02dbaf4c1544 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 16:49:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 9 +++++---- .../parameter/ParameterTemplate/index.vue | 20 ++++++++++++------- .../views/parameter/parameterlist/index.vue | 13 ++++++++---- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index d4e712fbe..8304b2613 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -101,30 +101,31 @@
{{$t('configurationName')}}: {{configDetail.configName}}
{{$t('Model')}}: - {{configDetail.carType}}
{{$t('electricMachinery')}}: - {{configDetail.motor}}
{{$t('Version')}}: - {{configDetail.version}}
{{$t('Battery')}}: - {{configDetail.battery}}
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index fb8d13d60..dde4540c1 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -52,7 +52,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%',y:'calc(100vh - 130px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -60,7 +60,7 @@ > - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} + {{ text }} @@ -157,31 +157,37 @@ export default { { title: this.$t('zoneOfApplication'), align: 'center', - width: '10%', + width: 160, + ellipsis: true, dataIndex: 'region_dictText', }, { title: this.$t('parameterTemplate'), align: 'center', + width: 180, + ellipsis: true, dataIndex: 'paramsTemplateName', scopedSlots: { customRender: 'projectName' } }, { title: this.$t('contentDescription'), align: 'center', + ellipsis: true, dataIndex: 'description', - scopedSlots: { customRender: 'titleName' } + // scopedSlots: { customRender: 'titleName' } }, { title: this.$t('createTime'), align: 'center', - width: '10%', - dataIndex: 'createTime' + dataIndex: 'createTime', + width: 160, + ellipsis: true, }, { title: this.$t('updateTime'), align: 'center', - width: '10%', + width: 160, + ellipsis: true, dataIndex: 'updateTime' }, { diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 0237cdaeb..de2d26b32 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -72,7 +72,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 130px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -155,20 +155,23 @@ export default { { title: this.$t('NiONumber'), align: 'center', - width: 100, + width: 130, dataIndex: 'nioNumber', - sorter: true + sorter: true, + ellipsis: true, }, { title: this.$t('ParameterName'), align: 'center', dataIndex: 'paramsName', width: 160, + ellipsis: true, }, { title: this.$t('ParameterDescription'), align: 'center', dataIndex: 'description', + ellipsis: true, // scopedSlots: { customRender: 'titleName' } }, { @@ -176,12 +179,14 @@ export default { align: 'center', dataIndex: 'dutyTerritory_dictText', width: 150, + ellipsis: true, }, { title: this.$t('createTime'), align: 'center', dataIndex: 'createTime', - width: 110, + width: 180, + ellipsis: true, }, { title: this.$t('operation'), From 58f07de7bda493a59a49c9925b5f92e3291c18f8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 17:14:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/jero/JLoading.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue index 8266f08ee..f6f42d096 100644 --- a/jero-web/src/components/jero/JLoading.vue +++ b/jero-web/src/components/jero/JLoading.vue @@ -54,7 +54,7 @@ position: absolute; top: 0; left: 0; - z-index: 111999; + z-index: 1009; width: 100%; height: 100%; background-color: rgba(255, 255, 255, 0.9); From 508da807943f3278f0963d25f3d4012709936c60 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Jul 2022 17:32:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA?= 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 + .../src/components/exporthistory/index.vue | 5 +- .../commponts/customexportmodle.vue | 182 +++++++++--------- 4 files changed, 100 insertions(+), 89 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2bf1259d2..9de9bc800 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -178,6 +178,7 @@ module.exports = { ButtonsPermissions: 'Buttons / permissions', ConventionalExport:'Conventional export', CustomExport:'Custom export', + CustomTemplateName:'Custom template name', assembly: 'Assembly', route: 'Route', AddSubmenu: 'Add submenu', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e682a10f4..dd0cdc762 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -180,6 +180,7 @@ module.exports = { ButtonsPermissions: '按钮/权限', ConventionalExport:'常规导出', CustomExport:'自定义导出', + CustomTemplateName:'自定义模板名称', assembly: '组件', route: '路径', AddSubmenu: '添加子菜单', diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index 181fb0c2b..1b353803e 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -202,7 +202,10 @@ export default { this.loadData() }, dowloadfile(item){ - downloadFile('/sys/common/downLoadFile', item.exportFileName, {id:item.exportFileId}) + let query = { + id: item.exportFileId + } + downloadFile('/sys/common/downLoadFile', item.exportFileName, query, this.Deselect) }, loadData() { let _this = this diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index 9496747a7..800c461b0 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -1,46 +1,38 @@ + @@ -98,6 +71,7 @@ import PersonnelSelection from '@/components/PersonnelSelection/index' import { getAction, postAction, downloadFile, putAction } from '@/api/manage' import uploadFileChange from '@/components/uploadFileChange/file' +import {initDictOptions, filterDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'addModel', @@ -108,13 +82,30 @@ export default { props: ['url'], data() { return { - formInline: {}, + formInline: { + }, confirmLoading: false, + description:false, + dictOptions:[], visible: false, + required:false, + disabled:false, rules: { - 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' }, + separator:[ + { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' }, + // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' }, + ], + certCategory:[ + { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' }, + // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' }, + ], + combineFlag:[ + { required: true, message: this.$t('PleaseSelect')+this.$t('WhetherMergeParameters'), trigger: 'change' }, + // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' }, + ], + configIds:[ + { required: true, message: this.$t('PleaseSelect')+this.$t('configure'), trigger: 'change' }, + // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' }, ], description:[ { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, @@ -126,7 +117,6 @@ export default { { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' }, ], }, - disabled: false, projectNameList: [], title: '' } @@ -170,12 +160,27 @@ export default { this.visible = true this.title = this.$t('CustomExport') this.formInline = {} - this.formInline.state = '0' + this.formInline.separator = ',' this.formInline = {...this.formInline} + this.getConfigure() + this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() }) }, + getConfigure(){ + let pram = { + paramsManifestId: this.$route.query.id + } + getAction('report/detail/getConfigLabelList', pram).then((res) => { + if (res.success) { + console.log(res.result) + this.dictOptions = res.result + } else { + // this.$refs.uploadFile.perentHandleFunc() + } + }) + }, editModel(value) { this.visible = true this.title = '编辑' @@ -185,40 +190,41 @@ export default { }, handleCancel() { this.visible = false + this.$refs.ruleForm.resetFields() + }, + certCategoryName(value){ + getAction('sys/dict/getDictItems/cert_category', { }).then((res) => { + if (res.success) { + let tt = '' + res.result.forEach((item) => { + if(item.value == value){ + tt=item.title + } + }) + this.contentListStart = tt + console.log(this.contentListStart) + } + }) + console.log(value) }, handleSubmit() { - if(this.formInline.paramsTemplateName !== undefined) { - this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim() - } this.$refs.ruleForm.validate(valid => { if (valid) { - let url = '' - let Action - if (this.formInline.id) { - url = this.url.edit - Action = postAction - } else { - url = this.url.add - Action = postAction - } + let url = this.url.ConventionalExport + let Action = getAction let query = JSON.parse(JSON.stringify(this.formInline)) Object.keys(query).forEach(res => { if (query[res] && query[res] instanceof Array) { query[res] = query[res].join(',') } }) + if(this.contentListStart){ + query.certCategoryName = this.contentListStart + } + query.paramsManifestId = this.$route.query.id this.confirmLoading = true - Action(url, query).then((res) => { - if (res.success) { - this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.$emit('addModelList') - } else { - this.$message.warning(this.$t('operationFailed')) - this.confirmLoading = false - } - }) + downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) + this.confirmLoading = false } }) }, From ad8ea8a7f1bd45fd757b1e82bc0a9b7a35582994 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 18:18:36 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/CollectionType/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 9f9c39432..d655af837 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -28,7 +28,7 @@ @@ -182,7 +182,7 @@ :maxLength="1000" :disabled="item.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')+$t('chinese')" - oninput="value=value.replace(/[^\u4E00-\u9FA5]/g,'')" + onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="item.dataValue"/> @@ -276,7 +276,7 @@
@@ -549,7 +549,7 @@ :disabled="item.isLock == '1' ? true: false" :maxLength="1000" :placeholder="$t('pleaseEnter')+$t('chinese')" - oninput="value=value.replace(/[^\u4E00-\u9FA5]/g,'')" + onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="item.dataValue"/>