划词及对比结果和对比方案的优化

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

@@ -3,12 +3,12 @@
     <el-tabs value="0">
       <el-tab-pane label="原文" name="0" :style="{height: height + 'px',overflowY: 'auto'}">
         <p class="common" v-for="(item, index) in records.original">
-          <span v-if="item" data-type="权利要求原文"  v-html="getViewDom(item,'权利要求原文')"></span>
+          <span v-if="item" :data-type="'权利要求原文'+(index+1)"  v-html="getViewDom(item,'权利要求原文'+(index+1))"></span>
         </p>
       </el-tab-pane>
       <el-tab-pane label="译文" name="1" :style="{height: height + 'px',overflowY: 'auto'}">
         <p class="common" v-for="(item, index) in records.translation">
-          <span v-if="item"  data-type="权利要求译文"  v-html="getViewDom(item,'权利要求译文')"></span>
+          <span v-if="item"  :data-type="'权利要求译文'+(index+1)"  v-html="getViewDom(item,'权利要求译文'+(index+1))"></span>
         </p>
       </el-tab-pane>
       <el-tab-pane v-if="signPatentNo" label="权利特征" name="2" :style="{height: height + 'px',overflowY: 'auto'}">

RMS-FrontEnd/src/views/components/articles/components/mixins.js

@@ -30,20 +30,20 @@ export const commonMixins = {
       if(Object.keys(patent).length==0){
         return ''
       }
-   
-      var cc =  patent.publicNo.substring(0,2)
-      if(cc != 'CN'){
-        var date = patent.publicDate.replace(/-/g,'')
-        var NR = patent.publicNo.substring(2,patent.publicNo.length)
-        var KD = patent.publicNo.substring(patent.publicNo.length-2,patent.publicNo.length)
-        var a = 'http://worldwide.espacenet.com/espacenetImage.jpg?flavour=firstPageClipping&locale=en_EP&FT=D&date='+ date +'&CC='+ cc +'&NR='+ NR +'&KD='+ KD +'&bg='
-      }else{
-        if (!patent.abstractPath) {
-          return ''
-        }
-        var a = this.$p + patent.abstractPath
-      }
-      return a
+      return this.$p + patent.abstractPath
+      // var cc =  patent.publicNo.substring(0,2)
+      // if(cc != 'CN'){
+      //   var date = patent.publicDate.replace(/-/g,'')
+      //   var NR = patent.publicNo.substring(2,patent.publicNo.length)
+      //   var KD = patent.publicNo.substring(patent.publicNo.length-2,patent.publicNo.length)
+      //   var a = 'http://worldwide.espacenet.com/espacenetImage.jpg?flavour=firstPageClipping&locale=en_EP&FT=D&date='+ date +'&CC='+ cc +'&NR='+ NR +'&KD='+ KD +'&bg='
+      // }else{
+      //   if (!patent.abstractPath) {
+      //     return ''
+      //   }
+      //   var a = this.$p + patent.abstractPath
+      // }
+      // return a
     },
   }
 }

RMS-FrontEnd/src/views/components/common/mixins.js

@@ -162,6 +162,7 @@ export const patentKeywordsHighlight = {
        for(let i=0;i<this.contrastList.length;i++){
         if(this.contrastList[i].patentNo == this.patent.publicNo){
           if(this.contrastList[i].fields.indexOf(field)!=-1){
+            console.log(this.contrastList[i].fields,field)
             var a = {
             color:"#dff209",
             Type:2,
@@ -176,6 +177,7 @@ export const patentKeywordsHighlight = {
           }else{
             a.pass = false
           }
+           console.log(a)
           text = this.AddClass1(a);
           // console.log(text)
           }
@@ -300,8 +302,6 @@ if(index!=-1){
 
   },
     AddClass1(selectObject){
-
-  
           //  let el = this.getColumnNode(selectObject.column);
          let el = selectObject.temNode;
          if(selectObject.pass){
@@ -352,14 +352,21 @@ if(index!=-1){
         Indexs.forEach(function (match){
           let currentIndex =0;
           let temSplitStrings = new Array();
-          
+          console.log(splitStrings,match)
           splitStrings.forEach(function (item){
               if(item.type =='text'){
                 // console.log(item.text.indexOf(match[0]))
                 if(item.text){
                   // console.log(match.index,currentIndex,item.text,match[0])
                    if(match.index >= currentIndex && match.index < (currentIndex + item.text.length) ){
+                    if(selectObject.column.indexOf('权利要求')!=-1){
+                      item.text = item.text.replace(/\r/g,' ')
+                      match.index -=1
+                    }
+                    
+                    console.log(match.index + match[0].length,currentIndex + item.text.length,item.text,item.text.indexOf(match[0]))
                       if((match.index + match[0].length) <= (currentIndex + item.text.length) && item.text.indexOf(match[0])!=-1){
+                        console.log(2)
                           if(match.index > currentIndex){
                             // var a =item.text.substring(0,match.index-currentIndex)
                             // console.log(a)

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

@@ -52,7 +52,7 @@
                                 <span @dblclick="changEdit('searchPolicy')" placeholder="请输入" v-else>{{ product.searchPolicy}}</span>
                             </el-form-item>
                             <el-form-item label="检索截止日期：" prop="deadLine">
-                                <span v-if="noEdit1">{{ product.deadLine }}</span>
+                                <span v-if="noEdit1 && product.deadLine">{{ product.deadLine.slice(0,10) }}</span>
                                 <el-date-picker
                                     v-else
                                     style="width:100%"

RMS-FrontEnd/src/views/report/FTO/FTOPage/product.vue

@@ -80,6 +80,7 @@ export default{
       if (this.isDate) {
         let a = Date.parse(new Date)
         let b = Date.parse(value)
+        console.log(a,b)
         if (value) {
           if (b+8.64e7<a) {//8.64e7一天的时间//只适用YYYY-mm-dd格式
             callback(new Error('禁止选择以前时间，请重新选择'))

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

@@ -69,7 +69,7 @@
         </template>
       </el-table-column>
      
-      <el-table-column v-for="(item, index) in tableHeader" :key="index" align="center" :min-width="item.length > 7 ? '190' : '110'">
+      <el-table-column v-for="(item, index) in tableHeader" :key="index" align="center" :min-width="item.length > 6 ? '190' : '110'">
         <template slot="header">
           <span>
             <el-link type="primary"  @click="editContrast(item.patentNo)">{{item.patentNo}}(D{{ index+1 }})</el-link>
@@ -750,15 +750,34 @@ export default {
     justify-content: space-between;
   }
 
-.innerTable p{
-  padding:0 0 20px 0;
-border-bottom:1px solid #EBEEF5;
+  .innerTable p{
+  // min-width:200px;
+  padding: 10px 0;
+  margin: 0;
+  display: flex;
+  justify-content: center;
+  align-items:center;
+  height: 130px;
+  line-break:normal;
+  overflow: auto;
+  border-bottom:1px solid #EBEEF5;
 }
 
+.innerTable p:nth-child(1){
+  border-bottom: 1px solid #EBEEF5;
+}
 .innerTable p:last-child{
-  padding: 20px 0 0 0;
   border-bottom: none;
 }
+// .innerTable p{
+//   padding:0 0 20px 0;
+// border-bottom:1px solid #EBEEF5;
+// }
+
+// .innerTable p:last-child{
+//   padding: 20px 0 0 0;
+//   border-bottom: none;
+// }
 </style>
 <style>
 .innerTable .el-checkbox__label{

RMS-FrontEnd/src/views/report/reportDetails/components/ContrastPlan.vue

@@ -385,11 +385,13 @@ export default {
 <style lang="scss" scoped>
 .innerTable p{
   // min-width:200px;
+  padding: 10px 0;
   display: flex;
   justify-content: center;
   align-items:center;
-  height: 150px;
+  height: 130px;
   line-break:normal;
+  overflow: auto;
   border-bottom:1px solid #EBEEF5;
 }
 

RMS-FrontEnd/src/views/report/reportDetails/components/common/customTable.vue

@@ -9,7 +9,7 @@
             header-row-class-name="custom-table-header"
             :default-sort="{ prop : 'date', order: 'descending' }"
             @sort-change="sortChange">
-            <el-table-column prop="patentNo"  label="专利号" width="200" align="center">
+            <el-table-column prop="patentNo" sortable label="专利号" width="200" align="center">
               <template slot-scope="scope">
                 <div>
                   <el-link @click.native="toContrast(scope.row,scope.$index)" :reportId="reportId">{{scope.row.patentNo}}</el-link>
@@ -23,7 +23,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="专利标题"  width="300" align="center"></el-table-column>
+            <el-table-column prop="name" sortable label="专利标题"  width="300" align="center"></el-table-column>
             <!-- <el-table-column prop="state" label="状态" sortable  align="center"></el-table-column> -->
             <el-table-column prop="simpleStatus" label="状态" align="center" >
               <!-- <template slot-scope="scope">