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

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

@@ -934,7 +934,7 @@
     word-break: break-all
   }
 
-  ::v-deep .ant-select {
+  /*::v-deep .ant-select {*/
-    max-width: calc(100% - 126px) !important;
+  /*  max-width: calc(100% - 126px) !important;*/
-  }
+  /*}*/
 </style>

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

@@ -9,8 +9,9 @@
         <div style="margin-bottom: 10px;position: relative">
           <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
           <div class="text-text-right"
+               @click="checkedClick(item)"
                :class="{ 'null-input':item.checked }">
-            <div class="text-header" @click="checkedClick(item)">
+            <div class="text-header">
               <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                 <template slot="title">
                   <span v-html="item.title"></span>
@@ -23,7 +24,7 @@
               <template slot="title">
                 <span v-html="item.content"></span>
               </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.content"
+              <div class="text-content" v-html="item.content"
               >
               </div>
             </a-tooltip>
@@ -32,20 +33,20 @@
               <template slot="title">
                 <span v-html="item.content"></span>
               </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
+              <div class="text-content" v-html="item.content"></div>
             </a-tooltip>
             <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
                        v-else-if="!item.file_text && queryParam.selectValue">
               <template slot="title">
                 <span v-html="item.content"></span>
               </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
+              <div class="text-content" v-html="item.content"></div>
             </a-tooltip>
             <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
               <template slot="title">
                 <span v-html="item.file_text"></span>
               </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.file_text">
+              <div class="text-content" v-html="item.file_text">
               </div>
             </a-tooltip>
           </div>
@@ -239,6 +240,7 @@
     padding: 19px 28px;
     box-sizing: border-box;
     margin-left: 38px;
+    cursor: pointer;
   }
 
   .null-input {

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

@@ -53,14 +53,14 @@
                         <template slot="title">
                           <span v-html="item.title"></span>
                         </template>
-                        <span style="cursor: pointer" v-html="item.title" @click="titleClick(item)"></span>
+                        <span style="cursor: pointer" v-html="item.title"></span>
                       </a-tooltip>
                     </div>
                     <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                       <template slot="title">
                         <span v-html="item.content"></span>
                       </template>
-                      <div class="text-content" @click="checkedClick(item)" v-html="item.content"
+                      <div class="text-content" v-html="item.content"
                       >
                       </div>
                     </a-tooltip>
@@ -171,13 +171,13 @@
         })
       },
       checkedClick(item) {
-        if (item.checked) {
+        let newUrl = this.$router.resolve({
-          this.checkboxText = this.checkboxText.filter(res => {
+          path: '/problemKnowledgeBaseView',
-            return res !== item.id
+          query: {
-          })
+            id: item.id
-        } else {
+          }
-          this.checkboxText.push(item.id)
+        })
-        }
+        window.open(newUrl.href, '_blank')
       },
       pageOnChange(page, pageSize) {
         this.pageNo = page
@@ -215,6 +215,10 @@
         this.pageNo = 1
         this.getParagraphInfoList()
       },
+      getText(str) {
+        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
+        return words.replace(/\s/g, '') //这里是去除空格
+      },
       getParagraphInfoList() {
         let queryParamOne = Object.assign(this.queryParam, this.queryParamOne)
         let queryParam = JSON.parse(JSON.stringify(queryParamOne))
@@ -234,6 +238,13 @@
         postAction(this.url.getParagraphInfoList, query).then((res) => {
           if (res.success) {
             this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                if (val.content) {
+                  val.content = this.getText(val.content)
+                }
+              })
+            }
             this.total = res.result.total
             this.loading = false
           } else {
@@ -415,6 +426,7 @@
     padding: 19px 28px;
     box-sizing: border-box;
     margin-left: 38px;
+    cursor: pointer;
   }
 
   .null-input {

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

@@ -192,6 +192,10 @@
         this.queryParam.selectValueTwo = value
         this.getList()
       },
+      getText(str) {
+        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
+        return words.replace(/\s/g, '') //这里是去除空格
+      },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -209,6 +213,13 @@
         postAction(this.url.getInfoList, query).then((res) => {
           if (res.success) {
             this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                if (val.content) {
+                  val.content = this.getText(val.content)
+                }
+              })
+            }
             this.total = res.result.total
           } else {
             this.conList = []
@@ -231,9 +242,16 @@
         }
       },
       titleClick(item) {
-        console.log(item)
         if (item.module_type_flag == 'FGYB') {
           this.monthlyReportClick(item)
+        } else if (item.module_type_flag == 'WTZSK') {
+          let newUrl = this.$router.resolve({
+            path: '/problemKnowledgeBaseView',
+            query: {
+              id: item.id
+            }
+          })
+          window.open(newUrl.href, '_blank')
         } else {
           let newUrl = this.$router.resolve({
             path: '/docManage/library/detail',
@@ -295,7 +313,7 @@
       font-weight: bold;
       color: #040B29;
       display: inline-block;
-      max-width: 180px;
+      max-width: 220px;
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;