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')}}