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

jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue

@@ -7,6 +7,7 @@
             <span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
             <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
                       class="text-select"
+                      allowClear
                       v-model="queryParamOne.showPermissions">
               <a-select-option v-for="(item, key) in tagList"
                                :key="key"
@@ -125,13 +126,11 @@
         pageSize: 10,
         pageNo: 1,
         loading: false,
-        selectModel: '',
         fileList: [],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         queryParamSeach: '',
         mapOne: {},
         mapTwo: {},
-        selectModelName: '',
         queryParamOne: {},
         searchQueryOne: {},
         orderBy: '1',
@@ -157,7 +156,6 @@
       }
     },
     mounted() {
-      this.getCondition()
       this.replacePage()
       this.getParagraphInfoList()
     },
@@ -213,22 +211,18 @@
           this.queryParamSeach = ''
         }
       },
-      searchData(data, selectModel, name) {
+      searchData(data) {
         this.queryParam = {}
         this.searchQueryOne = data || {}
         this.queryParam = { ...this.queryParamOne, ...data }
-        this.selectModel = selectModel
-        this.selectModelName = name
         this.ParamSeach()
         this.pageNo = 1
         this.getParagraphInfoList(1)
       },
-      searchDataTwo(data, selectModel, name) {
+      searchDataTwo(data) {
         this.queryParam = {}
         this.searchQueryOne = data || {}
         this.queryParam = { ...this.queryParamOne, ...data }
-        this.selectModel = selectModel
-        this.selectModelName = name
         this.ParamSeach()
         this.pageNo = 1
         this.getParagraphInfoList(2)
@@ -239,8 +233,6 @@
         this.searchQueryOne = {}
         this.checkboxText = []
         this.selectedRowKeys = []
-        this.selectModel = ''
-        this.selectModelName = ''
         this.ParamSeach()
         this.pageNo = 1
         this.getParagraphInfoList(1)
@@ -359,6 +351,7 @@
 
             .text-select {
               flex: 1;
+              height: 38px;
             }
           }
         }
@@ -515,17 +508,4 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
-
-  .textName {
-    width: 100%;
-    overflow: hidden;
-    display: -webkit-box;
-    text-overflow: ellipsis;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
-  }
 </style>

jero-web/src/views/documentTools/searchCenter/index.vue

@@ -148,6 +148,8 @@
           this.$refs.DocumentLibraryRef.ResetSearch()
         }else if (this.$refs.monthlyReportRegulationsRef) {
           this.$refs.monthlyReportRegulationsRef.ResetSearch()
+        }else if(this.$refs.problemKnowledgeBaseRef){
+          this.$refs.problemKnowledgeBaseRef.ResetSearch()
         }
       },
       onSearch(event) {
@@ -168,6 +170,8 @@
           this.$refs.wholeRef.searchData(event)
         }else if(this.$refs.monthlyReportRegulationsRef){
           this.$refs.monthlyReportRegulationsRef.searchData(event)
+        }else if(this.$refs.problemKnowledgeBaseRef){
+          this.$refs.problemKnowledgeBaseRef.searchData(event)
         }
       },
       wholeTextSearch(event) {
@@ -183,6 +187,8 @@
           }
         }else if(this.$refs.monthlyReportRegulationsRef){
           this.$refs.monthlyReportRegulationsRef.searchDataTwo(event)
+        }else if(this.$refs.problemKnowledgeBaseRef){
+          this.$refs.problemKnowledgeBaseRef.searchDataTwo(event)
         }
       },
       getCondition() {