去除空行和空格

RMS-FrontEnd/src/views/components/articles/components/features.vue

@@ -35,11 +35,11 @@
 
                 <el-checkbox  :label="scope.row.id" @change="getFunInfo(scope.row)" style="display: flex; align-items: center;">
                   <!-- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input> -->
-                  <div style="white-space:normal; word-break:break-all;text-align:left">{{scope.row.content}}</div>
+                  <div style="white-space:normal; word-break:break-all;text-align:left">{{scope.row.content.trim()}}</div>
                 </el-checkbox>
 
              </el-checkbox-group>  
-             <span v-else>{{scope.row.content}}</span>
+             <span v-else>{{scope.row.content.trim()}}</span>
             </div>
             
           </template>

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -68,11 +68,11 @@
                   </el-checkbox>
                </el-checkbox-group> -->
                <p v-if="typeFto==1" style="width:100%;outline: #dcdfe6;" 
-                v-html="scope.row.content" >
+                v-html="scope.row.content.trim()" >
               </p>
               <el-checkbox-group v-else v-model="checkList" >
                   <el-checkbox :label="scope.row.id" @change="getFunInfo(scope.row,scope)" style="display: flex; align-items: center;">
-                    <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input>
+                    <el-input type="textarea" style="width:250px" autosize v-model.trim="scope.row.content"> {{scope.row.content.trim()}}</el-input>
                   </el-checkbox>
                </el-checkbox-group>
             </template>
@@ -346,13 +346,13 @@
           }
           for (var i = 0; i < this.row.length; i++) {
             if (i < row.length - 1) {
-              str = str + row[i].content 
+              str = str + row[i].content.trim() 
               strText = strText + row[i].explainText 
               targetDescription = targetDescription + row[i].targetDescription
               let Index = this.tableData1.findIndex(item => { return item.id == row[i].id })
               this.tableData1.splice(Index, 1)
             } else if (i == row.length - 1) {
-              str = str + row[i].content
+              str = str + row[i].content.trim()
               targetDescription = targetDescription + row[i].targetDescription
               strText = strText + row[i].explainText
             }
@@ -643,7 +643,7 @@
                   a.forEach(item=>{
                     if (!res.data.patentRightVos[i].features[m].hasOwnProperty(item)) {//hasOwnProperty判断属性是否存在
                       if(item == 'explainText'){
-                        res.data.patentRightVos[i].features[m][item]=res.data.patentRightVos[i].features[m].contentOut
+                        res.data.patentRightVos[i].features[m][item]=res.data.patentRightVos[i].features[m].contentOut.trim()
                       }else{
                         res.data.patentRightVos[i].features[m][item]=''
                       }
@@ -755,8 +755,8 @@
               {
                 taskId: this.taskId?this.taskId:null,
                 signPatentNo: this.tableData1[i].signPatentNo,
-                contentOut: this.tableData1[i].contentOut,
-                content: this.tableData1[i].content,
+                contentOut: this.tableData1[i].contentOut.trim(),
+                content: this.tableData1[i].content.trim(),
                 rightId: this.tableData1[i].rightId,
                 isFinal: this.tableData1[i].isFinal,
                 reportId: this.tableData1[i].reportId,

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ProductResult.vue

@@ -88,7 +88,7 @@
             
                     <el-table-column prop="content" label="特征" align="center" width="300px">
                         <template slot-scope="scope">   
-                            <div style="width:100%;outline: #dcdfe6;white-space:normal; word-break:break-all;text-align:left" id="preview"  v-html="scope.row.content"  ></div>
+                            <div style="width:100%;outline: #dcdfe6;white-space:normal; word-break:break-all;text-align:left" id="preview"  v-html="scope.row.content.trim()"  ></div>
                         </template>
                     </el-table-column>
                     

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Claims.vue

@@ -66,7 +66,7 @@
                   <el-checkbox-group v-model="checkList" >
 
                       <el-checkbox  :label="scope.row.id" @change="getFunInfo(scope.row,scope)" style="display: flex; align-items: center;">
-                        <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input>
+                        <el-input type="textarea" style="width:250px" autosize v-model.trim="scope.row.content"> {{scope.row.content.trim()}}</el-input>
                       </el-checkbox>
 
                   </el-checkbox-group>

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Result.vue

@@ -67,7 +67,7 @@
                   align="center"
                   width="300px">
                   <template slot-scope="scope" >       
-                          {{scope.row.content}}
+                          {{scope.row.content.trim()}}
                   </template>
                 </el-table-column>
               
@@ -667,10 +667,10 @@ export default {
                         res.data.patentRightVos[i].features[m].pContentOut = res.data.patentRightVos[i].contentOut
                         res.data.patentRightVos[i].features[m].comResult = '公开'
                         if (!res.data.patentRightVos[i].features[m].hasOwnProperty("explainText")) {//hasOwnProperty判断属性是否存在
-                          res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut
+                          res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut.trim()
                         } else {
                           if (res.data.patentRightVos[i].features[m].explainText=="") {//属性存在等于空
-                              res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut
+                              res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut.trim()
                           }
                         }
 

RMS-FrontEnd/src/views/report/avoid/avoidPage/avoidDirection.vue

@@ -57,7 +57,7 @@
             <template slot-scope="scope">
               <el-checkbox-group v-model="checkList">
                 <el-checkbox :label="scope.row.id" @change="getRow(scope)" style="display: flex;align-items: center;">
-                  <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input>
+                  <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content.trim()}}</el-input>
                 </el-checkbox>
               </el-checkbox-group>
             </template>
@@ -433,14 +433,14 @@ export default {
         keepArr[j].features.push({
               signPatentNo: this.tableData1[i].signPatentNo,
               patentId: this.tableData1[i].patentId,
-              content: this.tableData1[i].content,
+              content: this.tableData1[i].content.trim(),
               type: this.tableData1[i].type,
               littleDirection: this.tableData1[i].littleDirection ? this.tableData1[i].littleDirection : '',
               // littleDirection:
               // reportId: this.tableData1[i].pReportId,
               reportId: this.tableData1[i].reportId,
               explainText: this.tableData1[i].explainText?this.tableData1[i].explainText:'',
-              contentOut: this.tableData1[i].contentOut,
+              contentOut: this.tableData1[i].contentOut.trim(),
               splitBy: this.tableData1[i].splitBy,
               splitType: this.tableData1[i].splitType,
               featuresOrder: this.tableData1[i].featuresOrder,
@@ -516,8 +516,8 @@ export default {
         this.row.forEach((rowItem, rowIndex) => {
           // console.log(rowItem,rowIndex);
           if (rowIndex<this.row.length-1) {
-            str = str + rowItem.content 
-            str1 = str1 + rowItem.contentOut 
+            str = str + rowItem.content.trim()
+            str1 = str1 + rowItem.contentOut.trim() 
             str2 = str2 + rowItem.littleDirection 
             str3 = str3 + rowItem.explainText 
             let Index1 = this.tableData1.findIndex(item => { return rowItem.id==item.id  })
@@ -526,8 +526,8 @@ export default {
             }
             // console.log(Index1, this.tableData1);
           }else if(rowIndex==this.row.length-1){
-            str=str+rowItem.content
-            str1=str1+rowItem.contentOut
+            str=str+rowItem.content.trim()
+            str1=str1+rowItem.contentOut.trim()
             str2=str2+rowItem.littleDirection
             str3=str3+rowItem.explainText
           }

RMS-FrontEnd/src/views/report/avoid/avoidPage/direction.vue

@@ -21,7 +21,7 @@
         </el-table-column>
         <el-table-column prop="content" label="特征" width="300" align="center">
           <template slot-scope="scope">
-            <p> {{ scope.row.content }}</p>
+            <p> {{ scope.row.content.trim() }}</p>
            
           </template>
         </el-table-column>

RMS-FrontEnd/src/views/report/index.vue

@@ -57,7 +57,7 @@
           
         </div>
  
-        <el-main class="workspace-main" v-loading="loading">
+        <el-main class="workspace-main" v-loading="loading" >
           <div v-if="queryShowType == 2">
             <Report-Visual ref="reportVisual" @params="getParams"></Report-Visual>
           </div>
@@ -610,8 +610,12 @@ export default {
       
     },
     getParams(params){
-      console.log(params)
-      this.queryParams.cronIds=[params.conclusionType]
+      if(params.conclusionType=='-1'){
+        this.queryParams.statuses=['0','1','2','4','5']
+      }else{
+        this.queryParams.cronIds=[params.conclusionType]
+      }
+      
       this.queryShowType = '0'
       this.getList2()
 
@@ -670,6 +674,11 @@ export default {
           this.total = response.pageColumn.total
            this.loading = false
         }
+      }).catch(error=>{
+          this.pageSize = this.queryShowType === '0' ? [10] : [12]
+          this.dataList = []
+          this.total = 0
+          this.loading = false
       })
      
     },