From 3bc520511d9fe5aaef905d6b085278ca34a77ec8 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 17:59:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/beupgradedonline.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 3b5c6947d..41ffbf0b9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -338,9 +338,6 @@ import ImportFile from '@/components/ImportFileData/index' { gnmc:'自适应巡航控制(ACC)' }, - { - gnmc:'自适应巡航控制(ACC)' - }, { gnmc:'智能泊车辅助(IPA)' }, From ffd4744910333e5280573eca24e794c9d86a5210 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 18:12:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?66890=20=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=AD=97=E6=AE=B5=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E9=A6=96=E5=AD=97=E6=AF=8D=E9=A1=BA=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysDictController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index f8327a592..c0c478ecc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -33,6 +33,7 @@ import com.jero.modules.utils.HanYuPinYinUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -186,6 +187,17 @@ public class SysDictController { ls = sysDictService.queryDictItemsByCode(dictCode); } + // 将结果集进行排序 + if (CollectionUtils.isNotEmpty(ls)) { + // 匿名比较器排序 + Collections.sort(ls, new Comparator() { + @Override + public int compare(DictModel p1, DictModel p2) { + return p1.getText().compareTo(p2.getText()); + } + }); + } + result.setSuccess(true); result.setResult(ls); log.debug(result.toString()); From 7b2cb60258c4f374542ba0fcf29c1372925d1d8c Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 18:17:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?67336=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AE=9A=E6=97=B6=E5=8F=91=E6=B6=88=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E9=80=BE=E6=9C=9F=E7=9A=84=E6=8E=92=E9=99=A4=E6=8E=89=E5=BD=93?= =?UTF-8?q?=E5=A4=A9=E8=BF=87=E6=9C=9F=E7=9A=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/project/job/CertificationInventoryJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java index 5e157da83..93f199d22 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java @@ -338,7 +338,7 @@ public class CertificationInventoryJob implements Job { // 只要早于当前日期都算逾期 boolean flag = false; if(data.getEndTime() != null){ - flag = (data.getEndTime().before(currentDate)); + flag = (data.getEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getEndTime()))); } return flag; }).collect(Collectors.toList()); From 43897960c78d4b2eb61c720e6166c37146230aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 18:49:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=8F=8A=E5=8A=9F=E8=83=BD=E5=A4=87=E6=A1=88?= =?UTF-8?q?-=E9=A9=BE=E9=A9=B6=E8=BE=85=E5=8A=A9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=A4=87=E6=A1=88=E5=8F=82=E6=95=B0-?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E5=8F=8A=E8=BE=B9=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 62 ++++++++++++++----- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index f72635bab..b561b64a0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -49,7 +49,7 @@   {{$t('positioningandnavigationsystem')}} - +   {{$t('vehiclesatellitepositioningequipment')}} @@ -69,7 +69,7 @@   {{$t('vehiclecommunicationsystem')}} - +   {{$t('signalingdevices')}} @@ -307,7 +307,7 @@ export default { fillincontent:this.$t('yesisselected'), }, { - key: 'jgldBzwz', + key: 'jgldBzwz', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -887,7 +887,7 @@ export default { }) this.dataSourceList=res.result.kzq } - + this.dataSource.forEach(item=>{ for(let key in res.result.bj){ if(item.key==key){ @@ -895,7 +895,7 @@ export default { } } }) - + // res.result.bj.forEach(item=>{ // if(Number(item) !=NaN){ @@ -905,7 +905,7 @@ export default { this.query=res.result.bj } }) - + }, click(value){ this.fileList = value @@ -1060,6 +1060,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 200px; line-height: 200px; @@ -1068,6 +1069,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 100px; line-height: 100px; @@ -1076,6 +1078,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 50px; line-height: 50px; @@ -1084,6 +1087,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 250px; line-height: 250px; @@ -1092,6 +1096,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 150px; line-height: 150px; @@ -1099,55 +1104,73 @@ button{ .text-box{ display: inline-block; float: left; - border: #e8e8e8 solid 1px; + /*border: #e8e8e8 solid 1px;*/ width: 100%; height: 400px; - line-height: 400px; + line-height: 20px; } .text-box-two{ display: inline-block; float: left; - border: #e8e8e8 solid 1px; + /*border: #e8e8e8 solid 1px;*/ width: 100%; height: 450px; - line-height: 450px; + line-height: 20px; } .text-text{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 400px; - line-height: 400px; + line-height: 20px; + display: flex; + justify-content: left; + align-items: center; } .text-text-two{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 200px; - line-height: 200px; + padding: 10px; + line-height: 20px; + display: flex; + justify-content: left; + align-items: center; } .text-text-three{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 100px; - line-height: 100px; + line-height: 20px; + display: flex; + justify-content: left; + align-items: center; } .text-text-five{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 50px; line-height: 50px; + display: flex; + justify-content: left; + align-items: center; } .text-box-three{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 250px; line-height: 250px; @@ -1155,7 +1178,7 @@ button{ .text-box-four{ display: inline-block; float: left; - border: #e8e8e8 solid 1px; + /*border: #e8e8e8 solid 1px;*/ width: 100%; height: 600px; line-height: 600px; @@ -1164,6 +1187,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 600px; line-height: 20px; @@ -1175,14 +1199,20 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 150px; - line-height: 150px; + display: flex; + line-height: 20px; + justify-content: left; + align-items: center; + padding: 10px; } .text-box-five{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 100px; line-height: 100px; @@ -1190,7 +1220,7 @@ button{ span{ /* overflow: hidden; /*超出部分隐藏*/ /* text-overflow: ellipsis; 超出部分省略号表示 */ - white-space: wrap; + white-space: normal; /* word-wrap: normal; */ } .item-input{ From 066deceadcb2c0f6cf3c9d1eb72d4f3d88c6b501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 18:52:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=8F=8A=E5=8A=9F=E8=83=BD=E5=A4=87=E6=A1=88?= =?UTF-8?q?-=E9=A9=BE=E9=A9=B6=E8=BE=85=E5=8A=A9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=A4=87=E6=A1=88=E5=8F=82=E6=95=B0-?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E5=8F=8A=E8=BE=B9=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index b561b64a0..077f9fd9d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -1118,7 +1118,7 @@ button{ line-height: 20px; } .text-text{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1130,7 +1130,7 @@ button{ align-items: center; } .text-text-two{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1143,7 +1143,7 @@ button{ align-items: center; } .text-text-three{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1155,7 +1155,7 @@ button{ align-items: center; } .text-text-five{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1184,7 +1184,7 @@ button{ line-height: 600px; } .four-text-text{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1196,7 +1196,7 @@ button{ align-items: center; } .four-text{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none;