将公开号换成专利号

RMS-FrontEnd/src/router/index.js

@@ -404,17 +404,18 @@ const routes = [
         component: () => import('@/views/product/components/relatedPatents/components/import/index.vue'),
       
       },
-       {
-         path: "/articlesContrastIndex/:id",
-         meta: {
-          title: '专利详情',
-          button: [],
-          aside: true,
-          hiddenHeader:true
-        },
-        component: () => import('@/views/components/articles/ContrastIndex.vue'),
+      //  {
+      //    path: "/articlesContrastIndex/:id",
+      //    meta: {
+      //     title: '专利详情',
+      //     button: [],
+      //     aside: true,
+      //     hiddenHeader:true
+      //   },
+      //   // component: () => import('@/views/components/articles/ContrastIndex.vue'),
+      //   component: () => import('@/views/product/components/relatedPatents/components/patentDetails.vue'),
       
-      },
+      // },
       
       {
         path: "/mindIndex",

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

@@ -50,7 +50,7 @@
           <div class="patent-articles-content-left1" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
             <div class="dom1 box1" v-dragControllerDiv1 style="display:flex;width:100%">
               <div class="component left1" style="width:100%;overflow-y:auto;overflow-x: hidden;padding-bottom:10px" :style="{height:height}">
-                <component :is="componentName" v-on="$listeners" v-bind="$attrs" :type1='type' :isTrue="isTrue" @openContrast='openContrast' :patent="patent" :patent-id="patentId" :signPatentNo="signPatentNo" :patentNo="this.activeMenu == 'patentWorth'?[patentNo?patentNo:productPublicNo]:patentNo" :publicNo="publicNo" :domId="patentNo + '2'" :reportId="reportId" :pdfType1="getPDFType()" @refresh="getPatent(patent.patentNo)"></component>
+                <component :is="componentName" v-on="$listeners" v-bind="$attrs" :type1='type' :isTrue="isTrue" @openContrast='openContrast' :patent="patent" :patent-id="patentId" :signPatentNo="signPatentNo" :patentNo="this.activeMenu == 'patentWorth'?[patentNo]:patentNo" :domId="patentNo + '2'" :reportId="reportId" :pdfType1="getPDFType()" @refresh="getPatent(patent.patentNo)"></component>
               </div>
               <div class="resize2" title="收缩侧边栏" v-show="(radio == 2 || radio == 3) && activeMenu != activeMenu2"><p><span>˙</span><span>˙</span><span>˙</span></p></div>
               <div class="resize1" title="收缩侧边栏" v-show="(radio == 4 || radio == 5) && activeMenu != activeMenu2"><span>⋮</span></div>
@@ -71,8 +71,8 @@
               </el-header>
               <el-main>
                 <keep-alive>
-                  <component :is="activeOption" :patent-id="patentId" :publicNo="publicNo" :reportId="reportId" :patentNo1="patentNo"></component>
-                    <component :is="activeOption" :patent-id="patentId" :publicNo="publicNo" :reportId="reportId" :patentNo1="patentNo"></component>
+                  <component :is="activeOption" :patent-id="patentId" :patentNo="patentNo" :reportId="reportId" :patentNo1="patentNo"></component>
+                    <component :is="activeOption" :patent-id="patentId" :patentNo="patentNo" :reportId="reportId" :patentNo1="patentNo"></component>
                 </keep-alive>
               </el-main>
             </el-container>
@@ -141,16 +141,8 @@ export default {
     HistoryOfInvalidEvidence,
     InvalidEvidencePush
   },
-  props:['patentMessage','publicNo','signPatentNo','reportId','type','isTrue',"taskId","patentStatus2A",'showEvidence'],
-  // props: {
-  //   'patentMessage':String,
-  //   'publicNo':String,
-  //   'signPatentNo':String,
-  //   'reportId':{
-  //     default:null
-  //   },
-   
-  // },
+  props:['patentMessage','patentNo','signPatentNo','reportId','type','isTrue',"taskId","patentStatus2A",'showEvidence'],
+
   data() {
     return {
       // visible2:false,
@@ -169,8 +161,7 @@ export default {
       componentName: 'PatentBasic',
       activeOption: 'PatentField',
       loading: false,
-      patentNo:"",
-      productPublicNo:"",
+      // patentNo:"",
       menuList: [
         {
           value: 'PatentBasic',
@@ -254,15 +245,11 @@ export default {
     }
   },
   created() {
-    this.patentNo = this.$route.query.patentNo
-    // productPublicNo接收产品相关专利的专利号
-    this.productPublicNo = this.$route.query.publicNo
-    // console.log(this.patentMessage)
-    // this.onChange(this.patentMessage)
+    // this.patentNo = this.$route.query.patentNo
   },
   watch: {
    
-    publicNo(val) {
+    patentNo(val) {
       // console.log(val);
       if (this.fix != true) {
           this.getPatent(val)
@@ -288,34 +275,24 @@ export default {
     fix(val) {
       this.$emit('on-change', val)
     },
-    // visible2(val){
-    //   if(val){
-    //     this.$emit('getVisible',true)
-    //     this.visible2 = false
-    //   }
-    // },
     patentStatus2(val) {
       let value = {
-        patentNo: this.publicNo,
+        patentNo: this.patentNo,
         patentStatus2:this.patentStatus2
       }
       this.$emit("patentStatusEmit",value)
     },
     patentStatus2A(val) {
-      if (this.publicNo==val.patentNo) {
+      if (this.patentNo==val.patentNo) {
         this.patentStatus2=val.patentStatus2
       }
     }
   },
   mounted() {
-    if(this.publicNo || this.productPublicNo){
-      let publicNo=this.publicNo?this.publicNo:this.productPublicNo
-      this.getPatent(publicNo)
+    if(this.patentNo){
+      let patentNo=this.patentNo
+      this.getPatent(patentNo)
     }
-    // if(this.signPatentNo){
-    //   console.log(this.signPatentNo)
-    //   this.getContrastList()
-    // }
     
   },
   methods: {
@@ -392,7 +369,7 @@ export default {
       this.fix = true
     },
     changePageTitle() {
-      document.title = `${this.patent.publicNo} ${this.patent.name || ''}`
+      document.title = `${this.patent.patentNo} ${this.patent.name || ''}`
     },
     // async onChange(data) {
     //   await this.getPatent(data.id)
@@ -405,18 +382,14 @@ export default {
     //   this.patentId = data.id
     //   this.changePageTitle()
     // },
-    async getPatent(publicNo) {
-      // console.log(publicNo)
+    async getPatent(patentNo) {
       this.loading = true
-      const response = await this.$api.PatentByPatentNo({patentNo : publicNo})
+      const response = await this.$api.PatentByPatentNo({patentNo : patentNo})
       // console.log(response)
       this.patent = response.data
       if(this.taskId){
          this.getPatentStatus(response.data.patentNo)
       }
-      // if (this.publicNo == this.patent.publicNo) {
-      //   this.showcard = false
-      // }
       const country = getPatentCountry(this.patent.patentNo)
       let change = false
       if (country !== 'CN') {
@@ -426,9 +399,8 @@ export default {
       this.$set(this.patent, 'change2', change)
       this.loading = false
       this.changePageTitle()
-      if(this.reportId){
-        this.getPiZhuContrastList(this.patent.publicNo)
-      }
+        this.getPiZhuContrastList(this.patent.patentNo)
+      
       
     },
     getPiZhuContrastList(val) {
@@ -441,9 +413,9 @@ export default {
         }
       }
       let params = {
-        patentNo: val?val:this.patent.publicNo,
-        id: this.reportId,
-        createFrom:this.reportId?2:0
+        patentNo: val?val:this.patent.patentNo,
+        id: (this.reportId && !isNaN(this.reportId)) ?this.reportId:null,
+        createFrom:(this.reportId && !isNaN(this.reportId)) ?2:0
       }
       this.$api.scratchWordsQuery(params).then(response => {
         if (response.code==200) {
@@ -458,24 +430,7 @@ export default {
         }
       })
     },
-    // async getPatent(id) {
-    //   this.loading = true
-    //   const response = await this.$api.getPatentById(id, { projectId: this.projectId })
-    //   // console.log(this.publicNo)
-    //   this.patent = response.data
-    //   if (this.publicNo == this.patent.publicNo) {
-    //     this.showcard = false
-    //   }
-    //   const country = getPatentCountry(this.patent.patentNo)
-    //   let change = false
-    //   if (country !== 'CN') {
-    //     change = true
-    //   }
-    //   this.$set(this.patent, 'change', change)
-    //   this.$set(this.patent, 'change2', change)
-    //   this.loading = false
-    //   this.changePageTitle()
-    // },
+   
     handleSelect2(index, path) {
 
     },
@@ -518,7 +473,7 @@ export default {
       if(val == '0'){
         var a = {
           taskID:this.taskId,
-          patentNo:this.publicNo
+          patentNo:this.patentNo
         }
         this.$api.updatePatentStatus(a).then(response=>{
           if(response.code == 200){

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

@@ -59,7 +59,7 @@
       <el-col :span="6">
          <el-card shadow="never" class="text-align_center" style="margin-top:50px" data-type="附图">
           <!-- <el-image :src="getImagePath(patent.abstractPath)" :preview-src-list="[getImagePath(patent.abstractPath)]" style="height: 200px;"></el-image> -->
-          <el-image v-if="(!reportId && patent.abstractPath2)||reportId" :src="patent.abstractPath2?patent.abstractPath2:getImagePath1(patent)" :preview-src-list="[patent.abstractPath2]" :style="{width:style.width,height:style.height}">
+          <el-image v-if="(!reportId && patent.abstractPath2)||reportId" :src="patent.abstractPath2?patent.abstractPath2:getImagePath1(patent)" :preview-src-list="[patent.abstractPath2]" :style="{width:patent.imgWidth?patent.imgWidth:'100%',height:patent.imgHeight?patent.imgHeight:'100%'}">
             <div slot="error" class="image-slot">
               <el-image :src="getErrorImage(patent)" :preview-src-list="[getErrorImage(patent)]">
                 <div slot="error" class="image-slot">

RMS-FrontEnd/src/views/components/articles/components/history/InvalidEvidencePush.vue

@@ -146,6 +146,9 @@ export default {
         if(response.code == 200){
           this.tableData = response.data.records
           this.total = response.data.total
+          if (this.tableData.length > 0) {
+            this.expands = [this.tableData[0].patentNo]
+          }
           // response.data.forEach(item=>{
           //   item.features.forEach(y=>{
           //     y.CompareRecords.forEach(i=>{

RMS-FrontEnd/src/views/components/articles/components/history/examination.vue

@@ -86,7 +86,7 @@ export default {
       litigationData: [],
       invalidData: [],
       queryParams: {
-        patentNo: this.patent.publicNo,
+        patentNo: this.patent.patentNo,
         familyId: 0,
         current: 1,
         size: 10,
@@ -98,7 +98,7 @@ export default {
   },
   watch:{
       patent(val){
-            this.queryParams.patentNo = val.publicNo
+            this.queryParams.patentNo = val.patentNo
             this.getList()
         }
    },
@@ -200,7 +200,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           this.$api.updateReviewHistory(formData).then(res => { 
@@ -215,7 +215,7 @@ export default {
       if (row.vVisible == false) {
         // let data = {
         //   id: row.id,
-        //   patentNo: this.patent.publicNo,
+        //   patentNo: this.patent.patentNo,
         //   time: row.time,
         //   event: row.event,
         //   reviewExplain: row.reviewExplain,
@@ -227,7 +227,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           await this.$api.updateReviewHistory(formData).then(res => { 

RMS-FrontEnd/src/views/components/articles/components/history/file.vue

@@ -153,7 +153,7 @@ export default {
       if (row.vVisible == false) {
         // let data = {
           
-        //   patentNo: this.patent.publicNo,
+        //   patentNo: this.patent.patentNo,
         //   id: row.id,
         //   newPatentNo:row.newPatentNo,
         //   person: row.person,
@@ -168,7 +168,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           this.$api.editInvalidRecord(formData).then(res => { 

RMS-FrontEnd/src/views/components/articles/components/history/invalid.vue

@@ -98,7 +98,7 @@ export default {
       litigationData: [],
       invalidData: [],
       queryParams: {
-        patentNo: this.patent.publicNo,
+        patentNo: this.patent.patentNo,
         familyId: 0,
         current: 1,
         size: 10,
@@ -110,7 +110,7 @@ export default {
   },
   watch:{
         patent(val){
-            this.queryParams.patentNo = val.publicNo
+            this.queryParams.patentNo = val.patentNo
             this.getList()
         }
    },
@@ -214,7 +214,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           this.$api.editInvalidRecord(formData).then(res => { 
@@ -229,7 +229,7 @@ export default {
       if (row.vVisible == false) {
         // let data = {
           
-        //   patentNo: this.patent.publicNo,
+        //   patentNo: this.patent.patentNo,
         //   id: row.id,
         //   newPatentNo:row.newPatentNo,
         //   person: row.person,
@@ -244,7 +244,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
          await this.$api.editInvalidRecord(formData).then(res => { 

RMS-FrontEnd/src/views/components/articles/components/history/litigation.vue

@@ -116,7 +116,7 @@ export default {
       litigationData: [],
       invalidData: [],
       queryParams: {
-        patentNo: this.patent.publicNo,
+        patentNo: this.patent.patentNo,
         familyId: 0,
         current: 1,
         size: 10,
@@ -128,7 +128,7 @@ export default {
   },
   watch:{
         patent(val){
-            this.queryParams.patentNo = val.publicNo
+            this.queryParams.patentNo = val.patentNo
             this.getList()
         }
    },
@@ -230,7 +230,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           this.$api.editLitigationHistory(formData).then(res => { 
@@ -245,7 +245,7 @@ export default {
       if (row.vVisible == false) {
         // let data = {
         //   id: row.id,
-        //   patentNo: this.patent.publicNo,
+        //   patentNo: this.patent.patentNo,
         //   caseDetails: row.caseDetails,
         //   plaintiff: row.plaintiff,
         //   defendant: row.defendant,
@@ -262,7 +262,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           await this.$api.editLitigationHistory(formData).then(res => { 

RMS-FrontEnd/src/views/components/articles/components/history/other.vue

@@ -83,7 +83,7 @@ export default {
       litigationData: [],
       invalidData: [],
       queryParams: {
-        patentNo: this.patent.publicNo,
+        patentNo: this.patent.patentNo,
         familyId: 0,
         current: 1,
         size: 10,
@@ -95,7 +95,7 @@ export default {
   },
   watch:{
         patent(val){
-            this.queryParams.patentNo = val.publicNo
+            this.queryParams.patentNo = val.patentNo
             this.getList()
         }
    },
@@ -198,7 +198,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           this.$api.updateReferences(formData).then(res => { 
@@ -213,7 +213,7 @@ export default {
       if (row.vVisible == false) {
         // let data = {
         //   id: row.id,
-        //   patentNo: this.patent.publicNo,
+        //   patentNo: this.patent.patentNo,
         //   referencesName: row.referencesName,
         //   referencesExplain: row.referencesExplain,
         //   fileName: row.fileName,
@@ -225,7 +225,7 @@ export default {
               formData.append("files", row.fileList[i]);
             }
           }
-          row.patentNo = this.patent.publicNo
+          row.patentNo = this.patent.patentNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
           await this.$api.updateReferences(formData).then(res => { 

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

@@ -32,7 +32,7 @@ export const commonMixins = {
     window.addEventListener('resize', this.changeWidth)
   },
   methods: {
-    changeWidth(){
+    changeWidth() {
       var dom = document.querySelector('.picture')
        var maxWidth = null
        var maxHeight = null
@@ -48,7 +48,11 @@ export const commonMixins = {
        size.width=scale * size.width
        size.height=scale * size.height
        this.$set(this.style,'width',size.width+'px')
-       this.$set(this.style,'height',size.height+'px')
+      this.$set(this.style, 'height', size.height + 'px')
+      if (this.patent) {
+        this.$set(this.patent,'imgWidth',size.width+'px')
+         this.$set(this.patent,'imgHeight',size.height+'px')
+      }
     },
     getImagePath(url) {
       if (!url) {
@@ -72,19 +76,6 @@ export const commonMixins = {
        this.$set(patent,'abstractPath2',url)
        this.getHeight(url, patent)
       return url
-      // 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
     },
     async getHeight(url,patent){
       let size = await this.getImageSize(url);
@@ -196,7 +187,7 @@ export const addContrast1 = {
               this.currentSelectObj = temSelectObj;
               this.currentSelectObj.color = this.currentColor;
               this.currentSelectObj.Type = 0;
-              this.currentSelectObj.patentNo = this.patent.publicNo
+              this.currentSelectObj.patentNo = this.patent.patentNo
               // this.showPizhu();
 
               this.isMarking = true;
@@ -822,18 +813,8 @@ export const addContrast = {
     window.hiddenPizhu = this.hiddenPizhu
     window.selectMark = this.selectMark
     window.addDuiBi = this.addDuiBi
-    // window.addStateOpinion = this.addStateOpinion
-    // console.log(this.reportType,this.taskId);
   },
   methods: {
-    // 划词点击添加陈述意见
-    // addStateOpinion() {
-    //   let dl = document.getElementsByClassName("opinion");
-    //   console.log(dl);
-    //   // let opinion = this.currentSelectObj
-    //   // opinion.isHuaCi=true
-    //   // this.$emit('openAddStateOpinion',opinion)
-    // },
     // 点击对比按钮
     addDuiBi() {
       this.duiBiCurrentSelectObj=this.$store.state.patent.index
@@ -873,8 +854,6 @@ export const addContrast = {
           return item.id==Id
         })
         this.$emit('openOpinioncontrast', a)
-        // this.showPizhu()
-        // this.$store.commit('SET_PATENT_INDEX',a)
       }
       
     },
@@ -896,7 +875,7 @@ export const addContrast = {
           this.currentSelectObj = temSelectObj;
           this.currentSelectObj.color = this.currentColor;
           this.currentSelectObj.Type = 0;
-          this.currentSelectObj.patentNo = this.patent.publicNo
+          this.currentSelectObj.patentNo = this.patent.patentNo
           // rangeId（专题库id/报告id）
           this.currentSelectObj.rangeId = this.reportId
           // 创建来源（默认0/专题库1/报告2）
@@ -954,7 +933,6 @@ export const addContrast = {
       let dl = document.getElementsByClassName("pizhu");
       let mX = sessionStorage.mX
       let mY = sessionStorage.mY
-      console.log(document.body.clientHeight , mY);
       if ((document.body.clientWidth - mX - 380) < 0) {
         mX = document.body.clientWidth - 390;
       }
@@ -970,7 +948,6 @@ export const addContrast = {
       dl[0].setAttribute("style", "user-select:none;box-shadow: 10px 10px 5px #888888;display:block;position:absolute;left:" + mX.toString() + "px;top:" + mY.toString() + "px;background-color: #F7EED6;border-radius: 15px 15px;padding: 10px;width:380px;z-index: 2;");
     },
     showPizhu() {//展示菜单
-      // this.AddClass1(this.currentSelectObj)
       let mX = sessionStorage.mX
       let mY = sessionStorage.mY
       let dl = document.getElementsByClassName("caidan");

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

@@ -29,8 +29,8 @@
   <div  class="box" ref="box" v-dragControllerDiv>
     <div class="left" v-show="width!='100%'" :style="{width:width}"><!--左侧div内容-->
       <div v-if="type != 7">
-        <contrast-index v-if="signPatentNo" :evidenceFlieId="evidenceFlieId" :reportType="reportType" :publicNo="signPatentNo" :signPatentNo="signPatentNo"  @getVisible="getVisible" :type="type" :reportId="reportId" :isTrue="isTrue" @openContrast='openContrast'  :taskId="taskId" @patentStatusEmit="patentStatusEmit" :patentStatus2A="patentStatus2A"/>
-        <contrast-index v-else :patentMessage="message" :reportType="reportType" :publicNo="pNo" @on-change='changefix' @getVisible="getVisible" :type="type" :reportId="reportId" :isTrue="isTrue" @openContrast='openContrast' :taskId="taskId" @patentStatusEmit="patentStatusEmit" :patentStatus2A="patentStatus2A"/>
+        <contrast-index v-if="signPatentNo" :evidenceFlieId="evidenceFlieId" :reportType="reportType" :patentNo="signPatentNo" :signPatentNo="signPatentNo"  @getVisible="getVisible" :type="type" :reportId="reportId" :isTrue="isTrue" @openContrast='openContrast'  :taskId="taskId" @patentStatusEmit="patentStatusEmit" :patentStatus2A="patentStatus2A"/>
+        <contrast-index v-else :patentMessage="message" :reportType="reportType" :patentNo="pNo" @on-change='changefix' @getVisible="getVisible" :type="type" :reportId="reportId" :isTrue="isTrue" @openContrast='openContrast' :taskId="taskId" @patentStatusEmit="patentStatusEmit" :patentStatus2A="patentStatus2A"/>
       </div>
       <div v-else>
         <FileDetails :reportType="reportType" :evidenceFlieId="evidenceFlieId" @on-change='changefix'></FileDetails>
@@ -434,7 +434,7 @@ export default {
     } else {
       await this.getPatent(this.patentNo)
       // 请求查询批注
-      this.getPiZhuContrastList(this.patent.publicNo)
+      this.getPiZhuContrastList(this.patent.patentNo)
     }
    
 
@@ -513,7 +513,7 @@ export default {
       // 1是文献2是非文献
      if (val.type == 1) {
        await this.getPatent(val.proofConditions)
-        this.getPiZhuContrastList(this.patent.publicNo)
+        this.getPiZhuContrastList(this.patent.patentNo)
       } else {
         let url = `http://${this.$c.hostname}:8012/onlinePreview?url=` + btoa(encodeURIComponent(this.$p + val.proofConditions))
         this.$nextTick(() => {
@@ -642,7 +642,7 @@ export default {
         }
       }
       let params = {
-        patentNo: val?val:this.patent.publicNo,
+        patentNo: val?val:this.patent.patentNo,
         id: this.reportId,
         createFrom:this.reportId?2:0
       }
@@ -822,7 +822,7 @@ if(index!=-1){
             })
             var a = {
               id:this.ruleForm.id,
-              patentNo:this.patent.publicNo,
+              patentNo:this.patent.patentNo,
               position:this.ruleForm.index,
               fields:this.ruleForm.position,
               content:this.ruleForm.content,
@@ -943,7 +943,7 @@ if(index!=-1){
           // console.log(response.data)
           var a = this.$store.state.report.contrastList
           var index = a.findIndex(i=>{
-            return i.patentNo == this.patent.publicNo
+            return i.patentNo == this.patent.patentNo
           })
           if(index == -1){
             if(Object.keys(response.data).length>0){
@@ -956,7 +956,7 @@ if(index!=-1){
           }else{
             response.data.records.forEach(item => {
               var index2 = a.findIndex(i=>{
-                return i.patentNo == this.patent.publicNo && i.content == item.content
+                return i.patentNo == this.patent.patentNo && i.content == item.content
               })
               if (index2 == -1) {
                 item.selectType=1
@@ -1012,7 +1012,7 @@ if(index!=-1){
       // this.message.fix=true
     },
     changePageTitle() {
-      document.title = `${this.patent.publicNo} ${this.patent.name || ''}`
+      document.title = `${this.patent.patentNo} ${this.patent.name || ''}`
     },
     async onChange(data) {
       // console.log(this.projectId,data)
@@ -1033,7 +1033,7 @@ if(index!=-1){
       this.patentId = data.id
       this.changePageTitle()
       // 请求批注
-      this.getPiZhuContrastList(data.publicNo)
+      this.getPiZhuContrastList(data.patentNo)
     },
     //查询任务下专利状态
     getPatentStatus(patentNo){
@@ -1072,9 +1072,9 @@ if(index!=-1){
         this.patentStatus2=val.patentStatus2
       }
     },
-    async getPatent(publicNo) {
+    async getPatent(patentNo) {
       this.loading = true
-      const response = await this.$api.PatentByPatentNo({patentNo : publicNo})
+      const response = await this.$api.PatentByPatentNo({patentNo : patentNo})
       // console.log(response)
       this.patent = response.data
       if(this.taskId){
@@ -1082,11 +1082,7 @@ if(index!=-1){
       }
      
       this.getContrastList()
-      this.pNo=this.patent.publicNo
-      // console.log(this.pNo,this.patent.publicNo)
-      // if (this.publicNo == this.patent.publicNo) {
-      //   this.showcard = false
-      // }
+      this.pNo=this.patent.patentNo
       const country = getPatentCountry(this.patent.patentNo)
       let change = false
       if (country !== 'CN') {
@@ -1097,22 +1093,6 @@ if(index!=-1){
       this.loading = false
       this.changePageTitle()
     },
-    // async getPatent(id) {
-    //   this.loading = true
-    //   const response = await this.$api.getPatentById(id, { projectId: this.projectId })
-    //   this.patent = response.data
-    //   // console.log(this.patent)
-    //   this.pNo=this.patent.publicNo
-    //   const country = getPatentCountry(this.patent.patentNo)
-    //   let change = false
-    //   if (country !== 'CN') {
-    //     change = true
-    //   }
-    //   this.$set(this.patent, 'change', change)
-    //   this.$set(this.patent, 'change2', change)
-    //   this.loading = false
-    //   this.changePageTitle()
-    // },
     handleSelect2(index, path) {
 
     },

RMS-FrontEnd/src/views/components/common/PatentDetails/index.vue

@@ -1,30 +1,16 @@
 <template>
     <div>
-        <!-- <div class="btn" v-if="showBtn">
-            <el-button size="small" type="primary" @click="submit(0)">开卷审核</el-button>
-            <el-button size="small" type="primary" @click="submit(1)">完成</el-button>
-        </div> -->
-        <Patent-Details :publicNo="patentNo" :reportId="reportId"></Patent-Details>
+        <Patent-Details :patentNo="patentNo" :reportId="reportId"></Patent-Details>
     </div>
 </template>
 <script>
 import PatentDetails from '../../articles/ContrastIndex.vue'
-// import PatentDetails from '@/views/components/articles/ContrastIndex.vue'
 export default{
     components:{
         PatentDetails
     },
-    // props:{
-    //     //是否显示按钮
-    //     showBtn:{
-    //         type: Boolean,       
-    //         default: ()=>{ return false }
-    //     },
-    // },
     data() {
         return {
-            form:[],
-            showBtn:false
         }
     },
     computed:{
@@ -39,15 +25,8 @@ export default{
         }
   },
   created() {
-      // console.log(this.$route.query.patentNo);
     },
   mounted() {
-    // if(this.reportId){
-    //     this.getPiZhuContrastList(this.patentNo)
-    // }
-        // this.form =this.$route.params.form
-        // this.showBtn = this.$route.params.showBtn
-        // console.log(this.$route.params)
     },
     methods: {
         // 查询批注
@@ -78,17 +57,6 @@ export default{
         }
       })
     },
-        // submit(id){
-        //     this.form.status = id
-        //     this.$api.AddReport(this.form).then(response=>{
-        //         if(response.code == 200){
-        //             this.$message.success('报告创建成功')
-        //             this.$router.push({
-        //                 path:'admin/rManage'
-        //             })
-        //         }
-        //     })
-        // }
     },
 }
 </script>

RMS-FrontEnd/src/views/components/common/menu/component/checkFile.vue

@@ -58,8 +58,36 @@ export default {
         }
         
     },
-    methods: {
-        downLoad(){
+  methods: {
+    downLoadFile(row){ 
+        var item = JSON.parse(JSON.stringify(row))
+        var href = ''
+        if(item.originalName){
+            href = `http://${this.$c.hostname}:8801/fileManager/downloadSystemFile?fileId=${item.id}`
+        }else{
+            href = `/api/report/api/download/downloadFile?url=${encodeURIComponent(item.url)}` 
+        }
+        const anchor = document.createElement('a');
+        const fileName = 'download';
+        if ('download' in anchor) {
+          anchor.href = href;
+          anchor.setAttribute("download", fileName);
+          anchor.className = "download-js-link";
+          anchor.innerHTML = "downloading...";
+          anchor.style.display = "none";
+          document.body.appendChild(anchor);
+          setTimeout(function () {
+            anchor.click();
+            document.body.removeChild(anchor);
+          }, 66);
+          return true;
+        }
+    },
+    downLoad() {
+      if (this.row.originalName) { 
+        this.downLoadFile(this.row)
+        return false
+      }
             if(this.productId){
                 const href = `/api/v2/common/download?url=${encodeURIComponent(this.row.url)}`
                 const anchor = document.createElement('a');

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

@@ -200,7 +200,7 @@ export const patentViewList = {
         path: '/search/patentDetail',
         query: {
           applicationNo: row.applicationNo,
-          patentNo: row.publicNo,
+          patentNo: row.patentNo,
         }
       })
       this.params.name = this.$s.getSession('params').name
@@ -391,7 +391,7 @@ export const patentKeywordsHighlight = {
 
 
     getViewDom(text, field) {
-      if (this.patent && this.patent.publicNo && field) {
+      if (this.patent && this.patent.publicNo && this.patent.patentNo && field) {
         // SET_PATENT_OPINION_CONTRAST
         var arr = ['piZhuContrastList', 'contrastList', 'opinionContrastList']
         arr.forEach((item, index) => {

RMS-FrontEnd/src/views/components/gaoliang/components/pizhu.vue

@@ -147,6 +147,8 @@ export default {
 
         })
       } else {
+        this.mark.rangeId= (this.mark.rangeId && !isNaN(this.mark.rangeId))?this.mark.rangeId:null,
+        this.mark.createFrom=(this.mark.rangeId && !isNaN(this.mark.rangeId))?2:0
         this.$api.scratchWordsAdd(this.mark).then(response => {
           if (response.code == 200) {
             this.getContrastList('add')
@@ -204,8 +206,8 @@ export default {
         case 'add':
           let params = {
             patentNo:this.mark.patentNo,
-            id: this.mark.rangeId,
-            createFrom:this.mark.rangeId?2:0
+            id: (this.mark.rangeId && !isNaN(this.mark.rangeId))?this.mark.rangeId:null,
+            createFrom:(this.mark.rangeId && !isNaN(this.mark.rangeId))?2:0
           }
           this.$api.scratchWordsQuery(params).then(res => {
             if (res.code == 200) {

RMS-FrontEnd/src/views/components/import/conditionImport/patentDetails/patentDetail.vue

@@ -170,7 +170,7 @@ export default {
   methods: {
      //修改title
      changePageTitle() {
-      document.title = `${this.patent.publicNo} ${this.patent.name || ''}`
+      document.title = `${this.patent.patentNo} ${this.patent.name || ''}`
     },
     //解除定住，可以切换
     qx(){

RMS-FrontEnd/src/views/components/import/conditionImport/patentDetails/patentIndex.vue

@@ -90,7 +90,7 @@ export default {
         this.applicationNo = val.applicationNo
         this.patentNo = val.patentNo
        
-        this.changePageTitle(val.publicNo,val.name)
+        this.changePageTitle(val.patentNo,val.name)
         this.getContrastList(val.patentNo)
         await this.$router.push({
           path: '/search/patentDetail',
@@ -124,13 +124,13 @@ export default {
           } else {
              var a = response.data
           }
-           this.$store.commit('SET_PATENT_CONTRAST', a)
+          this.$store.commit('SET_PATENT_CONTRAST', a)
         }
       })
     },
     //修改title
-    changePageTitle(publicNo,name) {
-      document.title = `${publicNo} ${name || ''}`
+    changePageTitle(patentNo,name) {
+      document.title = `${patentNo} ${name || ''}`
     },
   },
 };

RMS-FrontEnd/src/views/components/task/components/realTime.vue

@@ -37,7 +37,7 @@
               </template>
             </el-table-column>
        
-            <el-table-column label="操作" align="center" width="120" show-overflow-tooltip v-if="form === 2">
+            <el-table-column label="操作" align="center" width="120" v-if="form === 2">
                         <template slot-scope="scope">
                           <div class="operate">
                             <span v-if="!scope.row.url">等待中</span>

RMS-FrontEnd/src/views/components/task/components/todoList.vue

@@ -100,7 +100,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="150" show-overflow-tooltip>
+            <el-table-column label="操作" align="center" width="150">
               <template slot-scope="scope" >
                 <div  class="operate">
                   <el-link type="primary" @click.native="handleDownload(scope.row)" v-if="$permission('/workspace/common/taskDownload') && ((scope.row.type == 1 || scope.row.type == 2) && (scope.row.status !== 0 || scope.row.status !== 1))">

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

@@ -205,7 +205,8 @@ export default {
               var token=b[1]
               this.$api.IsadminLogin({token:token}).then(response=>{
                 // console.log(response)
-                if(response.data==true){
+                if (response.data == true) {
+                  Cookies.set("token", token);
                   this.$router.push({
                       path: '/admin/rManage'
                     })

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

@@ -308,11 +308,15 @@ export default {
     },
     // 跳转专利详情
     toPatentDetails(val) {
+      console.log(val);
       this.$api.getPatentById(val.id, { projectId: null }).then(response => {
+        console.log(response);
         var router = this.$router.resolve({
-          path: '/articlesContrastIndex/' + val.id,
+          // path: '/articlesContrastIndex/' + val.id,
+          path: '/patentDetails',
           query: {
-            publicNo:val.patentNo
+            patentNo: val.patentNo,
+            reportId:true
           },
         })
         window.open(router.href, '_blank');

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

@@ -35,7 +35,7 @@
         </div>
         <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>
+          <patent-Message v-else :patentNo="patentNo1" :reportId="reportId" :taskId="taskId" @patentStatusEmit="patentStatusEmit" :patentStatus2A="patentStatus2A" :switchValue="switchValue"></patent-Message>
         </div>
     </div>
     <div class="resize" title="收缩侧边栏"   v-show="width!='100%'"><span>⋮</span></div>
@@ -69,6 +69,9 @@
                       <span v-else>切换原文</span>
                     </el-link>
                   </div>
+                  <div style="position: absolute;right: 0;top:0;margin-top: 15px;">
+                    <PatentMark :patentNo="patentNo" @biaozhu="getBiaoZhu"></PatentMark>
+                  </div>
                 </div>
 
                 <div style="  position: relative;">
@@ -191,8 +194,10 @@ import { splitScreen } from '@/views/components/common/SplitScreen'
 import HistoryOfInvalidEvidence from '@/views/components/articles/components/history/HistoryOfInvalidEvidence.vue'
 import InvalidEvidencePush from '@/views/components/articles/components/history/InvalidEvidencePush.vue'
 
+import PatentMark from '@/views/components/articles/components/PatentMark.vue'
+import {piZhuContrastList} from './mixins'
 export default {
-  mixins: [patentKeywordsHighlight, changeTranslation,splitScreen],
+  mixins: [patentKeywordsHighlight, changeTranslation,splitScreen,piZhuContrastList],
   props: ['patentNo', 'taskId1', 'location', "taskWorkRemak",'state',"reportId1","coordination",'isShow'],
   components: {
     PatentFeatures,
@@ -222,8 +227,8 @@ export default {
     ProductManage2,
     PatentWorth,
     HistoryOfInvalidEvidence,
-    InvalidEvidencePush
-
+    InvalidEvidencePush,
+    PatentMark,
   },
   data() {
     return {
@@ -240,7 +245,6 @@ export default {
       reportType: '',
       reportStatus:'',
       ban: 0,
-      pNo: '',
       location1: this.location ? this.location : '',
       type: '',
       isTrue: false,
@@ -586,23 +590,16 @@ export default {
       }
     },
     changePageTitle() {
-      document.title = `${this.patent.publicNo} ${this.patent.name || ''}`
+      document.title = `${this.patent.patentNo} ${this.patent.name || ''}`
     },
-    async getPatent(publicNo) {
+    async getPatent(patentNo) {
       this.loading = true
-      const response = await this.$api.PatentByPatentNo({ patentNo: publicNo })
+      const response = await this.$api.PatentByPatentNo({ patentNo: patentNo })
       //console.log(response)
       this.patent = response.data
       if (this.taskId) {
         this.getPatentStatus()
       }
-
-      // this.getContrastList()
-      this.pNo = this.patent.publicNo
-      //console.log(this.pNo, this.patent.publicNo)
-      // if (this.publicNo == this.patent.publicNo) {
-      //   this.showcard = false
-      // }
       const country = getPatentCountry(this.patent.patentNo)
       let change = false
       if (country !== 'CN') {

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

@@ -0,0 +1,70 @@
+export const piZhuContrastList = {
+  data() {
+    return {
+
+    }
+  },
+  mounted() {
+    this.getPiZhuContrastList(this.patentNo)
+  },
+  methods: {
+    // 查询批注
+    getPiZhuContrastList(val) {
+      if (val) {
+        var index = this.piZhuContrastList.findIndex(item => {
+          item.patentNo == val
+        })
+        if (index != -1) {
+          return false;
+        }
+      }
+      let params = {
+        patentNo: val ? val : this.patentNo,
+        id: this.reportId,
+        createFrom: this.reportId ? 2 : 0
+      }
+      this.$api.scratchWordsQuery(params).then(response => {
+        if (response.code == 200) {
+          if (this.piZhuContrastList.length > 0) {
+            var a = this.piZhuContrastList.filter(item => {
+              return item.patentNo != params.patentNo
+            }).concat(response.data)
+          } else {
+            var a = response.data
+          }
+          this.$store.commit('SET_PATENT_PIZHU_CONTRAST', a)
+        }
+      })
+    },
+    //获取需要跳转的批注
+    getBiaoZhu(val) {
+      if (val.scratchField.indexOf('摘要') != -1) {
+        this.activeMenu = 'PatentBasic'
+      } else {
+        this.activeMenu = this.menuList.find(item => {
+          return val.scratchField.indexOf(item.label) != -1
+        }).value
+        if (val.scratchField.indexOf('译文') != -1) {
+          this.activeName = '1'
+        } else {
+          this.activeName = '0'
+        }
+      }
+      this.handleSelect(this.activeMenu)
+
+      this.tiaozhuan(val.id, val)
+    },
+    tiaozhuan(id) {
+      const href = `#${id}`
+      const anchor = document.createElement('a');
+      anchor.href = href;
+      anchor.style.display = "none";
+      document.body.appendChild(anchor);
+      setTimeout(function () {
+        anchor.click();
+        document.body.removeChild(anchor);
+      }, 66);
+      return true;
+    },
+  },
+}

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

@@ -21,6 +21,9 @@
                     <span v-else>切换原文</span>
                   </el-link>
                 </div>
+                  <div style="position: absolute;right: 0;top:0;margin-top: 15px;">
+                    <PatentMark :patentNo="patentNo" @biaozhu="getBiaoZhu"></PatentMark>
+                  </div>
                 </div>
                
                 <div  style="  position: relative;">
@@ -70,8 +73,8 @@
                   </el-header>
                   <el-main>
                     <keep-alive>
-                      <component :is="activeOption" @status="getStatus" :project-id="projectId" :patent-id="patentId" :reportId="reportId" :taskId="taskId" :patentNo1="publicNo"></component>
-                        <component :is="activeOption" @status="getStatus" :project-id="projectId" :patent-id="patentId" :reportId="reportId" :taskId="taskId" :patentNo1="publicNo"></component>
+                      <component :is="activeOption" @status="getStatus" :project-id="projectId" :patent-id="patentId" :reportId="reportId" :taskId="taskId" :patentNo1="patentNo"></component>
+                        <component :is="activeOption" @status="getStatus" :project-id="projectId" :patent-id="patentId" :reportId="reportId" :taskId="taskId" :patentNo1="patentNo"></component>
                     </keep-alive>
                   </el-main>
                 </el-container>
@@ -118,8 +121,11 @@ import { splitScreen1 } from '@/views/components/common/SplitScreen'
 
 import HistoryOfInvalidEvidence from '@/views/components/articles/components/history/HistoryOfInvalidEvidence.vue'
 import InvalidEvidencePush from '@/views/components/articles/components/history/InvalidEvidencePush.vue'
+
+import PatentMark from '@/views/components/articles/components/PatentMark.vue'
+import {piZhuContrastList} from './mixins'
     export default {
-      mixins: [patentKeywordsHighlight, changeTranslation,splitScreen1],
+      mixins: [patentKeywordsHighlight, changeTranslation,splitScreen1,piZhuContrastList],
       components: {
             PatentMessage,
             PatentList,
@@ -144,15 +150,11 @@ import InvalidEvidencePush from '@/views/components/articles/components/history/
             ProductManage,
             PatentWorth,
             HistoryOfInvalidEvidence,
-            InvalidEvidencePush
+        InvalidEvidencePush,
+        PatentMark,
       },
-  props: ['reportId', 'patentMessage', 'publicNo','taskId',"patentStatus2A","switchValue"],
-    //   props:{
-    //     reportId:Number,
-    //     patentMessage:String,
-    //     publicNo:String,
-    //     required:true
-    //   },
+  props: ['reportId', 'patentMessage', 'patentNo','taskId',"patentStatus2A","switchValue"],
+    
     data() {
         return {
       patentStatus: {
@@ -170,7 +172,7 @@ import InvalidEvidencePush from '@/views/components/articles/components/history/
       componentName: 'PatentBasic',
       activeOption: 'PatentField',
       loading: false,
-      patentNo:"",
+      // patentNo:"",
       menuList: [
         {
           value: 'PatentBasic',
@@ -254,28 +256,26 @@ import InvalidEvidencePush from '@/views/components/articles/components/history/
     }
   },
   created() {
-    //console.log(this.publicNo);
   },
   watch: {
    
-    publicNo(val) {
-      //console.log(val);
+    patentNo(val) {
       this.getPatent(val)
     },
     patentStatus2(val) {
       let value = {
-        patentNo: this.publicNo,
+        patentNo: this.patentNo,
         patentStatus2:this.patentStatus2
       }
       this.$emit("patentStatusEmit",value)
     },
     patentStatus2A(val) {
-      if (this.publicNo==val.patentNo) {
+      if (this.patentNo==val.patentNo) {
         this.patentStatus2=val.patentStatus2
       }
     },
     switchValue(val) {
-      if (this.publicNo==val.patentNo) {
+      if (this.patentNo==val.patentNo) {
         if (val.value) {
           this.showcard=false
         } else {
@@ -288,18 +288,17 @@ import InvalidEvidencePush from '@/views/components/articles/components/history/
     
   },
   mounted() {
-    if(this.publicNo){
-      this.getPatent(this.publicNo)
+    if(this.patentNo){
+      this.getPatent(this.patentNo)
     }
   },
   methods: {
     changePageTitle() {
-      document.title = `${this.patent.publicNo} ${this.patent.name || ''}`
+      document.title = `${this.patent.patentNo} ${this.patent.name || ''}`
     },
-    async getPatent(publicNo) {
-      //console.log(publicNo)
+    async getPatent(patentNo) {
       this.loading = true
-      const response = await this.$api.PatentByPatentNo({patentNo : publicNo})
+      const response = await this.$api.PatentByPatentNo({patentNo : patentNo})
       //console.log(response)
       this.patent = response.data
       if (this.taskId) {
@@ -343,7 +342,7 @@ import InvalidEvidencePush from '@/views/components/articles/components/history/
       if (val == '0') {
         var a = {
           taskID: this.taskId?this.taskId:this.taskId1,
-          patentNo:this.publicNo,
+          patentNo:this.patentNo,
         }
         this.$api.updatePatentStatus(a).then(response => {
           if (response.code == 200) {
@@ -357,7 +356,7 @@ import InvalidEvidencePush from '@/views/components/articles/components/history/
     getPatentStatus() {
       var a = {
         taskID: this.taskId?this.taskId:this.taskId1,
-        patentNo:this.publicNo,
+        patentNo:this.patentNo,
       }
       this.$api.getPatentStatus(a).then(response => {
         //console.log("patentMessage",response.data);

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

@@ -63,7 +63,7 @@
 
     <el-dialog title="选择专利" :visible.sync="patentInformation" width="1000px">
       
-      <Patent-Table ref="getPatent" :tableData="tableData"  @PersonPatent="getPersonPatent" @onForm="onFormTable" :isSubmit="isSubmit" :queryParams="queryParams"></Patent-Table>
+      <Patent-Table ref="getPatent" :tableData="tableData" :reportId="reportId"  @PersonPatent="getPersonPatent" @onForm="onFormTable" :isSubmit="isSubmit" :queryParams="queryParams"></Patent-Table>
       <div class="pagination">
             <el-pagination :current-page.sync="queryParams.current" :page-size="queryParams.size" :total="total" @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper" background></el-pagination>
       </div>

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

@@ -89,7 +89,7 @@
           
       </el-aside>
       <el-main v-show="width!='100%'" :style="{height:height+'px',overflow:'hidden'}">
-        <Patent-Detail :publicNo="patentNo" :reportId="reportId"></Patent-Detail>
+        <Patent-Detail :patentNo="patentNo" :reportId="reportId"></Patent-Detail>
       </el-main>
     </el-container>
     <!-- table -->

RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/fileDetails.vue

@@ -7,7 +7,7 @@
       </div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="标的专利" name="patent">
-                <ContrastIndex v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="getEvidenceId()" :evidence="evidence1" @on-change='changefix' :publicNo="signPatentNo"  :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="!showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex>
+                <ContrastIndex v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="getEvidenceId()" :evidence="evidence1" @on-change='changefix' :patentNo="signPatentNo"  :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="!showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex>
             </el-tab-pane>
             <el-tab-pane label="无效请求书" name="InvalidRequest">
                 <check-File ref="checkFile"></check-File>
@@ -19,7 +19,7 @@
         <img src="@/assets/visual/fixed.png" width="20px" height="20px" @click="qx" v-if="fix===true" />
           <img src="@/assets/visual/unfixed.png" width="20px" height="20px" @click="gd" v-if="fix===false"  />
       </div>
-       <ContrastIndex v-if="type == 1" v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="getEvidenceId()" :evidence="evidence1" @on-change='changefix' :publicNo="evidence1.proofConditions" :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex> 
+       <ContrastIndex v-if="type == 1" v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="getEvidenceId()" :evidence="evidence1" @on-change='changefix' :patentNo="evidence1.proofConditions" :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex> 
        <check-File v-else ref="checkFile1"></check-File>
     </div>
     <Add-Opinion ref="addOpinion"></Add-Opinion>

RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/index.vue

@@ -213,7 +213,7 @@ export default {
         this.applicationNo = val.applicationNo
         this.patentNo = val.patentNo
        
-        this.changePageTitle(val.publicNo,val.name)
+        this.changePageTitle(val.patentNo,val.name)
         this.getContrastList(val.patentNo)
         await this.$router.push({
           path: '/search/patentDetail',
@@ -252,8 +252,8 @@ export default {
       })
     },
     //修改title
-    changePageTitle(publicNo,name) {
-      document.title = `${publicNo} ${name || ''}`
+    changePageTitle(patentNo,name) {
+      document.title = `${patentNo} ${name || ''}`
     },
   },
 };

RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/patentDetail.vue

@@ -167,7 +167,7 @@ export default {
   methods: {
      //修改title
      changePageTitle() {
-      document.title = `${this.patent.publicNo} ${this.patent.name || ''}`
+      document.title = `${this.patent.patentNo} ${this.patent.name || ''}`
     },
     //解除定住，可以切换
     qx(){

RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidIndex.vue

@@ -795,7 +795,6 @@ export default {
     contentChange() {
       this.cancel()
       this.form.proofGroups = []
-      // localStorage.removeItem('patent')
     },
     //选择证据
     changeSelect(row) {

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

@@ -11,7 +11,7 @@
         </el-aside>
         <el-container>
           <el-main class="admin-main-box" :style="{height:height}">
-            <component :is="activeMenu" :reportId="reportId" :signPatentNo="signPatentNo" :reportType="reportType" :patent="{publicNo:signPatentNo}"></component>
+            <component :is="activeMenu" :reportId="reportId" :signPatentNo="signPatentNo" :reportType="reportType" :patent="{patentNo:signPatentNo}"></component>
           </el-main>
         </el-container>
       </el-container>