From 5c61f76e6284afb1cb935efa352ebdda2c9d3b22 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 14:35:43 +0800 Subject: [PATCH 1/7] =?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/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- jero-web/src/components/CollectionType/index.vue | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2bf1259d2..6d0455929 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1064,7 +1064,7 @@ module.exports = { Ftext: 'Text+Pull single+File', Nnothing: 'Null', Nchinese: 'Chinese', - NpositiveInteger: 'Positive integer', + NpositiveInteger: 'Integer', NPositivefloatingpointnumber: 'Positive float', NintegerOrDecimal: 'Integer decimal', NOneDecimalPlace: 'Decimal one', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e682a10f4..ed23534e4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1073,7 +1073,7 @@ module.exports = { Ftext: '文本+下拉单选+附件', Nnothing: '无', Nchinese: '中文', - NpositiveInteger: '正整数', + NpositiveInteger: '整数', NPositivefloatingpointnumber: '正浮点数', NintegerOrDecimal: '整数或小数', NOneDecimalPlace: '一位小数', diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 177019a7e..efc3a9f0d 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -40,7 +40,6 @@ :disabled="item.isLock == '1' ? true: false" :max="99999" :precision="0" - :min="1" :placeholder="$t('enterPositiveInteger')" v-model="item.dataValue"/> @@ -196,7 +195,6 @@ @@ -296,7 +294,6 @@ :disabled="item.isLock == '1' ? true: false" :max="99999" :precision="0" - :min="1" :placeholder="$t('enterPositiveInteger')" v-model="item.dataValue"/> @@ -407,7 +404,6 @@ :disabled="item.isLock == '1' ? true: false" :max="99999" :precision="0" - :min="1" :placeholder="$t('enterPositiveInteger')" v-model="item.dataValue"/> @@ -573,7 +569,6 @@ :disabled="item.isLock == '1' ? true: false" :max="99999" :precision="0" - :min="1" :placeholder="$t('enterPositiveInteger')" v-model="item.dataValue"/> From 345ca85963f198b136ae808f43c37868833aa720 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 14:41:39 +0800 Subject: [PATCH 2/7] =?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/ParameterLibraryAdd/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index f77f108c5..f64e2d323 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -98,7 +98,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' + :scroll='{x: 760,y:400}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> {{ text }} @@ -133,18 +133,21 @@ export default { title: this.$t('NiONumber'), dataIndex: 'nioNumber', align: 'center', + width:200, ellipsis: true }, { title: this.$t('ParameterName'), align: 'center', dataIndex: 'paramsName', + width:200, ellipsis: true }, { title: this.$t('areaOfResponsibility'), dataIndex: 'dutyTerritory_dictText', align: 'center', + width:200, ellipsis: true } ], From 89424f793fe2fe77cc64863c86fc68077b732d40 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 5 Jul 2022 14:43:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C=20=E6=AD=A3?= =?UTF-8?q?=E6=95=B4=E6=95=B0=E6=94=B9=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/cert/template/entity/ParamsInfoEO.java | 2 +- .../com/jero/modules/cert/template/enums/ControlVerifyEnum.java | 2 +- .../com/jero/modules/cert/template/vo/ParamsInfoEnExport.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index cdca194aa..bac0f3502 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -111,7 +111,7 @@ public class ParamsInfoEO implements Serializable { private String controlType; /**控件校验*/ - @Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","正整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"}) + @Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"}) @ApiModelProperty(value = "控件校验") private String controlVerify; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java index b8b399e51..8bb6ccc20 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java @@ -13,7 +13,7 @@ import java.util.Map; public enum ControlVerifyEnum { NULL("无","Null","1"), CHINESE("中文","Chinese","2"), - POSITIVE_INTEGER("正整数","Positive integer","3"), + POSITIVE_INTEGER("整数","Integer","3"), POSITIVE_FLOAT("正浮点数","Positive float","4"), INTEGER_DECIMAL("整数或小数","Integer decimal","5"), DECIMAL_ONE("一位小数","Decimal one","6"), diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java index e4e9b0339..6a9163656 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java @@ -94,7 +94,7 @@ public class ParamsInfoEnExport { private String controlType; /**控件校验*/ - @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Positive integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"}) + @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"}) @ApiModelProperty(value = "控件校验") private String controlVerify; 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 4/7] =?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 5/7] =?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 6/7] =?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 7/7] =?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);