Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

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

@@ -223,10 +223,11 @@ export const addContrast = {
 
   getColumn(node,selectObj){
     if(this.isFirst){
-      this.StartText = node.innerText
-      console.log(a)
+      this.StartText = node
+      
+      console.log(node.innerHTML)
     }
-      console.log(node,selectObj.anchorNode.data);
+      // console.log(node,selectObj.anchorNode.data);
       if(node != selectObj.anchorNode){
         this.isFirst = false
           if(node.nodeValue != null ){
@@ -245,20 +246,38 @@ export const addContrast = {
       }
       else{
         if(selectObj.anchorNode.nodeValue!=null){
-          var a = this.StartText
-          console.log(a,selectObj.extentOffset,selectObj.anchorOffset)
+          var a = this.StartText.innerText
           if(selectObj.extentOffset>=selectObj.anchorOffset){
             var str = a.substring(0,this.anchorOffset + selectObj.anchorOffset)
-            var len = str.match(/\n/g)?Number(str.match(/\n/g).length):0
-            var num = len + Number(this.anchorOffset + selectObj.anchorOffset)
+            console.log(str.toString().match(/\r/g),str.match(/\n/g),selectObj.anchorOffset,this.anchorOffset)
+            if(this.StartText.getAttribute("data-type").indexOf('权利要求')!=-1){
+              if( this.StartText.innerHTML.indexOf('\n')==0){
+                  var num = Number(this.anchorOffset + selectObj.anchorOffset) - 1
+              }else{
+                var num = Number(this.anchorOffset + selectObj.anchorOffset)
+              }
+            }else{
+              var len = str.match(/\n/g)?Number(str.match(/\n/g).length):0
+              var num = len + Number(this.anchorOffset + selectObj.anchorOffset)
+            }
+            
+           
             // if(this.anchorOffset != 0){
             //   num += 1
             // }
             this.anchorOffset = num
           }else{
             var str = a.substring(0,this.anchorOffset + selectObj.extentOffset)
-            var len = str.match(/\n/g)?Number(str.match(/\n/g).length):0
-            var num = len + Number(this.anchorOffset + selectObj.extentOffset)
+            if(this.StartText.getAttribute("data-type").indexOf('权利要求')!=-1){
+              if( this.StartText.innerHTML.indexOf('\n')==0){
+                  var num = Number(this.anchorOffset + selectObj.extentOffset) - 1
+              }else{
+                var num = Number(this.anchorOffset + selectObj.extentOffset)
+              }
+            }else{
+              var len = str.match(/\n/g)?Number(str.match(/\n/g).length):0
+              var num = len + Number(this.anchorOffset + selectObj.extentOffset)
+            }
 
             // if(this.anchorOffset != 0){
             //   num += 1

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

@@ -304,6 +304,7 @@ if(index!=-1){
     AddClass1(selectObject){
           //  let el = this.getColumnNode(selectObject.column);
          let el = selectObject.temNode;
+         console.log(el)
          if(selectObject.pass){
           console.log(1)
           var splitStrings =[{
@@ -361,9 +362,25 @@ if(index!=-1){
                    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(item.text.match(/\r/g))
+                      if(item.text.match(/\r/g)){
+                        match.index -=1
+                      }
+                      
+                    }
+                    if(selectObject.column.indexOf('说明书')!=-1){
+                      var b = selectObject.temNode.replace(/<[^>]+>/g,'')
+                      console.log(1,b,match.index,currentIndex)
+                      if(b.substring(0,match.index).indexOf('\r')==-1){
+                        console.log(1,b.substring(0,match.index))
+                         var a = b.substring(0,match.index).match(/\n/g)
+                         console.log(a)
+                          if(a){
+                            match.index -=a.length
+                          }
+                      }
+                     
                     }
-                    
                     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)

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

@@ -31,10 +31,10 @@
       <!-- <el-container :style="{width:width}" > -->
       <el-aside style="margin:0;" :style="{ width: width , position: 'relative'}" >
         <el-link type="primary" v-if="reportType == 3 || reportType == 4" @click="changeProduct" style="position: absolute;right: 10px;top: 10px;margin-bottom:10px;z-index: 111;">切换<span>{{ showProduct?'特征信息':'产品信息' }}</span></el-link>
-        <div v-if="showProduct">
+        <div v-show="showProduct">
             <Product-Message :reportId="reportId" :row="row" :noEdit="isEdit"></Product-Message>
         </div>
-        <div v-else>
+        <div v-show="!showProduct">
           <Patent-Features v-if="type == '2'||type=='1' || reportType == 4" :taskId="taskId" :patentNo="patentNo1" :reportId="reportId" :coordination="coordinationA" :FeaturesNumber="FeaturesNumber" :taskWorkRemak="taskWorkRemakA" :type="type" @isRead="isRead" ></Patent-Features>
           <patent-Message v-else :publicNo="patentNo1" :reportId="reportId" :taskId="taskId" @patentStatusEmit="patentStatusEmit" :patentStatus2A="patentStatus2A" :switchValue="switchValue"></patent-Message>
         </div>

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

@@ -34,7 +34,7 @@
               <el-option label="全部显示" value="0"></el-option>
           </el-select>
         </div>
-        <el-button @click="keep" type="primary" style="float: right;">保存</el-button>
+        <el-button @click="keep" type="primary" style="float: right;" :loading="btnLoading">保存</el-button>
       </div>
       <!-- 表格部分 -->
       <el-table
@@ -102,6 +102,7 @@ export default {
   },
   data() {
     return {
+      btnLoading:false,
       show: true,
       checkList: [],
       tableData1: [],
@@ -418,6 +419,7 @@ export default {
     },
     //保存
     keep() {
+      this.btnLoading = true
       let keepArr = [];
       // this.$message({
       //     message: '此次修改将覆盖之前保存的信息',
@@ -491,6 +493,7 @@ export default {
         console.log(res);
         if (res.code == 200) {
           this.keepSure = true;
+          this.btnLoading = false
           this.$message({
             message: '保存成功',
             type: 'success'

RMS-FrontEnd/src/views/report/components/sendCollaboration.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="请求协同" :visible.sync="visibleCollaboration" :before-close="close" class="sendCollaboration">
+    <el-dialog title="请求协同" :visible.sync="visibleCollaboration" :close-on-click-modal="false" :before-close="close" class="sendCollaboration">
       <div>
         <el-form :model="clientForm" :rules="clientRules" ref="clientForm">
 
@@ -63,7 +63,7 @@
             </div> -->
 
       </el-dialog>
-      <el-dialog title="创建人员" :visible.sync="createdPersonnel" width="500px" append-to-body>
+      <el-dialog title="创建人员" :visible.sync="createdPersonnel" :close-on-click-modal="false" width="500px" append-to-body>
         <el-form :model="CreatedPerson" :rules="CreatedPersonRule" ref="CreatedPerson">
           <el-form-item label="姓名 :" prop="name">
             <el-input v-model="CreatedPerson.name" placeholder="请输入姓名" />

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

@@ -379,7 +379,7 @@ export default {
           personId:row.personId,
         }
       })
-      this.$s.setSession('reportMessage',row)
+      this.$s.setSession('row',row)
       window.open(a.href,"_blank")
     },
     handleEdit(row) {

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

@@ -130,7 +130,7 @@ export default {
     // this.queryParams.type = this.$route.query.type
     //接收从任务分配跳转数据
     // this.signPatentNo = this.$route.query.signPatentNo
-    console.log(this.$route.query.personId);
+    console.log(this.$route.query.personId,this.row);
     this.personId = this.$route.query.personId?this.$route.query.personId:this.$s.getSession('row').personId
     this.reportMessage = this.$s.getSession('row')?this.$s.getSession('row'):this.$s.getSession('reportMessage')
   },