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

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%;
-    min-width: 100px;
+    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 = ''