From 05426961e47abf4a43587f01dafbd226bf089e91 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 29 Dec 2022 17:43:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=80=E4=B8=AA=E4=BA=BA=E5=91=98-?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A7=92=E8=89=B2=E4=B8=BA=E5=93=81=E7=89=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=EF=BC=8C=E5=BC=B9=E6=A1=86=E4=B8=AD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E5=93=81=E7=89=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/modules/RoleAssignment.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/system/modules/RoleAssignment.vue b/jero-web/src/views/system/modules/RoleAssignment.vue index d04a3ac80..27cc27d4c 100644 --- a/jero-web/src/views/system/modules/RoleAssignment.vue +++ b/jero-web/src/views/system/modules/RoleAssignment.vue @@ -39,7 +39,7 @@ - + { + this.viewshowbrand = true + }) + return }else{ this.viewshow = false } From 685a471bb10382811dccc06a9a4fe772a377750c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 30 Dec 2022 10:12:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E7=BA=A7=E5=88=AB=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryInfoEOServiceImpl.java | 36 ++++++++++++++++++ .../ProjectLawsInventoryEOServiceImpl.java | 37 ++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 25e9a0748..be56b93b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -486,6 +486,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl attestationRankSort(String orderBy, String orderByField, List dummyInventoryInfoEOList) { List list = new LinkedList<>(); + Collator comparator = Collator.getInstance(Locale.CHINESE); if(ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)){ List wvta = dummyInventoryInfoEOList.stream() .filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.WVTA.getValue())).collect(Collectors.toList()); @@ -502,6 +503,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRankStr(),e2.getAttestationRankStr()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRankStr(),e1.getAttestationRankStr()); + }); + } + } + //倒序 + private void attestationRankReverse(String orderBy, List list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRankStr(),e2.getAttestationRankStr()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRankStr(),e1.getAttestationRankStr()); + }); + } + } + private List stateSort(String orderBy, String orderByField, List dummyInventoryInfoEOList, List list) { if(ObjectUtils.isNotEmpty(orderByField) && "state".equals(orderByField)){ List active = dummyInventoryInfoEOList.stream() diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 14dc6076d..2a462f93f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1084,8 +1084,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl na = dummyInventoryInfoEOList.stream() .filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.NA.getValue())).collect(Collectors.toList()); - + Collator comparator = Collator.getInstance(Locale.CHINESE); if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + attestationRankPositive(orderBy, wvta, comparator); + attestationRankPositive(orderBy, vta, comparator); + attestationRankPositive(orderBy, market, comparator); + attestationRankPositive(orderBy, regu, comparator); + attestationRankPositive(orderBy, na, comparator); //正序 List collect = dummyInventoryInfoEOList.stream().filter(e -> StringUtils.isBlank(e.getAttestationRank_dictText())).collect(Collectors.toList()); list.addAll(collect); @@ -1096,6 +1101,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRank_dictText(),e2.getAttestationRank_dictText()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRank_dictText(),e1.getAttestationRank_dictText()); + }); + } + } + //倒序 + private void attestationRankReverse(String orderBy, List list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRank_dictText(),e2.getAttestationRank_dictText()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRank_dictText(),e1.getAttestationRank_dictText()); + }); + } + } + /** * 数据字典数据处理方法 * @param result 返回值 From 93b12b94eea63c05b6fef38acbc467b2e7a530aa Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 30 Dec 2022 10:13:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?viewer=E6=9D=83=E9=99=90=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 12c43c681..930e06923 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1075,7 +1075,10 @@ } else { roleCodeIndex = 4 } - if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + console.log(this.formInlineRoleSwitching.roleSwitchingCode); + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || + this.formInlineRoleSwitching.roleSwitchingCode == '12' || + this.formInlineRoleSwitching.roleSwitchingCode == '13') { roleCodeIndex = 0 } row.roleCodeIndex = roleCodeIndex @@ -1149,7 +1152,9 @@ } else { roleCodeIndex = 4 } - if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || + this.formInlineRoleSwitching.roleSwitchingCode == '12'|| + this.formInlineRoleSwitching.roleSwitchingCode == '13') { roleCodeIndex = 0 } let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) @@ -1370,7 +1375,9 @@ this.isDisplay = true } else { this.isDisplay = false - if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || + this.formInlineRoleSwitching.roleSwitchingCode == '12' || + this.formInlineRoleSwitching.roleSwitchingCode == '13') { this.isRoleSwitching = false } } @@ -1451,7 +1458,9 @@ } else { roleCodeIndex = 4 } - if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || + this.formInlineRoleSwitching.roleSwitchingCode == '12' || + this.formInlineRoleSwitching.roleSwitchingCode == '13') { roleCodeIndex = 0 } item.roleCodeIndex = roleCodeIndex From 46a89d7b4a4609374965bd98d108860f8b98cac9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 30 Dec 2022 10:52:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86--?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E5=BC=95?= =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E5=AF=B9=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/exporthistory/index.vue | 2 +- .../src/components/tableCollection/index.vue | 6 ++-- .../splitting/modules/SplitDetail.vue | 29 +++++++++++++++++++ .../projectManagement/components/addModel.vue | 2 +- .../src/views/system/modules/UserModal.vue | 2 +- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index a2d883e27..547892f33 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -45,7 +45,7 @@ @change='handleTableChange'>
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index f0e53d542..3650d9148 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -698,7 +698,7 @@ this.dataSourcehistory = res.result.records if(this.dataSourcehistory && this.dataSourcehistory.length > 0){ this.dataSourcehistory.forEach(val=>{ - val.logContent = val.logContent.replace(/\"/g,"“") + val.logContent = val.logContent.replace(/\"/g,"\"") }) } this.total = res.result.total @@ -1036,6 +1036,9 @@ .table .ant-table-column-title { font-weight: bold; } + .textData{ + font-family:cursive; + }