From a905e773fc26065ac881ae5c7f9ead95a0c1d3b7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 24 Aug 2022 17:05:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-bug58586?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 6 +++--- .../service/impl/LawsMonthlyReportSearchServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index c9f25752b..c96a1553d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -163,7 +163,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl issueTime = new HashMap<>(); Map issueTime1 = new HashMap<>(); issueTime.put("order","desc"); - issueTime1.put("issue_time",issueTime); + issueTime1.put("create_time",issueTime); sort.putAll(issueTime1); // Map mapSort = new HashMap<>(); @@ -258,7 +258,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); From b670d46a80b35ed7eb3e4b86c316bf52f9a4f9c5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 24 Aug 2022 17:45:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulationsView.vue | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index 89ae8dfa5..1642cae03 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -433,46 +433,46 @@ -
- {{$t('reasonsForRejection')}} -
- - -
-
- {{$t('rejectedBy')}} -
-
- {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} -
-
- - -
-
- {{$t('rejectionTime')}} -
-
- {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} -
-
- - - - -
-
- {{$t('rejectReason')}} -
-
- {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} -
-
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From b05f1bcdf98d9dfd87d6f51dd14131c1351922d1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 24 Aug 2022 18:09:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentTools/searchCenter/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 8270a0c4b..7e7cd2b69 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -65,10 +65,10 @@ - - - - + + + +
From 5831e4e320d1dc5c367fc20b3f3073fec040313e Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 24 Aug 2022 18:11:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index c96a1553d..b8d67b793 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl