Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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<SysCategory> categoryList = sysCategoryService.list();
 			for (LawsTechnologyEvaluationItemResultEO data : datas) {
 				String evaluationMethods = data.getEvaluationMethods();
-				List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
+				if(StringUtils.isNotEmpty(evaluationMethods)){
-				String name = getTreeName(cut, categoryList, evaluationMethodsList);
+					List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
-				data.setEvaluationMethodsName(name);
+					String name = getTreeName(cut, categoryList, evaluationMethodsList);
+					data.setEvaluationMethodsName(name);
+				}
+
 				if(StringUtils.isNotEmpty(data.getComplianceResult())){
 					data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut));
 				}

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");
                         }
                     }

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() {
@@ -298,8 +306,7 @@
   }
 
   .title-text {
-    width: 20%;
+    width: 100px;
-    min-width: 100px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
@@ -315,7 +322,7 @@
   .box-input {
     /*min-width: 200px;*/
     display: inline-block;
-    width: 70%;
+    width: calc(100% - 116px);
     height: 38px;
     margin-top: 2px;
   }
@@ -324,4 +331,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;
+  }
 </style>

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"
       >

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;
+  }
 </style>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -26,15 +26,15 @@
         </template>
       </div>
       <div class="box-content-right">
-        <div @click="classificationClick" class="operator-text" v-has="'virtual:set:creater'">
+        <div @click="classificationClick" class="operator-text">
           <a-icon type="setting"/>
           {{$t('classificationMaintenance')}}
         </div>
-        <div @click="managePublishingClick" class="operator-text" v-has="'virtual:set:creater'">
+        <div @click="managePublishingClick" class="operator-text">
           <a-icon type="carry-out"/>
           {{$t('managePublishing')}}
         </div>
-        <div @click="newlyAddedClick" class="operator-text" v-has="'virtual:set:creater'">
+        <div @click="newlyAddedClick" class="operator-text">
           <a-icon type="plus"/>
           {{$t('newlyAdded')}}
         </div>

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 = ''