From 33bf8e907244332d6d58f2ab2a88d7ba2be9ebb6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 16:26:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nologyEvaluationItemResultEOServiceImpl.java | 9 ++++++--- jero-web/src/components/search/index.vue | 17 ++++++++++++++--- .../components/evaluationResultsList.vue | 2 +- .../components/problemKnowledgeBaseList.vue | 6 +++--- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index ec8655d2d..79d84035b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -216,9 +216,12 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl List categoryList = sysCategoryService.list(); for (LawsTechnologyEvaluationItemResultEO data : datas) { String evaluationMethods = data.getEvaluationMethods(); - List evaluationMethodsList = Arrays.asList(evaluationMethods.split(",")); - String name = getTreeName(cut, categoryList, evaluationMethodsList); - data.setEvaluationMethodsName(name); + if(StringUtils.isNotEmpty(evaluationMethods)){ + List evaluationMethodsList = Arrays.asList(evaluationMethods.split(",")); + String name = getTreeName(cut, categoryList, evaluationMethodsList); + data.setEvaluationMethodsName(name); + } + if(StringUtils.isNotEmpty(data.getComplianceResult())){ data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut)); } diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index d4cb9c1a2..5a3608ddb 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -298,8 +298,7 @@ } .title-text { - width: 20%; - min-width: 100px; + width: 100px; color: #000F16; display: inline-block; font-weight: 500; @@ -315,7 +314,7 @@ .box-input { /*min-width: 200px;*/ display: inline-block; - width: 70%; + width: calc(100% - 116px); height: 38px; margin-top: 2px; } @@ -324,4 +323,16 @@ height: 38px; /*margin-top: 2px;*/ } + + ::v-deep .ant-select-tree { + width: auto; + height: 300px; + overflow: auto; + position: absolute; + /*background: #fff;*/ + } + + ::v-deep .ant-select-tree-dropdown { + min-height: 320px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index bdaa64268..8ed494f25 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -20,7 +20,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 320px)'}" :data-source="dataSource" :columns="columns" > diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 2b3175a5f..ec476304d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -26,15 +26,15 @@
-
+
{{$t('classificationMaintenance')}}
-
+
{{$t('managePublishing')}}
-
+
{{$t('newlyAdded')}}
From c7350ea5094375ceb1d72f27ea907ed028cef8d6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 16:31:40 +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=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/search/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 5a3608ddb..cf5a34acc 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -189,6 +189,14 @@ }, methods: { searchQuery() { + if (this.isDefault) { + let startTime = moment(new Date()).format('YYYY-MM-DD') + let endTime = this.haflYear() + if (this.queryParam['WarnTime'].length == 0) { + this.queryParam['WarnTime'] = [startTime, endTime] + } + this.queryParam = { ...this.queryParam } + } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) }, searchReset() { From 6e84880174f50eaaec41f5b32259796f3166cb5b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Aug 2022 17:00:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6--6?= =?UTF-8?q?=E4=B8=AA=E6=9C=88=E5=92=8C12=E4=B8=AA=E6=9C=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=A2=9C=E8=89=B2=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/warn/service/LawsWarnService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 87662c695..9c43e54a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -144,10 +144,10 @@ public class LawsWarnService { String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)) || newCarTime.equals(beforeTimeSix)){ record.put("new_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) || newCarTime.equals(beforeTimeTwelve)){ record.put("new_colour","yellow"); } } @@ -158,16 +158,16 @@ public class LawsWarnService { if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){ try { if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){ - Date newCarTimeDate = sdf.parse(implementTime); + Date implementTimeDate = sdf.parse(implementTime); //当前时间的前6个月 String beforeTimeSix = beforeTime(6,new Date()); String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) || implementTime.equals(beforeTimeSix)){ record.put("implement_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) || implementTime.equals(beforeTimeTwelve)){ record.put("implement_colour","yellow"); } } From 7b1c3fc491a3398cb728e664c58df24f7e090fdc Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 17:05:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 5 +++++ .../processCenter/components/evaluatorFeedbackList.vue | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 47b816081..b058c8943 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -587,7 +587,12 @@ ::v-deep .itemModel-explain .ant-form-explain { margin-top: 60px } + ::v-deep .ql-tooltip { z-index: 10 !important; } + + ::v-deep .ql-snow .ql-picker { + height: 36px; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 2f49be832..ae801d9a7 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -275,6 +275,12 @@ mounted() { if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) { this.dataSource = this.evaluatorFeedbackList + if (this.dataSource && this.dataSource.length == 1 && this.$route.query.taskDefinitionKey == 'pgrqr') { + this.$nextTick(() => { + let antTableBody = document.getElementsByClassName('ant-table-body') + antTableBody[0].style = 'position:auto' + }) + } if (this.$route.query.taskDefinitionKey != 'pgrqr') { this.dataSource.forEach(res => { res.sponsorFeedback = ''