Explorar o código

修改显示栏位管理以及分页信息显示在当前窗口

zhuliu %!s(int64=2) %!d(string=hai) anos
pai
achega
09c0e5aff4

+ 3 - 0
RMS-FrontEnd/src/App.vue

@@ -22,6 +22,9 @@ export default {
 // .el-main > *{
 //   height: 100%;
 // }
+.el-table .cell.el-tooltip{
+  white-space: break-spaces !important;
+}
 .special{
   cursor: pointer;
 }

+ 4 - 2
RMS-FrontEnd/src/views/components/common/mixins.js

@@ -67,10 +67,12 @@ export const changeTranslation = {
     handleChange(row, key) {
       switch (key) {
         case "name":
-          row.change = !row.change
+          this.$set(row,'change',!row.change)
+          // row.change = !row.change
           break
         case "abstractStr":
-          row.change2 = !row.change2
+          this.$set(row,'change2',!row.change2)
+          // row.change2 = !row.change2
           break
       }
     },

+ 4 - 6
RMS-FrontEnd/src/views/product/components/relatedPatents/components/table.vue

@@ -49,8 +49,7 @@
       </div>
     </div>
     <!-- 数据表格 -->
-    <el-table :data="tableData" border :row-key="getRowKeys" v-loading="loading" ref="table" id="table"
-      header-row-class-name="custom-table-header" style="min-width: 100%; overflow:auto">
+    <el-table :data="tableData" border :row-key="getRowKeys" v-loading="loading" ref="table" :height="tableHeight" header-row-class-name="custom-table-header" style="min-width: 100%; overflow-x:auto">
       <el-table-column width="80" align="center" v-if="!structureId">
         <template slot-scope="scope">
           <div>
@@ -69,7 +68,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-for="column in fields" :label="column.name" show-overflow-tooltip align="center">
+      <el-table-column v-for="column in fields" :label="column.name" :key="column.key" show-overflow-tooltip align="center">
         <!-- <template slot="header">
           <patent-table-view-sort :title="column.name" :prop="column.key" @on-sort="onSort" />
         </template> -->
@@ -401,8 +400,8 @@ export default {
       }
     },
     tableOffSetHeight() {
-      let b = document.getElementById("table")
-      this.tableHeight = b.offsetHeight
+      let b = document.getElementsByClassName('el-main')[0].offsetHeight-180
+      this.tableHeight =b>300?b:300
     },
     //子页面自定义字段值
     onChangeList({ field, a }) {
@@ -873,7 +872,6 @@ export default {
   },
   watch: {
     'tableData'(val, val1) {
-
       this.$nextTick(() => {
         this.tableOffSetHeight()
       })

+ 22 - 11
RMS-FrontEnd/src/views/report/FTO/FTOPage/ChosePatent.vue

@@ -48,8 +48,8 @@
           :row-key="getRowKeys"
           v-loading="loading"
           ref="table"
-          id="table"
-          style="min-width: 100%; overflow:auto">
+          :height="tableHeight"
+          style="min-width: 100%; overflow-x:auto">
             <el-table-column width="80" align="center">
               <template slot-scope="scope">
                 <div>
@@ -78,11 +78,21 @@
               <template slot-scope="scope">
                 <div style="" v-for="data in getColumnValue(scope.row, column)">
                   <template v-if="column.key === 'name'">
-                    <span v-html="getViewDom2(scope.row, 'name')"></span>
-                  </template>
-                  <template v-else-if="column.key === 'abstractStr'">
-                    <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
-                  </template>
+                      <span v-html="getViewDom2(scope.row, 'name')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'name')">
+                        <span v-if="!scope.row.change">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
+                    <template v-else-if="column.key === 'abstractStr'">
+                      <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'abstractStr')">
+                        <span v-if="!scope.row.change2">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
                   <template v-else>
                     <span v-html="getViewDom(data)"></span>
                   </template>
@@ -149,7 +159,8 @@ import { PatentDetails } from '@/views/components/common/mixins';
 // import { Contrast } from '@/views/task/components/mixins';
 import { importPatent } from '../../components/mixins';
 import PatentViewField from "@/views/product/components/relatedPatents/components/dialog/PatentViewField.vue";
-import { PatentViewFieldJs,changeTranslation, patentKeywordsHighlight } from "@/views/task/components/PatentViewField";
+import { PatentViewFieldJs, } from "@/views/task/components/PatentViewField";
+import { changeTranslation, patentKeywordsHighlight} from '@/views/components/common/mixins'
 export default {
 components:{
     SelectedPatent,
@@ -226,8 +237,8 @@ mixins:[PatentDetails,importPatent,PatentViewFieldJs,changeTranslation, patentKe
   },
   methods: {
     tableOffSetHeight() {
-      let b = document.getElementById("table")
-      this.tableHeight=b.offsetHeight
+      let b = document.getElementsByClassName('el-main')[0].offsetHeight-300
+      this.tableHeight = b>300?b:300
     },
     // onChangeOne(val) {
     //   console.log(val);
@@ -775,7 +786,7 @@ mixins:[PatentDetails,importPatent,PatentViewFieldJs,changeTranslation, patentKe
 
 <style lang="scss" >
 .ChosePatentTable .el-table .cell.el-tooltip{
-  white-space: normal; 
+  white-space: break-spaces; 
 }
 .btn1 {
   background: #909399;

+ 22 - 11
RMS-FrontEnd/src/views/report/Invalid/InvalidPage/ChosePatent.vue

@@ -106,8 +106,8 @@
               :row-key="getRowKeys"
               v-loading="loading"
               ref="table"
-              id="table"
-              style="min-width: 100%; overflow:auto">
+              :height="tableHeight"
+              style="min-width: 100%; overflow-x:auto">
               <el-table-column width="80" align="center">
                 <template slot-scope="scope">
                   <div>
@@ -141,11 +141,21 @@
               <template slot-scope="scope">
                 <div style="" v-for="data in getColumnValue(scope.row, column)">
                   <template v-if="column.key === 'name'">
-                    <span v-html="getViewDom2(scope.row, 'name')"></span>
-                  </template>
-                  <template v-else-if="column.key === 'abstractStr'">
-                    <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
-                  </template>
+                      <span v-html="getViewDom2(scope.row, 'name')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'name')">
+                        <span v-if="!scope.row.change">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
+                    <template v-else-if="column.key === 'abstractStr'">
+                      <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'abstractStr')">
+                        <span v-if="!scope.row.change2">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
                   <template v-else>
                     <span v-html="getViewDom(data)"></span>
                   </template>
@@ -218,7 +228,8 @@ import { PatentDetails } from '@/views/components/common/mixins';
 // import { Contrast } from '@/views/task/components/mixins';
 import { importPatent } from '../../components/mixins';
 import PatentViewField from "@/views/product/components/relatedPatents/components/dialog/PatentViewField.vue";
-import { PatentViewFieldJs,changeTranslation, patentKeywordsHighlight } from "@/views/task/components/PatentViewField";
+import { PatentViewFieldJs, } from "@/views/task/components/PatentViewField";
+import { changeTranslation, patentKeywordsHighlight} from '@/views/components/common/mixins'
 export default {
 components:{
     SelectedPatent,
@@ -298,8 +309,8 @@ mixins:[PatentDetails,importPatent,PatentViewFieldJs,changeTranslation, patentKe
   },
   methods: {
     tableOffSetHeight() {
-      let b = document.getElementById("table")
-      this.tableHeight=b.offsetHeight
+      let b = document.getElementsByClassName('el-main')[0].offsetHeight-300
+      this.tableHeight =b>300?b:300
     },
     // onChangeOne(val) {
     //   //console.log(val);
@@ -933,7 +944,7 @@ mixins:[PatentDetails,importPatent,PatentViewFieldJs,changeTranslation, patentKe
 
 <style lang="scss" >
 .ChosePatentTable .el-table .cell.el-tooltip{
-  white-space: normal; 
+  white-space: break-spaces; 
 }
 .btn1 {
   background: #909399;

+ 19 - 7
RMS-FrontEnd/src/views/report/components/addPatentList/addPatent.vue

@@ -47,8 +47,9 @@
                 :row-key="getRowKeys"
                 v-loading="loading"
                 ref="table"
-                id="table"
-                style="min-width: 100%; overflow:auto">
+                :height="tableHeight"
+                style="min-width: 100%; overflow-x:auto"
+                >
                 <el-table-column width="80" align="center">
                   <template slot-scope="scope">
                     <div>
@@ -73,14 +74,24 @@
                 </el-table-column>
                 <!-- <el-table-column  prop="name" label="专利标题" align="center" width="300px"> </el-table-column>
                 <el-table-column  prop="simpleStatus" align="center" label="状态"> </el-table-column> -->
-              <el-table-column v-for="column in fields" :label="column.name" show-overflow-tooltip align="center">
+              <el-table-column v-for="column in fields" :label="column.name" :key="column.key" show-overflow-tooltip align="center">
                 <template slot-scope="scope">
                   <div style="" v-for="data in getColumnValue(scope.row, column)">
                     <template v-if="column.key === 'name'">
                       <span v-html="getViewDom2(scope.row, 'name')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'name')">
+                        <span v-if="!scope.row.change">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
                     </template>
                     <template v-else-if="column.key === 'abstractStr'">
                       <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'abstractStr')">
+                        <span v-if="!scope.row.change2">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
                     </template>
                     <template v-else>
                       <span v-html="getViewDom(data)"></span>
@@ -131,7 +142,8 @@
   // import { Contrast } from '@/views/task/components/mixins';
 import { importPatent } from '../../components/mixins';
 import PatentViewField from "@/views/product/components/relatedPatents/components/dialog/PatentViewField.vue";
-import { PatentViewFieldJs,changeTranslation, patentKeywordsHighlight } from "@/views/task/components/PatentViewField";
+import { PatentViewFieldJs, } from "@/views/task/components/PatentViewField";
+import { changeTranslation, patentKeywordsHighlight} from '@/views/components/common/mixins'
   export default {
   components: {
     PatentViewField
@@ -207,8 +219,8 @@ import { PatentViewFieldJs,changeTranslation, patentKeywordsHighlight } from "@/
     },
     methods: {
       tableOffSetHeight() {
-        let b = document.getElementById("table")
-        this.tableHeight=b.offsetHeight
+        let b = document.getElementsByClassName('el-main')[0].offsetHeight-200
+      this.tableHeight =b>300?b:300
       },
       // onChangeOne(val) {
       //   //console.log(val);
@@ -721,7 +733,7 @@ import { PatentViewFieldJs,changeTranslation, patentKeywordsHighlight } from "@/
   
 <style lang="scss" >
 .addPatent .el-table .cell.el-tooltip{
-  white-space: normal; 
+  white-space: break-spaces; 
 }
   .btn1 {
     background: #909399;

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

@@ -28,15 +28,25 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column v-for="column in fieldsArr" :label="column.name" show-overflow-tooltip align="center">
+            <el-table-column v-for="column in fieldsArr" :label="column.name" :key="column.key" show-overflow-tooltip align="center">
               <template slot-scope="scope">
                 <div style="" v-for="data in getColumnValue(scope.row, column)">
                   <template v-if="column.key === 'name'">
-                    <span v-html="getViewDom2(scope.row, 'name')"></span>
-                  </template>
-                  <template v-else-if="column.key === 'abstractStr'">
-                    <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
-                  </template>
+                      <span v-html="getViewDom2(scope.row, 'name')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'name')">
+                        <span v-if="!scope.row.change">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
+                    <template v-else-if="column.key === 'abstractStr'">
+                      <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'abstractStr')">
+                        <span v-if="!scope.row.change2">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
                   <template v-else>
                     <span v-html="getViewDom(data)"></span>
                   </template>
@@ -76,7 +86,8 @@
 <script>
 import { PatentDetails } from '@/views/components/common/mixins';
 // import { Contrast } from '@/views/task/components/mixins';
-import {PatentViewFieldJs,changeTranslation, patentKeywordsHighlight} from "@/views/task/components/PatentViewField";
+import { PatentViewFieldJs, } from "@/views/task/components/PatentViewField";
+import { changeTranslation, patentKeywordsHighlight} from '@/views/components/common/mixins'
 export default {
   mixins:[PatentDetails,PatentViewFieldJs,changeTranslation, patentKeywordsHighlight],
   props:["fieldsArr","activeName","reportId","onChangesIn",'type','signPatentNo',"taskStatus","formS","taskFeilSure",'taskSources','reportMessage',"height"],//queryParams
@@ -203,7 +214,7 @@ export default {
 <style lang="scss">
 .customTable{
   .el-table .cell.el-tooltip{
-    white-space: normal; 
+    white-space: break-spaces; 
   }
   .el-footer{
     border: none;

+ 1 - 1
RMS-FrontEnd/src/views/report/reportDetails/index.vue

@@ -82,7 +82,7 @@ export default {
         this.setData()
     },
   mounted() {
-    this.height = document.querySelector('.admin-main-box').clientHeight
+        this.height = document.querySelector('.admin-main-box').clientHeight
         this.changePageTitle()
     },
     methods: {

+ 7 - 9
RMS-FrontEnd/src/views/task/components/Incomplete.vue

@@ -17,27 +17,24 @@
      
       <el-container>
         <!-- 'calc(100% - 321px)' : 'calc(100% - 21px)' -->
-        <div v-if="this.taskWorkRemakShow">
-          <el-aside class=""  :style="{ width: showLeft ? '280px' : '0px' }" v-if="!this.coordination && this.queryParams.type!=1"> 
+        <div v-if="this.queryParams.type!=1">
+          <el-aside class=""  :style="{ width: showLeft ? '280px' : '0px' }"> 
             <!-- <Tree @on-change="treeFilterChange" :reportId="reportId" :taskId="queryParams.taskId" @onChange="onChanges"></Tree> -->
             <customFields @onTaskStatus="onTaskStatus" :reportId="reportId" :taskId="queryParams.taskId" @onChange="onChanges" :isHidden="isHidden" :style="{height : (height - 50) + 'px'}"></customFields>
           </el-aside>
         </div>
         <el-main class="main-box">
-          <div style=" margin-bottom: 10px; display: flex;justify-content: space-between;" v-if="!this.coordination && this.queryParams.type!=1">
-              <el-tooltip class="item" effect="dark" :content="(showLeft ? '隐藏' : '显示') + '左侧自动定义栏位'" placement="top" style="" v-if="this.taskWorkRemakShow">
+          <div style=" margin-bottom: 10px; display: flex;justify-content: space-between;" v-if="!this.coordination ">
+              <el-tooltip class="item" effect="dark" :content="(showLeft ? '隐藏' : '显示') + '左侧自动定义栏位'" placement="top" style="" v-if="this.taskWorkRemakShow && this.queryParams.type!=1">
                 <i :class="showLeft ? 'el-icon-s-fold' : 'el-icon-s-unfold'" style="font-size: 25px;  margin-top: 5px;color: #2f2f2f; cursor: pointer" @click="showLeft=!showLeft "></i>
               </el-tooltip>
-            <div style="display: flex;">
+            <div style="display: flex;justify-content: flex-end;width:100%">
               <el-button size="small" type="warning" @click="handleFieldManage" style="margin-right: 10px;">显示栏位管理</el-button>
-              <div class="btn1" @click="sift" style="width:80px;height:32px;right: 100px;display:flex;justify-content:space-around;border-radius:5px; cursor: pointer; ">
+              <div class="btn1" @click="sift" style="width:80px;height:32px;right: 100px;display:flex;justify-content:space-around;border-radius:5px; cursor: pointer; " >
                 <img src="@/assets/img/filtrationSearch.png" alt="" style="width:16px;height:16px;margin-top:9px;margin-left:8px"><p style="margin:0 8px 0 0;line-height:32px;color:white;font-size:14px">筛选 </p> 
               </div>
             </div>
           </div>
-          <div v-if="this.coordination || this.queryParams.type==1" style="margin-bottom: 10px;float: right;">
-            <el-button size="small" type="warning" @click="handleFieldManage" style="margin-right: 10px;">显示栏位管理</el-button>
-          </div>
           <!-- <el-tabs v-model="activeName" class="">
             <el-tab-pane name="first" label="未读">
             </el-tab-pane>
@@ -218,6 +215,7 @@ export default {
 
 .btn1:hover {
   background-color: #a4a7ab;
+  
 }
 
 </style>

+ 19 - 8
RMS-FrontEnd/src/views/task/components/IncompletePage.vue

@@ -18,15 +18,25 @@
             </el-table-column>
             <!-- <el-table-column prop="name" label="专利标题" sortable width="300" align="center"></el-table-column>
             <el-table-column prop="abstractStr" label="摘要" sortable  align="center"></el-table-column> -->
-            <el-table-column v-for="column in fieldsArr" :label="column.name" show-overflow-tooltip align="center">
+            <el-table-column v-for="column in fieldsArr" :label="column.name" :key="column.key" show-overflow-tooltip align="center">
               <template slot-scope="scope">
                 <div style="" v-for="data in getColumnValue(scope.row, column)">
                   <template v-if="column.key === 'name'">
-                    <span v-html="getViewDom2(scope.row, 'name')"></span>
-                  </template>
-                  <template v-else-if="column.key === 'abstractStr'">
-                    <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
-                  </template>
+                      <span v-html="getViewDom2(scope.row, 'name')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'name')">
+                        <span v-if="!scope.row.change">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
+                    <template v-else-if="column.key === 'abstractStr'">
+                      <span v-html="getViewDom2(scope.row, 'abstractStr')"></span>
+                      <br>
+                      <el-link type="primary" @click.native="handleChange(scope.row, 'abstractStr')">
+                        <span v-if="!scope.row.change2">切换译文</span>
+                        <span v-else>切换原文</span>
+                      </el-link>
+                    </template>
                   <template v-else>
                     <span v-html="getViewDom(data)"></span>
                   </template>
@@ -44,7 +54,8 @@
 
 <script>
 import { Contrast } from './mixins';
-import {PatentViewFieldJs,changeTranslation, patentKeywordsHighlight} from "@/views/task/components/PatentViewField";
+import { PatentViewFieldJs, } from "@/views/task/components/PatentViewField";
+import { changeTranslation, patentKeywordsHighlight} from '@/views/components/common/mixins'
 export default {
  
   mixins:[Contrast, changeTranslation, patentKeywordsHighlight,PatentViewFieldJs],
@@ -167,6 +178,6 @@ export default {
 
 <style lang="scss">
 .incompleteTable .el-table .cell.el-tooltip{
-  white-space: normal; 
+  white-space: break-spaces; 
 }
 </style>

+ 59 - 401
RMS-FrontEnd/src/views/task/components/PatentViewField.js

@@ -7,7 +7,10 @@ export const PatentViewFieldJs = {
     }
   },
   mounted() {
-    this.getPatentViewField()
+    if(!this.coordination){
+      this.getPatentViewField()
+    }
+    
   },
   methods: {
       // 请求显示栏位管理数据
@@ -19,16 +22,67 @@ export const PatentViewFieldJs = {
           refresh: refresh
       }
       // console.log(this.reportId,params);
-        const { data } = await this.$api.getUserSettingField(params)
-        this.patentViewField = data
+      await this.$api.getUserSettingField(params).then(response=>{
+        if(response.code == 200){
+           this.patentViewField = response.data
+           this.handleFields(this.patentViewField)
+        }
+      }).catch(error=>{
+        this.fields = [
+          {
+            "key": "publicNo",
+            "name": "公开号",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "name",
+            "name": "标题",
+            "type": "list",
+            "order": 1,
+            "hidden": true
+          },
+          {
+            "key": "publicDate",
+            "name": "公开日",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "simpleStatus",
+            "name": "专利状态",
+            "type": "list",
+            "order": 0,
+            "hidden": true
+          },
+          {
+            "key": "applicant2",
+            "name": "权利人",
+            "type": "list",
+            "order": 20,
+            "hidden": true
+          },
+          {
+            "key": "applicant4",
+            "name": "申请人",
+            "type": "list",
+            "order": 22,
+            "hidden": true
+          }
+        ]
+      })
+        // const { data } = await this.$api.getUserSettingField(params)
+       
         // this.patentViewField = data.filter(item => {
         //   return item.type=='list'
         // })
-        this.handleFields(this.patentViewField)
+        
       },
       // 显示栏位管理
       async handleFieldManage() {
-        await this.getPatentViewField()
+        // await this.getPatentViewField()
         this.viewSelected =(this.queryParams.taskId + this.signPatentNo)?this.queryParams.taskId + this.signPatentNo:this.reportId
         // console.log(this.viewSelected);
         this.$refs.patentViewField.open(this.patentViewField,this.viewSelected)
@@ -92,399 +146,3 @@ export const PatentViewFieldJs = {
     },
   },
 }
-
-export const changeTranslation = {
-  methods: {
-    getViewDom2(row, key,field) {
-      let text = ""
-      const change = row.change
-      const change2 = row.change2
-      switch (key) {
-        case "name":
-          text = !change ? "name" : "nameOut"
-          break
-        case "abstractStr":
-          text = !change2 ? "abstractStr" : "abstractOut"
-          break
-      }
-      return this.getViewDom(row[text],field)
-    },
-    handleChange(row, key) {
-      switch (key) {
-        case "name":
-          row.change = !row.change
-          break
-        case "abstractStr":
-          row.change2 = !row.change2
-          break
-      }
-    },
-  }
-}
-
-export const patentKeywordsHighlight = {
-
-  data() {
-    return {
- 
-    }
-  },
-  watch:{
- 
-  },
-  computed: {
-    highlight() {
-      return this.$store.state.patent.highlight
-    },
-    contrastList(){
-      return this.$store.state.report.contrastList
-    }
-
-  },
-  watch:{
-    'contrastList'(val){
-      // console.log(val)
-    }
-  },
-  mounted() {
-    // window.selectMark = this.selectMark
-  },
-  methods: {
-    getViewDom(text,field) {
-     if(this.contrastList){
-       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){
-            var a = {
-            color:"#dff209",
-            Type:2,
-            Id:this.contrastList[i].id,
-            column:this.contrastList[i].fields,
-            index:Number(this.contrastList[i].position),
-            text:this.contrastList[i].content,
-            temNode:text
-          }
-          if(i==0){
-            a.pass = true
-          }else{
-            a.pass = false
-          }
-          text = this.AddClass1(a);
-          }
-        }
-        
-        
-      }
-     }
-     
-      if (!this.highlight.enable || !text) {
-        return text
-      }
-      try {
-        
-        this.highlight.configs.map(item => {
-          const keywords = item.keywords.split(';')
-          for (let keyword of keywords) {
-            if (!keyword) {
-              continue
-            }
-            let sText = text
-            let num = -1
-            const rStr = new RegExp(keyword, "g")
-            const rHtml = new RegExp("\<.*?\>", "ig")
-            const sKey = `<span style="background: ${item.color};color: #fff">${keyword}</span>`
-            const aHtml = sText.match(rHtml)
-            sText = sText.replace(rHtml, '{~}')
-            sText = sText.replace(rStr, sKey)
-            sText = sText.replace(/{~}/g, () => {
-              num++
-              return aHtml[num]
-            })
-            text = sText
-          }
-        })
-        
-      } catch (e) {
-      }
-      return text
-    },
-    SplitHtmlTag1(el){
-      let temInnerHtml = el.trim();
-      let pattern = /<[^>]+>/g;
-      let Indexs =[];
-      let i=0
-      var match = null
-      while((match = pattern.exec(temInnerHtml)) != null){
-          Indexs[i] = match;
-          //Indexs[i] =[ match.index,m.value];
-          i++;
-      }
-      //var m = temInnerHtml.match(pattern);
-      var splitStrings = new Array();
-      i=0;
-      var currentIndex =0;
-      for(var index=0;index<Indexs.length;index++){
-          if(Indexs[index].index >currentIndex){
-              splitStrings[i] = {"text":  temInnerHtml.substring(currentIndex,Indexs[index].index), "type":"text"};
-              i++;
-              splitStrings[i] = {"text":  Indexs[index][0], "type":"tag"};
-              i++;
-          }
-          else
-          {
-              splitStrings[i] = {"text":  Indexs[index][0], "type":"tag"};;
-              i++;
-          }
-
-          currentIndex = Indexs[index].index + Indexs[index][0].length;
-
-      }
-
-      if(currentIndex< temInnerHtml.length){
-          splitStrings[i] = {"text": temInnerHtml.substring(currentIndex,temInnerHtml.length), "type":"text"};
-      }
-
-      return splitStrings;
-
-  },
-  selectMark(Id){
-  // this.selectMarkObjectId = Id;
-//   this.showPizhu();
-var index = this.contrastList.findIndex(item=>{
-  return item.id == Id
-})
-if(index!=-1){
-  
-  this.ruleForm = {
-    id:this.contrastList[index].id,
-    index:this.contrastList[index].position,
-    content:this.contrastList[index].content,
-    position:this.contrastList[index].fields,
-    features:this.contrastList[index].features,
-    featureslist:this.contrastList[index].featuresIdList
-  }
-  this.selectedFeatures = []
-  for(var i=0;i<this.contrastList[index].features.length;i++){
-    this.selectedFeatures.push({
-      id:this.contrastList[index].features[i].id,
-      pRightName:this.contrastList[index].features[i].rightName,
-      content:this.contrastList[index].features[i].content,
-      comResult:this.contrastList[index].assoRecordsFeatures[i].comResult,
-    })
-  }
-  // this.selectedFeaturesId=this.contrastList[index].featuresId
-  // this.$set(this.ruleForm,'',a)
-  if(this.visible == undefined){
-    var a = {
-      ruleForm:this.ruleForm,
-      selectedFeatures:this.selectedFeatures
-    }
-    this.$emit('getVisible',a)
-  }else{
-     this.visible = true
-  }
- 
-}
-
-  },
-    AddClass1(selectObject){
-          //  let el = this.getColumnNode(selectObject.column);
-         let el = selectObject.temNode;
-         if(selectObject.pass){
-          var splitStrings =[{
-            text:selectObject.temNode,
-            type:'text'
-          }]
-           
-         }else{
-          var splitStrings = this.SplitHtmlTag1(el);
-         }
-         
-  
-        let bgColor = selectObject.color;
-        let startTag ='<span  id="' + selectObject.Id +'" style="background-color:' + selectObject.color + '">';
-        if(selectObject.Type ==1){
-            startTag ='<span onclick="selectMark(\'' + selectObject.Id + '\')" id="' + selectObject.Id +'" style="border-bottom:2px solid ' + selectObject.color + '">';
-        }
-        let imgTag = '<span onclick="selectMark(\'' + selectObject.Id + '\')" Id="' + selectObject.Id + '"><i class="el-icon-location-outline"></i></span>';
-        let endTag ='</span>';
-        let elText = '';
-  
-        splitStrings.forEach(function (item){
-            if(item.type =='text'){
-                elText = elText + item.text;
-            }
-        });
-  
-       
-        let Indexs =[];
-        let i=0
-
-        if(selectObject.index <0){
-           let pattern = new RegExp(selectObject.text.replace(/[\r\n]/g,"").replace(/\ +/g,""),"g");
-            while((match = pattern.exec(elText)) != null){
-                Indexs[i] = match;
-                // console.log(match);
-                //Indexs[i] =[ match.index,m.value];
-                i++;
-            }
-        }
-        else
-        {
-            Indexs[i] = [selectObject.text];
-            Indexs[i].index =selectObject.index;
-        }
-        Indexs.forEach(function (match){
-          let currentIndex =0;
-          let temSplitStrings = new Array();
-          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,' ')
-                      // 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,'')
-                      if(b.substring(0,match.index).indexOf('\r')==-1){
-                         var a = b.substring(0,match.index).match(/\n/g)
-                          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)
-                          if(match.index > currentIndex){
-                            // var a =item.text.substring(0,match.index-currentIndex)
-                            // console.log(a)
-                            // var num = Number(a.match(/\r\n/g).length)+1+Number(match.index)
-                              temSplitStrings.push({text:item.text.substring(0,match.index-currentIndex),type:'text'});
-                              // console.log(temSplitStrings)
-                          }
-                          // console.log('进了',1)
-                          temSplitStrings.push({text:startTag,type:'tag'});
-                          temSplitStrings.push({text:match[0],type:'text'});
-                          if(selectObject.Type ==2){
-                            // console.log(12)
-                            temSplitStrings.push({text:imgTag,type:'tag'});
-                        }
-                          temSplitStrings.push({text:endTag,type:'tag'});
-                          
-                          if((match.index + match[0].length) < (currentIndex + item.text.length)){
-                              temSplitStrings.push({text:item.text.substring((match.index + match[0].length)-currentIndex),type:'text'}); 
-                          }
-                      }
-                      else
-                      {
-                        if(item.text.indexOf(match[0])!=-1){
-                          // console.log('进了',2)
-                          if(match.index > currentIndex){
-                              temSplitStrings.push({text:item.text.substring(0,match.index-currentIndex),type:'text'});
-                          }
-                          if(temSplitStrings.length>1){
-                              // console.log(temSplitStrings[temSplitStrings.length-2].text.substr(1,1))
-                              if(temSplitStrings[temSplitStrings.length-2].text.substr(1,1)!='/'){
-                                  let index = temSplitStrings[temSplitStrings.length-2].text.indexOf('background-color:')
-                                  let colorStr = temSplitStrings[temSplitStrings.length-2].text.substr(index+17,7)
-                                  let index2 = startTag.indexOf('background-color:')
-                                  let colorStr2 = startTag.substr(index2+17,7)
-                              let acolor = colourBlend(colorStr,colorStr2,0.5)
-                              let startTag2 = "<span style='background-color:"+acolor+"'>"
-                              temSplitStrings.push({text:startTag2,type:'tag'});  
-                              }else{
-                                  temSplitStrings.push({text:startTag,type:'tag'});
-                              }
-                              
-                          }else{
-                              temSplitStrings.push({text:startTag,type:'tag'});
-                          }
-                         
-                          temSplitStrings.push({text:item.text.substring(match.index-currentIndex),type:'text'});     
-                          temSplitStrings.push({text:endTag,type:'tag'});
-                        }else{
-                          temSplitStrings.push(item);
-                        }
-                          
-                      }
-                      
-                  }
-                  else
-                  {
-                     
-                      if((match.index + match[0].length) <= (currentIndex + item.text.length) && (match.index + match[0].length)>currentIndex){
-                        // console.log('进了',3)
-                          // console.log( temSplitStrings[temSplitStrings.length-1])
-                          if(temSplitStrings[temSplitStrings.length-1].text.substr(1,1)!='/'){
-                               let index = temSplitStrings[temSplitStrings.length-1].text.indexOf('background-color:')
-                               let colorStr = temSplitStrings[temSplitStrings.length-1].text.substr(index+17,7)
-                               let index2 = startTag.indexOf('background-color:')
-                               let colorStr2 = startTag.substr(index2+17,7)
-                               let acolor = colourBlend(colorStr,colorStr2,0.5)
-                               let startTag2 = "<span style='background-color:"+acolor+"'>"
-                          temSplitStrings.push({text:startTag2,type:'tag'});
-                          }else{
-                              temSplitStrings.push({text:startTag,type:'tag'});
-                          }
-                         
-                          temSplitStrings.push({text:item.text.substring(0,match.index + match[0].length-currentIndex),type:'text'});
-                          if(selectObject.Type ==2){
-                            temSplitStrings.push({text:imgTag,type:'tag'});
-                        }
-                          temSplitStrings.push({text:endTag,type:'tag'});
-                          // console.log(3)
-                          if((match.index + match[0].length) < (currentIndex + item.text.length)){
-                              temSplitStrings.push({text:item.text.substring((match.index + match[0].length-currentIndex)),type:'text'}); 
-                          }
-                      }
-                      else
-                      {
-                          if(match.index < currentIndex && (match.index + match[0].length) >= (currentIndex + item.text.length)){
-                              // console.log('进了',4)
-                              temSplitStrings.push({text:startTag,type:'tag'});
-                              temSplitStrings.push(item);
-                              temSplitStrings.push({text:endTag,type:'tag'});
-                          }
-                          else
-                          {
-                              // console.log('进了',5)
-                              temSplitStrings.push(item);
-                          }
-                          
-                      }
-                      
-                  }
-  
-                  currentIndex = currentIndex + item.text.length;
-                }else{
-                  temSplitStrings.push(item);
-                }
-                 
-              }
-              else
-              {
-                  temSplitStrings.push(item);
-              }
-          });
-          
-          splitStrings = temSplitStrings;
-      });
-       
-        let temInnerHtml = '';
-        splitStrings.forEach(function (item){
-            temInnerHtml = temInnerHtml + item.text;
-        });
-        return temInnerHtml;
-    
-  },
-  }
-}