修改bug

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

@@ -213,14 +213,19 @@ export const addContrast = {
               }
               iIndex +=1;
           }
-
+          console.log("anchorOffset1",this.anchorOffset)
           return false;
       }
       else{
         if(selectObj.anchorNode.nodeValue!=null){
-           this.anchorOffset += selectObj.anchorOffset - selectObj.anchorNode.nodeValue.length + selectObj.anchorNode.nodeValue.trimStart().length;
+          if(selectObj.extentOffset>=selectObj.anchorOffset){
+            this.anchorOffset += selectObj.anchorOffset - selectObj.anchorNode.nodeValue.length + selectObj.anchorNode.nodeValue.trimStart().length;
+          }else{
+            this.anchorOffset += selectObj.extentOffset - selectObj.extentNode.nodeValue.length + selectObj.extentNode.nodeValue.trimStart().length;
+          }
+           
         }
-       
+        // console.log("anchorOffset2",this.anchorOffset,selectObj)
           return true;
       }
   },

RMS-FrontEnd/src/views/components/common/treeSelect.vue

@@ -78,7 +78,7 @@ export default {
       this.$nextTick(()=>{
         let scrollWrap = document.querySelectorAll('.el-scrollbar .el-select-dropdown__wrap')[0]
         let scrollBar = document.querySelectorAll('.el-scrollbar .el-scrollbar__bar')
-        scrollWrap.style.cssText = 'margin: 0px; max-height: none; overflow: hidden;'
+        scrollWrap.style.cssText = 'margin: 0px; '
         scrollBar.forEach(ele => ele.style.width = 0)
       })
  

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

@@ -43,7 +43,7 @@
           ref="table"
           :span-method="objectSpanMethod"
           v-loading="loading"
-          :height="tableHeight - 25"
+          :height="tableHeight"
           style="min-width: 100%; margin-top: 20px;overflow:auto">
 
           <el-table-column prop="pRightName" label="权要"  align="center"  width="200px">
@@ -66,7 +66,7 @@
                 v-html="scope.row.content" >
               </p>
               <el-checkbox-group v-else v-model="checkList" >
-                  <el-checkbox :label="scope.row.id" @change="getFunInfo(scope.row)" style="display: flex; align-items: center;">
+                  <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-checkbox>
                </el-checkbox-group>
@@ -213,6 +213,7 @@
     },
     watch:{
       tableData(){
+        console.log(1)
             this.$nextTick(() => {
                 this.setHeight()
             })
@@ -286,11 +287,12 @@
         })
       },
       //选中特征
-      getFunInfo(row) {
+      getFunInfo(row,scope) {
         console.log("row",row)
         // this.$emit('getfeatures', row)
         let Index=this.row.findIndex(item => {return item.id==row.id })
         if (Index<0) {
+          row.$index = scope.$index
           this.row.push(row)
         } else {
           this.row.splice(Index,1)
@@ -323,8 +325,22 @@
         if (this.row != []) {
           console.log(this.row);//explainText
           let row = this.row.sort((aId, bId) => {
-              return aId.id-bId.id; 
+              return aId.$index-bId.$index; 
             })
+            row.sort((aId, bId) => {
+            if(aId.$index - bId.$index!=1){
+              allow = false
+            }
+          })
+          if(!allow){
+            this.$alert('只能合并相邻的特征','提示',{
+              confirmButtonText: '确定',
+              type:'warning',
+              callback: action => {
+              }
+            })
+            return false;
+          }
           for (var i = 0; i < this.row.length; i++) {
             if (i < row.length - 1) {
               str = str + row[i].content + (row[i].content==''?'':' ，')
@@ -371,8 +387,10 @@
           pSort: ele.pSort,
           pReportId: ele.pReportId,
           pContentOut: ele.pContentOut,
-
-          id:ele.id+"a"+a,
+          targetDescription:'',
+          compareDescription:'',
+          compareResult :'',
+          id:ele.id+"a"+ele.$index+a,
           signPatentNo: ele.signPatentNo,
               contentOut:"" ,
               content: "",

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

@@ -39,7 +39,7 @@
         :data="tableData"
         ref="table"
         border
-        :height="tableHeight - 25"
+        :height="tableHeight"
         :span-method="objectSpanMethod"
         v-loading="loading"
         style="min-width: 100%; margin-top: 20px;overflow:auto">
@@ -186,7 +186,7 @@ export default {
       if (this.row != []) {
         console.log(this.row);//explainText
         let row = this.row.sort((aId, bId) => {
-            return aId.id-bId.id; 
+            return aId.$index-bId.$index; 
           })
           row.sort((aId, bId) => {
             if(aId.$index - bId.$index!=1){
@@ -250,7 +250,7 @@ export default {
           pReportId: ele.pReportId,
           pContentOut: ele.pContentOut,
 
-          id:ele.id+"a"+a,
+          id:ele.id+"a"+ele.$index+a,
           signPatentNo: ele.signPatentNo,
               contentOut:"" ,
               content: "",

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

@@ -15,7 +15,7 @@
                         <el-dropdown-item command="2" v-if="[2,3].includes(item.status)">报告文档</el-dropdown-item>
                         <el-dropdown-item command="3" v-if="[1,2].includes(item.status)">自定义字段</el-dropdown-item>
                         <el-dropdown-item command="4" v-if="[2,3].includes(item.status)&& item.type != 4">任务分配</el-dropdown-item>
-                        <el-dropdown-item command="5" v-if="[1].includes(item.status) || item.type == 4">{{!([3,4].includes(item.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
+                        <el-dropdown-item command="5" v-if="[1].includes(item.status) || (item.type == 4&& [1,2,3].includes(item.status))">{{!([3,4].includes(item.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
                         <el-dropdown-item command="6" v-if="[2,3].includes(item.status)&& item.type != 4">导入 </el-dropdown-item>
                         <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
                         <!-- <el-dropdown-item command="0">分享</el-dropdown-item> -->

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

@@ -43,7 +43,7 @@
               <el-dropdown-item command="2" v-if="[2,3].includes(scope.row.status)">报告文档</el-dropdown-item>
               <el-dropdown-item command="3" v-if="[1,2].includes(scope.row.status)">自定义字段</el-dropdown-item>
               <el-dropdown-item command="4" v-if="[2,3].includes(scope.row.status)&& scope.row.type != 4">任务分配</el-dropdown-item>
-              <el-dropdown-item command="5" v-if="[1].includes(scope.row.status) || scope.row.type == 4">{{!([3,4].includes(scope.row.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
+              <el-dropdown-item command="5" v-if="[1].includes(scope.row.status) || (scope.row.type == 4 && [1,2,3].includes(scope.row.status))">{{!([3,4].includes(scope.row.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
               <el-dropdown-item command="6" v-if="[2,3].includes(scope.row.status)&& scope.row.type != 4">导入 </el-dropdown-item>
               <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
             </el-dropdown-menu>

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

@@ -78,8 +78,12 @@ export const explain = {
           // row[name] = str + new_img
           this.$set(row,name,str + new_img)
         }
-        
         this.$forceUpdate()
+        if(this.tableData){
+           var a = JSON.parse(JSON.stringify(this.tableData))
+            this.tableData = a
+        }
+       
       };
       reader.readAsDataURL(file);
       this.pasteFile = file;