删除打印

RMS-FrontEnd/src/components/Layout/mixins/index.js

@@ -4,7 +4,7 @@ import Store from '@/store'
 export const webSocket = {
   methods: {
     connectWebSocket(userId) {
-      let webSocket = new WebSocket(`ws://${Config.host}/api/v2/ws/` + userId)
+      let webSocket = new WebSocket(`ws://139.224.24.90:8872/api/v2/ws/` + userId)
       Store.commit('SET_WEB_SOCKET', webSocket)
       webSocket.onopen = () => {
         console.log('WebSocket连接成功')

RMS-FrontEnd/src/main.js

@@ -37,7 +37,7 @@ Vue.prototype.$r = hasRole
 // Vue.use(Charts)
 Vue.use(Particles)
 Vue.use(Element)
-console.log(process.env.NODE_ENV)
+// console.log(process.env.NODE_ENV)
 new Vue({
   router,
   store,

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

@@ -212,7 +212,7 @@ export default {
   watch: {
    
     publicNo(val) {
-      console.log(val);
+      // console.log(val);
       this.getPatent(val)
     },
     patentMessage(val, oldval) {
@@ -308,10 +308,10 @@ export default {
     //   this.changePageTitle()
     // },
     async getPatent(publicNo) {
-      console.log(publicNo)
+      // console.log(publicNo)
       this.loading = true
       const response = await this.$api.PatentByPatentNo({patentNo : publicNo})
-      console.log(response)
+      // console.log(response)
       this.patent = response.data
       if(this.taskId){
          this.getPatentStatus(response.data.patentNo)
@@ -371,7 +371,7 @@ export default {
         taskID:this.taskId,
         patentNo:patentNo
       }
-      console.log(this.patentNo);
+      // console.log(this.patentNo);
       this.$api.getPatentStatus(a).then(response=>{
         if(response.code == 200){
           this.patentStatus2 = response.data

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

@@ -111,19 +111,16 @@ watch: {
     },
     async patentNo1(val) {
       this.queryParams.patentNo = val
-      console.log(this.queryParams.patentNo,val);
      await this.getPatentIndexSetting()
       this.reloaData()
       
     }
   },
   mounted() {
-    console.log(this.reportId, this.patentNo1);
     this.getPatentIndexSetting()
   },
   methods: {
     reloaData() {
-      console.log("局不刷新");
       this.isReloaData = false;
       this.$nextTick(() => {
         this.isReloaData=true
@@ -150,10 +147,8 @@ watch: {
         fieldId: this.treeList[key].id,
         type:this.treeList[key].type,
       }
-      console.log(this.treeList,key)
      await this.$api.listPatentFieldOption(a).then(response => {
         if (response.code == 200) {
-          console.log(this.treeList);
           // this.treeList[key].option = response.data
           this.$set(this.treeList[key],"option",response.data)
         }
@@ -186,7 +181,6 @@ watch: {
         reportId:this.reportId,
       }
      await this.$api.listPatentField(params).then(response => {
-        console.log(response.data)
         this.treeList = response.data
         for (let i = 0; i < this.treeList.length; i++){
           switch (this.treeList[i].type) {
@@ -221,21 +215,16 @@ watch: {
     // 获取已保存
    async getPatentIndexSetting() {
       // this.selected = {}
-      console.log("已获取");
       this.look=true
       let data = {
         reportId: this.queryParams.reportId,
         patentNos: this.queryParams.patentNo,
       }
-      console.log(data);
      await this.$api.settingAllCompareFiles(data).then(response => {
-        console.log(response.data);
         if (response.code == 200) {
-          console.log(this.selected);
           // this.selected=res.data.list
 
           for (let value of response.data) {
-            console.log(value);
             switch (value.type) {
               case 0:
               case 1:
@@ -257,10 +246,7 @@ watch: {
                 break
               case 5:
               case 6:
-                console.log(value.selected.map(item => item.value));
                   this.$set(this.selected, value.id, value.selected.map(item => item.value))
-               
-                console.log(this.selected);
                 break
             }
           }
@@ -272,8 +258,6 @@ watch: {
     },
     //标引事件
     onChange(val, input) {
-      console.log("操作");
-      // console.log(val, input);
       if (!this.$permission('/workspace/details/indexing')) {
         return false
       }
@@ -287,7 +271,6 @@ watch: {
         type: val.type,
         selected: [],
       }
-      console.log(data);
       switch (val.type) {
         case 0:
         case 1:
@@ -324,12 +307,10 @@ watch: {
       this.settingCompareFiles(data) 
     },
     settingCompareFiles(data) {//更新
-      console.log(this.taskId,data)
       if(this.taskId){
         data.taskID = this.taskId
       }
       this.$api.settingCompareFiles(data).then(res => {
-        console.log(res);
         this.$message.success('操作成功')
         this.$emit('status','1')
       })

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

@@ -67,7 +67,6 @@ export default {
       this.queryParams.locPosition=this.location1
       // this.queryParams.patentId = this.patentId
       // 加上筛选条件
-      console.log(this.queryParams);
       var a = {
         state:this.queryParams.taskStatus,//任务状态0/1/3
         taskId:this.queryParams.taskId,//任务id

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

@@ -99,7 +99,7 @@ export default{
         }
     },
     mounted() {
-        console.log(this.row,this.selected)
+        // console.log(this.row,this.selected)
         this.getFeatures();
         if(this.selectedFeatures!==undefined){
             this.isSelect = true
@@ -113,7 +113,7 @@ export default{
             })
         },
         'selectedFeatures'(val){
-            console.log(val)
+            // console.log(val)
             this.row = val
             if(this.row){
                     this.row.forEach(item=>{
@@ -127,7 +127,7 @@ export default{
                 }
         },
         selectedFeaturesId(val){
-            console.log(val)
+            // console.log(val)
             this.$set(this,"selected",val?val:[])
             // this.selected = val           
             this.getFeatures();
@@ -141,7 +141,7 @@ export default{
             if (!body) {
                 return false
             }
-            console.log(offsetTop,body.offsetHeight)
+            // console.log(offsetTop,body.offsetHeight)
             const offsetBodyHeight = body.offsetHeight
             if (this.tableData.length && offsetBodyHeight < offsetTop) {
                 this.tableHeight = offsetBodyHeight + 75
@@ -163,7 +163,7 @@ export default{
         },
          //选中特征
         getFunInfo(row) {
-            console.log("row",row)
+            // console.log("row",row)
             let Index=this.row.findIndex(item => {return item.id==row.id })
             if (Index<0) {
                 this.row.push(row)
@@ -171,7 +171,7 @@ export default{
                 row.comResult = '公开'
                 this.row.splice(Index,1)
             }
-            console.log(this.row)
+            // console.log(this.row)
             this.$emit('getFeatures', this.row)
         },
         getFeatures() {
@@ -181,7 +181,7 @@ export default{
                 reportId:this.reportId
             }
             this.$api.getFeatures(PatentRight).then(res => {
-                console.log("res",res);
+                // console.log("res",res);
                 if (res.code == 200) {
                 this.tableData1 = [];
                 for (let i = 0; i < res.data.patentRightVos.length; i++){

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

@@ -93,13 +93,11 @@ export default {
   },
   methods: {
     getRow(row){
-      console.log(row)
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
     },
     onChange(file, fileList) {
-      console.log(file,fileList)
       if(this.row.reportFiles){
         var index3 = this.row.reportFiles.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
@@ -143,7 +141,7 @@ export default {
     },
 
     handleClick(tab, event) {
-      console.log(tab, event);
+      // console.log(tab, event);
     },
 
     delFile(row,id,key){

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

@@ -76,19 +76,15 @@ export default {
   },
   methods: {
     getRow(row){
-      console.log(row)
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
     },
     // onChange(file){
     //   this.row.fileList.push(file.raw)
-      
-    //   console.log(this.row.fileList)
     // },
 
     onChange(file, fileList) {
-      console.log(file,fileList)
       if(this.row.reportFiles){
         var index3 = this.row.reportFiles.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
@@ -132,7 +128,7 @@ export default {
     },
 
     handleClick(tab, event) {
-      console.log(tab, event);
+      // console.log(tab, event);
     },
 
     delFile(row,id,key){
@@ -182,11 +178,8 @@ export default {
             }
           })
         } else {
-          // console.log(data,row,this.row)
-          
           this.$api.addInvalidRecord(formData).then(res => { 
             if (res.code == 200) {
-              console.log(res);
               this.$message.success('保存成功')
               this.getList()
             }

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

@@ -103,18 +103,14 @@ export default {
   },
   methods: {
     getRow(row){
-      console.log(row)
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
     },
     // onChange(file){
     //   this.row.fileList.push(file.raw)
-      
-    //   console.log(this.row.fileList)
     // },
     onChange(file, fileList) {
-      console.log(file,fileList)
       if(this.row.reportFiles){
         var index3 = this.row.reportFiles.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
@@ -157,7 +153,7 @@ export default {
       }
     },
     handleClick(tab, event) {
-      console.log(tab, event);
+      // console.log(tab, event);
     },
 
     delFile(row,id,key){
@@ -207,11 +203,8 @@ export default {
             }
           })
         } else {
-          // console.log(data,row,this.row)
-          
           this.$api.addInvalidRecord(formData).then(res => { 
             if (res.code == 200) {
-              console.log(res);
               this.$message.success('保存成功')
               this.getList()
             }
@@ -281,7 +274,6 @@ export default {
     },
     getList() {
       this.$api.queryInvalidRecord(this.queryParams).then(res => {
-        console.log("queryInvalidRecord",res);
         if (res.code==200) {
           for (let i = 0; i < res.data.records.length; i++){
             res.data.records[i].vVisible=true

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

@@ -119,18 +119,15 @@ export default {
     }
   },
   mounted() {
-    console.log(this.patent);
     this.getList()
   },
   methods: {
     getRow(row){
-      console.log(row)
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
     },
     onChange(file, fileList) {
-      console.log(file,fileList)
       if(this.row.reportFiles){
         var index3 = this.row.reportFiles.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
@@ -174,7 +171,7 @@ export default {
     },
 
     handleClick(tab, event) {
-      console.log(tab, event);
+      // console.log(tab, event);
     },
 
     delFile(row,id,key){
@@ -226,10 +223,8 @@ export default {
             }
           })
         } else {
-          console.log("无");
           this.$api.addLitigationHistory(formData).then(res => { 
             if (res.code == 200) {
-              console.log(res);
               this.$message.success('保存成功')
               this.getList()
             }

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

@@ -90,13 +90,11 @@ export default {
   },
   methods: {
     getRow(row){
-      console.log(row)
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
     },
     onChange(file, fileList) {
-      console.log(file,fileList)
       if(this.row.reportFiles){
         var index3 = this.row.reportFiles.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
@@ -140,7 +138,7 @@ export default {
     },
 
     handleClick(tab, event) {
-      console.log(tab, event);
+      // console.log(tab, event);
     },
 
     delFile(row,id,key){
@@ -194,7 +192,6 @@ export default {
               }
           })
         }
-        // console.log(row.invalidTime)
         //   if(row.time){
         //       row.time=this.formatDateTime(row.time)
         //   }

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

@@ -23,7 +23,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.reportId,this.patent);
     this.getPriduct();
   },
   methods: {

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

@@ -74,7 +74,6 @@ export const addContrast = {
   },
   watch:{
     isTrue(val){
-      console.log(val)
         this.add = val
     }
   },
@@ -86,14 +85,12 @@ export const addContrast = {
 
   mouseup(){
     this.$emit('isTrues',false)
-    console.log(1,this.type1,this.isSelecting)
-    console.log(this.reportType)
+    // console.log(1,this.type1,this.isSelecting)
     if(this.type1 == 2 && [0,1,2].includes(Number(this.reportType))){
       this.isSelecting=true;
          if(this.isSelecting){
           this.isSelecting = false;
           let selectObj = document.getSelection();
-          console.log(selectObj)
           this.anchorOffset =0;
           let temSelectObj = this.getSelectobj(selectObj);
           var tempdt = this.getColumnName(selectObj.anchorNode);
@@ -113,12 +110,9 @@ export const addContrast = {
           
         //   console.log(this.currentSelectObj)
           if(this.currentSelectObj.Id){
-            console.log(2)
             this.$emit('openContrast',this.currentSelectObj)
           }
-          console.log(this.isTrue,this.add)
           if(this.add){
-            console.log(1)
             this.gaoliang()
             
           }
@@ -174,7 +168,6 @@ export const addContrast = {
           //     temNode = temNode.parentNode;
           // }
           // while(this.NotIncludeDataType(temNode));
-      console.log(temNode)
      
       let index =0;
       this.getColumn(temNode,selectObj);
@@ -225,7 +218,7 @@ export const addContrast = {
     if(this.isFirst){
       this.StartText = node
       
-      console.log(node.innerHTML)
+      // console.log(node.innerHTML)
     }
       // console.log(node,selectObj.anchorNode.data);
       if(node != selectObj.anchorNode){
@@ -241,7 +234,7 @@ export const addContrast = {
               }
               iIndex +=1;
           }
-          console.log("anchorOffset1",this.anchorOffset)
+          // console.log("anchorOffset1",this.anchorOffset)
           return false;
       }
       else{
@@ -249,7 +242,7 @@ export const addContrast = {
           var a = this.StartText.innerText
           if(selectObj.extentOffset>=selectObj.anchorOffset){
             var str = a.substring(0,this.anchorOffset + selectObj.anchorOffset)
-            console.log(str.toString().match(/\r/g),str.match(/\n/g),selectObj.anchorOffset,this.anchorOffset)
+            // console.log(str.toString().match(/\r/g),str.match(/\n/g),selectObj.anchorOffset,this.anchorOffset)
             if(this.StartText.getAttribute("data-type").indexOf('权利要求')!=-1){
               if( this.StartText.innerHTML.indexOf('\n')==0){
                   var num = Number(this.anchorOffset + selectObj.anchorOffset) - 1

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

@@ -330,7 +330,7 @@ export default {
   mounted() {
     window.selectMark = this.selectMark
     this.signPatentNo = this.$s.getSession('params').signPatentNo
-    console.log(this.$s.getSession('params'))
+    // console.log(this.$s.getSession('params'))
    this.taskId = this.$s.getSession('params').taskId
    this.reportType = this.$s.getSession('params').reportType
    this.type = this.$s.getSession('params').type
@@ -339,7 +339,7 @@ export default {
       this.getContrastList(this.signPatentNo)
     }
     this.getPatent(this.patentNo)
-      console.log(this.reportId);
+      // console.log(this.reportId);
   },
   watch:{
     patentNo(val){
@@ -384,7 +384,7 @@ export default {
       })
     },
     getIsTrue(val){
-      console.log(val)
+      // console.log(val)
       this.isTrue = val
     },
     handleRemove(file,fileList) {
@@ -403,7 +403,7 @@ export default {
       // },
     // 上传
     handleChangeUpload(file, fileList) {
-      console.log(file,fileList)
+      // console.log(file,fileList)
       this.dialogImageUrl = file.url
       this.hideUploadEdit = true
       this.file.push(file.raw)
@@ -411,13 +411,13 @@ export default {
   
 
     selectMark(Id){
-    console.log(Id,this.contrastList)
+    // console.log(Id,this.contrastList)
   // this.selectMarkObjectId = Id;
 //   this.showPizhu();
 var index = this.contrastList.findIndex(item=>{
   return item.id == Id
 })
-console.log(index)
+// console.log(index)
 if(index!=-1){
   
   this.ruleForm = {
@@ -446,9 +446,9 @@ if(index!=-1){
   }
   // this.selectedFeaturesId=this.contrastList[index].featuresId
   // this.$set(this.ruleForm,'',a)
-  console.log(this.visible,this,this.height)
+  // console.log(this.visible,this,this.height)
   if(this.visible == undefined){
-    console.log('jin')
+    // console.log('jin')
     var a = {
       ruleForm:this.ruleForm,
       selectedFeatures:this.selectedFeatures
@@ -476,7 +476,7 @@ if(index!=-1){
     },
 
     getVisible(val){
-      console.log('进来了')
+      // console.log('进来了')
       this.ruleForm = val.ruleForm
       this.selectedFeatures = val.selectedFeatures
       this.visible = true
@@ -640,9 +640,12 @@ if(index!=-1){
             return i.patentNo == this.patent.publicNo
           })
           if(index == -1){
-            response.data.records.forEach(item => {
-              a.push(item)
-            });
+            if(Object.keys(response.data).length>0){
+              response.data.records.forEach(item => {
+                a.push(item)
+              });
+            }
+            
           }else{
             response.data.records.forEach(item => {
               var index2 = a.findIndex(i=>{
@@ -671,7 +674,7 @@ if(index!=-1){
           this.$store.commit('SET_PATENT_CONTRAST', a)
     },
     getFeatures(val){
-      console.log(val)
+      // console.log(val)
       var a =[]
       this.ruleForm.featureslist = []
       for(var i = 0;i<val.length;i++){
@@ -729,7 +732,7 @@ if(index!=-1){
         taskID:this.taskId,
         patentNo:patentNo?patentNo:this.patentNo
       }
-      console.log(this.patentNo);
+      // console.log(this.patentNo);
       this.$api.getPatentStatus(a).then(response=>{
         if(response.code == 200){
           this.patentStatus2 = response.data
@@ -763,7 +766,7 @@ if(index!=-1){
     async getPatent(publicNo) {
       this.loading = true
       const response = await this.$api.PatentByPatentNo({patentNo : publicNo})
-      console.log(response)
+      // console.log(response)
       this.patent = response.data
       if(this.taskId){
          this.getPatentStatus(response.data.patentNo)
@@ -771,7 +774,7 @@ if(index!=-1){
      
       this.getContrastList()
       this.pNo=this.patent.publicNo
-      console.log(this.pNo,this.patent.publicNo)
+      // console.log(this.pNo,this.patent.publicNo)
       // if (this.publicNo == this.patent.publicNo) {
       //   this.showcard = false
       // }

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

@@ -44,14 +44,13 @@ export default {
   },
   methods: {
     handleRemove(file) {
-      console.log(file);
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
     handleDownload(file) {
-      console.log(file);
+      // console.log(file);
     },
     ifDialogFile() {//确认关闭
       this.handleClose()

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

@@ -150,7 +150,7 @@ export const patentKeywordsHighlight = {
   },
   watch:{
     'contrastList'(val){
-      console.log(val)
+      // console.log(val)
     }
   },
   mounted() {
@@ -162,7 +162,6 @@ export const patentKeywordsHighlight = {
        for(let i=0;i<this.contrastList.length;i++){
         if(this.contrastList[i].patentNo == this.patent.publicNo){
           if(this.contrastList[i].fields.indexOf(field)!=-1){
-            console.log(this.contrastList[i].fields,field)
             var a = {
             color:"#dff209",
             Type:2,
@@ -177,9 +176,7 @@ export const patentKeywordsHighlight = {
           }else{
             a.pass = false
           }
-           console.log(a)
           text = this.AddClass1(a);
-          // console.log(text)
           }
         }
         
@@ -226,7 +223,6 @@ export const patentKeywordsHighlight = {
       var match = null
       while((match = pattern.exec(temInnerHtml)) != null){
           Indexs[i] = match;
-          // console.log(match);
           //Indexs[i] =[ match.index,m.value];
           i++;
       }
@@ -259,7 +255,6 @@ export const patentKeywordsHighlight = {
 
   },
   selectMark(Id){
-    console.log(Id,this.contrastList)
   // this.selectMarkObjectId = Id;
 //   this.showPizhu();
 var index = this.contrastList.findIndex(item=>{
@@ -286,9 +281,7 @@ if(index!=-1){
   }
   // this.selectedFeaturesId=this.contrastList[index].featuresId
   // this.$set(this.ruleForm,'',a)
-  console.log(this.visible,this,this.height)
   if(this.visible == undefined){
-    console.log('jin')
     var a = {
       ruleForm:this.ruleForm,
       selectedFeatures:this.selectedFeatures
@@ -304,9 +297,7 @@ if(index!=-1){
     AddClass1(selectObject){
           //  let el = this.getColumnNode(selectObject.column);
          let el = selectObject.temNode;
-         console.log(el)
          if(selectObject.pass){
-          console.log(1)
           var splitStrings =[{
             text:selectObject.temNode,
             type:'text'
@@ -333,7 +324,6 @@ if(index!=-1){
         });
   
         let pattern = new RegExp(selectObject.text.replace(/[\r\n]/g,"").replace(/\ +/g,""),"g");
-  console.log(pattern)
         let Indexs =[];
         let i=0
 
@@ -353,7 +343,6 @@ if(index!=-1){
         Indexs.forEach(function (match){
           let currentIndex =0;
           let temSplitStrings = new Array();
-          console.log(splitStrings,match)
           splitStrings.forEach(function (item){
               if(item.type =='text'){
                 // console.log(item.text.indexOf(match[0]))
@@ -362,7 +351,7 @@ if(index!=-1){
                    if(match.index >= currentIndex && match.index < (currentIndex + item.text.length) ){
                     if(selectObject.column.indexOf('权利要求')!=-1){
                       item.text = item.text.replace(/\r/g,' ')
-                      console.log(item.text.match(/\r/g))
+                      // console.log(item.text.match(/\r/g))
                       if(item.text.match(/\r/g)){
                         match.index -=1
                       }
@@ -370,28 +359,25 @@ if(index!=-1){
                     }
                     if(selectObject.column.indexOf('说明书')!=-1){
                       var b = selectObject.temNode.replace(/<[^>]+>/g,'')
-                      console.log(1,b,match.index,currentIndex)
                       if(b.substring(0,match.index).indexOf('\r')==-1){
-                        console.log(1,b.substring(0,match.index))
                          var a = b.substring(0,match.index).match(/\n/g)
-                         console.log(a)
                           if(a){
                             match.index -=a.length
                           }
                       }
                      
                     }
-                    console.log(match.index + match[0].length,currentIndex + item.text.length,item.text,item.text.indexOf(match[0]))
+                    // 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)
+                        // 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(temSplitStrings)
                           }
-                          console.log('进了',1)
+                          // console.log('进了',1)
                           temSplitStrings.push({text:startTag,type:'tag'});
                           temSplitStrings.push({text:match[0],type:'text'});
                           if(selectObject.Type ==2){
@@ -407,7 +393,7 @@ if(index!=-1){
                       else
                       {
                         if(item.text.indexOf(match[0])!=-1){
-                          console.log('进了',2)
+                          // console.log('进了',2)
                           if(match.index > currentIndex){
                               temSplitStrings.push({text:item.text.substring(0,match.index-currentIndex),type:'text'});
                           }
@@ -442,7 +428,7 @@ if(index!=-1){
                   {
                      
                       if((match.index + match[0].length) <= (currentIndex + item.text.length) && (match.index + match[0].length)>currentIndex){
-                        console.log('进了',3)
+                        // 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:')
@@ -469,14 +455,14 @@ if(index!=-1){
                       else
                       {
                           if(match.index < currentIndex && (match.index + match[0].length) >= (currentIndex + item.text.length)){
-                              console.log('进了',4)
+                              // console.log('进了',4)
                               temSplitStrings.push({text:startTag,type:'tag'});
                               temSplitStrings.push(item);
                               temSplitStrings.push({text:endTag,type:'tag'});
                           }
                           else
                           {
-                              console.log('进了',5)
+                              // console.log('进了',5)
                               temSplitStrings.push(item);
                           }
                           

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

@@ -59,7 +59,7 @@ export default {
   },
   watch:{
     value(val){
-      console.log(val)
+      // console.log(val)
     }
   },
   mounted(){

RMS-FrontEnd/src/views/components/export/data.vue

@@ -155,7 +155,6 @@ export default {
         this.$message.error(message)
       }
     }
-    console.log(this.data)
   },
   methods: {
     renderSize,

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

@@ -135,7 +135,6 @@ export default {
   mounted() {
     // this.queryParams.type = this.form
     // this.queryParams.reportId = this.reportId
-   console.log(this.userinfo)
    this.getQueueList()
     this.initTask()
     
@@ -146,10 +145,9 @@ export default {
       this.webSocket.onmessage = (e) => {
         // console.log(e)
         const { code, data, message } = JSON.parse(e.data)
-        console.log(JSON.parse(e.data))
+        // console.log(JSON.parse(e.data))
         if (code === 903 || code === 904) {
           const index = this.taskData.map(item => item.taskId).indexOf(data.taskId)
-          console.log(index,this.taskData)
           if (index === -1) {
             // this.taskData.push(data)
           } else {
@@ -183,9 +181,7 @@ export default {
       this.taskData = []
       this.queryParams.reportId = this.reportId
       this.queryParams.state=0
-      console.log(this.queryParams)
       this.$api.reImportTask(this.queryParams).then(response => {
-        console.log(response.data)
         response.data.records.map(item => {
           this.taskData.push({
             reportId: item.reportId,

RMS-FrontEnd/src/views/layout/components/UserBar.vue

@@ -111,7 +111,7 @@ export default {
     },
     // 报告类型
     handleSelect(index) {
-      console.log(index)
+      // console.log(index)
       this.handleSelectId=index
     },
     resetChangePwdRuleForm() {

RMS-FrontEnd/src/views/layout/components/field.vue

@@ -258,7 +258,6 @@ export default {
       },
       // 选项管理
       handleEditOption(row) {
-        console.log(row);
         this.ruleForm = { ...row }
         
         this.title = '选项管理'
@@ -268,7 +267,6 @@ export default {
           fieldId: this.ruleForm.id,
           type: this.ruleForm.type,
         }
-        console.log(this.ruleForm.id);
         if (this.ruleForm.type === 6) {
           this.optionDialogWidth = '600px'
         } else {
@@ -276,7 +274,6 @@ export default {
         }
         this.optionLoading = true
         this.$api.listPatentFieldOption(params).then(response => {
-          console.log(response);
           this.$set(this.ruleForm, 'option', response.data)
           this.optionLoading = false
         }).catch(error => {
@@ -285,7 +282,6 @@ export default {
       },
       // 选项卡管理其他删除
       handleDeleteOption(item, index) {
-        console.log(this.ruleForm);
         if (!item.id) {
           this.ruleForm.option.splice(index, 1)
           this.lockOption = false
@@ -343,7 +339,6 @@ export default {
       },
       // 选项卡管理树形添加
       handleAddTreeNode(data) {
-        console.log("data",data);
         if (this.lockOption) {
           return false
         }
@@ -383,7 +378,6 @@ export default {
           order: item.order,
         }
         this.optionLoading = true
-        console.log("!!",data);
         this.$api.updatePatentField(data).then(response => {
           this.$set(item, 'id', response.data)
           this.$message.success('操作成功')
@@ -413,7 +407,6 @@ export default {
       },
       getList() {
         this.queryParams.reportType = this.reportType
-        console.log(this.handleSelectId);
         this.loading = true
         this.$api.listPatentField(this.queryParams).then(response => {
           if (response.code == 200) {
@@ -422,7 +415,6 @@ export default {
             // this.total = response.pageColumn.total
             this.total = response.data.length
             this.loading = false
-            console.log(this.tableData);
           }
         }).catch(error => {
           this.loading = false

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

@@ -123,7 +123,7 @@ export default {
     })
   },
     handleSelect(index, path) {
-      console.log(index, path);
+      // console.log(index, path);
       this.$router.push({
         path: '/admin/' + index
       })
@@ -141,7 +141,7 @@ export default {
     },
     DictMessage() {//获取字典项
       this.$api.DictMessage().then(response => {
-        console.log("response", response);
+        // console.log("response", response);
         this.$store.commit("SET_DictMessage",response.data)
       })
     },

RMS-FrontEnd/src/views/layout/mixins/index.js

@@ -4,7 +4,7 @@ import Store from '@/store'
 export const webSocket = {
   methods: {
     connectWebSocket(userId) {
-      let webSocket = new WebSocket(`ws://192.168.1.13:8885/api/report/api/ws/`+userId)
+      let webSocket = new WebSocket(`ws://139.224.24.90:8872/api/report/api/ws/`+userId)
       Store.commit('SET_WEB_SOCKET', webSocket)
       webSocket.onopen = () => {
         console.log('WebSocket连接成功')

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

@@ -223,7 +223,7 @@ export default {
         Storage.setStr('password', this.ruleForm.password)
         Cookies.set("token", response.data);
         let redirect = decodeURIComponent(this.$route.params.redirect||'/admin')
-        console.log(redirect)
+        // console.log(redirect)
         this.btnLoading = false
           this.$message.success('登录成功')
 

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

@@ -207,7 +207,6 @@ mixins:[PatentDetails,importPatent],
   },
   mounted() {
     this.getList()
-    console.log(this.selectedTotal)
   },
   methods: {
     // onChangeOne(val) {
@@ -217,14 +216,13 @@ mixins:[PatentDetails,importPatent],
     // },
     //子页面自定义字段值
     onChangeList({field,a}) {
-      console.log(field,a);
+      // console.log(field,a);
       this.queryParams.field = field
       this.queryParams.projectId = a
       this.getListPro()
       
     },
     getListPro() {
-      console.log("进来");
       this.tableData=[]
       this.$api.getPatentListPAS(this.queryParams).then(res => {
         this.tableData = res.data.records
@@ -276,7 +274,7 @@ mixins:[PatentDetails,importPatent],
       this.form = this.formS
     },
     getSelectedTotal() {
-      console.log(this.queryParams.isAdd,this.queryParams.isDelete);
+      // console.log(this.queryParams.isAdd,this.queryParams.isDelete);
       this.selectedTotal = Number(this.endNumber) - Number(this.startNumber) + 1 + Number(this.queryParams.isAdd.length) - Number(this.queryParams.isDelete.length)
     },
     Switch(type) {//选择...确定公用
@@ -332,15 +330,12 @@ mixins:[PatentDetails,importPatent],
       }
     },
     commonSwitch(){
-      console.log(this.queryParams.startNumber,this.queryParams.endNumber)
             if(this.queryParams.size*this.queryParams.current>=this.queryParams.startNumber ){
               if(this.queryParams.size*this.queryParams.current>=this.queryParams.endNumber){
                 if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
                   var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
-                  console.log(a,b)
                   for(var y=a;y<=b;y++){
-                    console.log(this.tableData[y])
                    this.toIsDelete(this.tableData[y].patentNo,y)
 
                   }
@@ -403,7 +398,6 @@ mixins:[PatentDetails,importPatent],
       
     },
     handleSelectNumber(type) {
-      console.log(type);
       this.Switch(type)
     
     },
@@ -420,10 +414,9 @@ mixins:[PatentDetails,importPatent],
       this.getList()
     },
     handleClick(tab, event) {
-      console.log(tab, event);
+      // console.log(tab, event);
     },
     getFunInfo(val) {
-      console.log(this.quickSelect);
       if(this.quickSelect){
         var index4 = this.queryParams.selected.findIndex(item=>{
             return item == val
@@ -479,7 +472,6 @@ mixins:[PatentDetails,importPatent],
           return item == val
         })
         if(index!=-1){
-          console.log(val)
             this.queryParams.isDelete.push(val)
              this.selected.splice(index, 1)
         }else{
@@ -569,7 +561,6 @@ mixins:[PatentDetails,importPatent],
       }
       // console.log(add)
       this.$api.addFTOCompareFile(add).then(res => {
-          console.log(res);
           if (res.code==200) {
             this.startNumber = 1
             this.endNumber = 0
@@ -614,7 +605,6 @@ mixins:[PatentDetails,importPatent],
    async getList(key) {
      this.queryParams.reportId = this.reportId
      let params = JSON.parse(JSON.stringify(this.queryParams))
-      console.log(params);
       params.tree.map(tree => {
         let field = params.field.filter(item => item.key === tree.key)
         if (field.length === 0) {
@@ -622,7 +612,6 @@ mixins:[PatentDetails,importPatent],
         }
       })
      params.tree = undefined
-     console.log(params);
       this.$store.commit('SET_PATENT_PARAMS', params)
      await this.$api.getCompareFile(params).then(response => {
         this.loading = false
@@ -645,14 +634,13 @@ mixins:[PatentDetails,importPatent],
       })
     },
     showPatent(even) {//选择下拉框
-      console.log(even);
+      // console.log(even);
     },
   },
   watch: {
     ChosePatentSure(val) {
       if (val) {
         if(this.queryParams.selectedTotal>0){
-          console.log(val)
           if(this.selectedTotal>0){
              this.savePatentList()
           }

RMS-FrontEnd/src/views/report/FTO/FTOPage/ReportDetails/index.vue

@@ -79,7 +79,6 @@ export default {
         }
     },
     mounted() {
-        console.log(this.row)
         this.changePageTitle()
     },
     methods: {

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

@@ -43,10 +43,10 @@
       <!-- </el-container> -->
       <el-main v-show="width != '100%'" :style="{ width: 'calc(100% - ' + width + ')' ,position: 'relative'}">
         <el-link type="primary" v-if="reportType == 3 || reportType == 4" @click="changeProduct2" style="position: absolute;right: 10px;top: 10px;margin-bottom:10px;z-index: 111;">切换<span>{{ showProduct2?'标的专利信息':'产品信息' }}</span></el-link>
-        <div v-if="showProduct2">
+        <div v-show="showProduct2">
             <Product-Message :reportId="reportId" :row="row" :noEdit="isEdit"></Product-Message>
         </div>
-        <div class="patent-articles" v-else>
+        <div class="patent-articles" v-show="!showProduct2">
           <el-container v-loading="loading">
             <!-- <el-container > -->
             <el-header class="patent-articles-title">
@@ -317,7 +317,7 @@ export default {
     },
   },
   created() {
-    console.log(this.$s.getSession('params'));
+    //console.log(this.$s.getSession('params'));
     this.row.type=this.$s.getSession('params').reportType
     this.taskId = this.$s.getSession('params').taskId
     this.type = this.$s.getSession('params').type
@@ -325,13 +325,13 @@ export default {
     this.reportStatus = this.$s.getSession('params').reportStatus?this.$s.getSession('params').reportStatus:''
 
     this.reportId = this.$s.getSession('params').reportId
-    console.log(this.$s.getSession('params'));
+    //console.log(this.$s.getSession('params'));
     // this.reportId = this.$s.getSession('params').reportId
   },
   mounted() {
-    console.log(this.location, this.reportType, this.isShow,this.taskWorkRemakA);
+    //console.log(this.location, this.reportType, this.isShow,this.taskWorkRemakA);
     this.getPatent(this.patentNo)
-    console.log(this.reportId, this.$s.getSession('params'));
+    //console.log(this.reportId, this.$s.getSession('params'));
   },
   methods: {
     changeProduct(){
@@ -377,7 +377,7 @@ export default {
     },
     behindNumber(val) {
       this.FeaturesNumber = val
-      console.log(this.FeaturesNumber,val);
+      //console.log(this.FeaturesNumber,val);
     },
     handleSelect(index) {
       if (index === 'PatentExport') {
@@ -397,7 +397,7 @@ export default {
     async onChange(data) {
       // this.isKeepA=data.patentNo
       // if (this.coordinationA) {
-        console.log(this.projectId,data)
+        //console.log(this.projectId,data)
         this.message = data.patentNo
         this.patentNo1 = data.patentNo
         if (this.fix != true) {
@@ -416,7 +416,7 @@ export default {
         this.patentId = data.id
         this.changePageTitle()
       // } else {
-      //   console.log(this.projectId,data)
+      //   //console.log(this.projectId,data)
       //   this.message = data.patentNo
       //   this.patentNo1 = data.patentNo
       //   if (this.fix != true) {
@@ -434,7 +434,7 @@ export default {
       //   this.patentId = data.id
       //   this.changePageTitle()
       // }
-      // console.log(this.projectId,data)
+      // //console.log(this.projectId,data)
       // this.message = data.patentNo
       // this.patentNo1 = data.patentNo
       // if (this.fix != true) {
@@ -470,7 +470,7 @@ export default {
       
       this.$api.getPatentStatus(a).then(response => {
         if (response.code == 200) {
-          console.log("ContrasrProduct",response.data);
+          //console.log("ContrasrProduct",response.data);
           this.patentStatus2 = response.data
         }
       })
@@ -514,7 +514,7 @@ export default {
     async getPatent(publicNo) {
       this.loading = true
       const response = await this.$api.PatentByPatentNo({ patentNo: publicNo })
-      console.log(response)
+      //console.log(response)
       this.patent = response.data
       if (this.taskId) {
         this.getPatentStatus()
@@ -522,7 +522,7 @@ export default {
 
       // this.getContrastList()
       this.pNo = this.patent.publicNo
-      console.log(this.pNo, this.patent.publicNo)
+      //console.log(this.pNo, this.patent.publicNo)
       // if (this.publicNo == this.patent.publicNo) {
       //   this.showcard = false
       // }

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

@@ -226,7 +226,6 @@
     },
     watch:{
       tableData(){
-        console.log(1)
             this.$nextTick(() => {
               this.setHeight()
               this.$refs.table.doLayout();//doLayout()方法，让table重新布局
@@ -240,21 +239,10 @@
           this.getSplitMessage()
         }
       },
-      // isKeepA(val) {
-      //   console.log(val); 
-      //   // if (val==1) {
-      //     this.keep()
-      //   // }
-      // }
+      
     },
-    // computed: {
-    //   isKeepB() {
-    //     return JSON.parse(JSON.stringify(this.isKeepB))
-    //   }
-    // },
     mounted() {
       this.show = this.isshow == false ? this.isshow : this.show
-      console.log(this.coordinationA, this.taskWorkRemakA);
       if (this.typeFto==1) {
         this.queryCompareMessage()
       } else {
@@ -302,7 +290,7 @@
       },
       //选中特征
       getFunInfo(row,scope) {
-        console.log("row",row)
+        //console.log("row",row)
         // this.$emit('getfeatures', row)
         let Index=this.row.findIndex(item => {return item.id==row.id })
         if (Index<0) {
@@ -311,7 +299,7 @@
         } else {
           this.row.splice(Index,1)
         }
-        console.log("getFunInfo",this.row);
+        //console.log("getFunInfo",this.row);
       },
       //合并
       merge() {
@@ -337,7 +325,7 @@
         var strText=""
         var targetDescription = ''
         if (this.row != []) {
-          console.log(this.row);//explainText
+          //console.log(this.row);//explainText
           let row = this.row.sort((aId, bId) => {
               return aId.$index-bId.$index; 
             })
@@ -426,12 +414,12 @@
               rightType: ele.rightType,
               splitBy: ele.splitBy,
         }
-        // console.log(tab)
+        // //console.log(tab)
         this.tableData1.splice(Index+1,0,tab)
       }) 
         this.TypeSelect(this.Type)//调用显示权要
         this.row = []
-        console.log(this.row);
+        //console.log(this.row);
       },
       //获取每个元素所需合并的行数
       getSpanArr(data) {
@@ -459,7 +447,7 @@
         // column.property=“id”  
         if (this.mergeArr.indexOf(column.property) !== -1) {
           if (this.mergeObj[column.property][rowIndex]) {
-            console.log("@@",this.mergeObj[column.property][rowIndex]);
+            //console.log("@@",this.mergeObj[column.property][rowIndex]);
             return [this.mergeObj[column.property][rowIndex], 1]
           } else {
             return [0, 0];
@@ -469,7 +457,7 @@
 
       //查询对比记录
        queryCompareMessage() {//patentRightVos
-        console.log(this.reportId,this.taskWorkRemakA,this.coordination);
+        //console.log(this.reportId,this.taskWorkRemakA,this.coordination);
         this.loading=true
         if(this.taskId){
           var PatentRight = {
@@ -489,31 +477,31 @@
         //协同对比调用querySynery
         if (this.typeFto==1) {
           if (this.coordination || this.taskWorkRemakA != 0) {
-            console.log(111111, this.coordination,this.taskWorkRemakA);
+            //console.log(111111, this.coordination,this.taskWorkRemakA);
             this.$api.querySynery(PatentRight).then(res => {
               if (res.code == 200) {
                 this.CompareMessage(res)
               }
-              // console.log("@@",this.tableData1);
+              // //console.log("@@",this.tableData1);
             })
           } else {
             this.$api.queryAllCompareMessage(PatentRight).then(res => {
-              console.log(2222, this.taskWorkRemakA);
+              //console.log(2222, this.taskWorkRemakA);
               if (res.code == 200) {
                 this.CompareMessage(res)
                 this.isDel()
                 this.isAll=true
               }
-            // console.log("@@",this.tableData1);
+            // //console.log("@@",this.tableData1);
             })
           }
         } else {
           this.$api.queryCompareMessage(PatentRight).then(res => {
-            console.log(3333,this.coordination);
+            //console.log(3333,this.coordination);
             if (res.code == 200) {
               this.CompareMessage(res)
             }
-          // console.log("@@",this.tableData1);
+          // //console.log("@@",this.tableData1);
           })
         }
         
@@ -534,10 +522,10 @@
             this.tableData[i].isDelShow=1
           } else {
             this.tableData[i].isDelShow=0
-            console.log(2);
+            //console.log(2);
           }
         }
-        console.log(this.tableData);
+        //console.log(this.tableData);
       },
       //查询对比记录数据处理
       CompareMessage(res) {
@@ -575,7 +563,7 @@
           }
         }
         this.$forceUpdate()
-        console.log(this.tableData1)
+        //console.log(this.tableData1)
         this.TypeSelect(this.Type)//调用显示权要
         // this.getSpanArr(this.tableData)
         this.loading = false
@@ -587,7 +575,7 @@
         }
         // let a = ['compareResult2', 'targetDescription2', 'compareDescription2']
         // a.forEach(item => {
-        //   console.log(row,row.hasOwnProperty(item));
+        //   //console.log(row,row.hasOwnProperty(item));
         //   // if (row.hasOwnProperty(item)) {
             
         //   // }
@@ -652,12 +640,12 @@
                 }
             }
             this.$forceUpdate()
-            console.log(this.tableData1)
+            //console.log(this.tableData1)
             this.TypeSelect(this.Type)//调用显示权要
             // this.getSpanArr(this.tableData)
             this.loading=false
           }
-          // console.log("@@",this.tableData1);
+          // //console.log("@@",this.tableData1);
         })
       },
   
@@ -667,7 +655,7 @@
         this.splitPatentRight()
       },
       splitBySelect(event) {//按符号拆分
-        console.log(event);
+        //console.log(event);
         this.splitBy1 = event;
         this.splitPatentRight();
       },
@@ -678,22 +666,22 @@
         } else {
           this.typeArr.push(1, 0);
         }
-        // console.log("@@",this.tableData);
-        // console.log("@@",this.tableData1);
+        // //console.log("@@",this.tableData);
+        // //console.log("@@",this.tableData1);
         this.tableData = this.tableData1.filter(item => {
            return this.typeArr.includes(item.pType)
         })
-        // console.log("tableData",this.tableData);
+        // //console.log("tableData",this.tableData);
         this.getSpanArr(this.tableData)
       },
      
       //保存
       keep() {
-        console.log(this.tableData1);
+        //console.log(this.tableData1);
         this.loadings = true
         this.$emit("isRead",0)
         if (this.coordination || (this.typeFto==1&&this.taskWorkRemakA!=0) ) {
-          console.log(1111, this.coordination,this.typeFto);
+          //console.log(1111, this.coordination,this.typeFto);
           var keepAddSynerys = {
             patentNo:this.patentNo1,
             taskId: this.taskId,
@@ -709,7 +697,7 @@
               }
             )
           }
-          console.log( this.tableData1[0].compareResult,keepAddSynerys);
+          //console.log( this.tableData1[0].compareResult,keepAddSynerys);
           this.$api.addSynery(keepAddSynerys).then(res => {
             if (res.code == 200) {
               this.keepOk()
@@ -717,7 +705,7 @@
           })
 
         }else if (this.taskWorkRemakA==0) {
-          console.log(2222, this.taskWorkRemakA,this.tableData1);
+          //console.log(2222, this.taskWorkRemakA,this.tableData1);
           let keepUpdate=[]
           for (let i = 0; i < this.tableData1.length; i++) {
             keepUpdate.push(
@@ -730,7 +718,7 @@
               }
             )
           }
-          // console.log(keepAddSynerys);
+          // //console.log(keepAddSynerys);
           this.$api.updateCompareMessage(keepUpdate).then(res => {
             if (res.code == 200) {
               this.keepOk()
@@ -738,11 +726,11 @@
           })
           
         }else {
-          console.log(3333, this.coordination);
+          //console.log(3333, this.coordination);
           var keepArr = [];
-          console.log(this.tableData1);
+          //console.log(this.tableData1);
           for (let i = 0; i < this.tableData1.length; i++) {
-            console.log(1, this.tableData1[i].compareResult);
+            //console.log(1, this.tableData1[i].compareResult);
             keepArr.push(
               {
                 taskId: this.taskId?this.taskId:null,
@@ -762,10 +750,10 @@
               }
             )
           }
-          console.log(keepArr);
+          //console.log(keepArr);
 
           this.$api.addCompareMessage(keepArr).then(res => {
-            console.log(res);
+            //console.log(res);
             if (res.code == 200) {
               this.keepOk()
             }
@@ -800,7 +788,7 @@
       },
       // 一键修改
       handleClick(row) {
-        // console.log(this.tableData1,row);
+        // //console.log(this.tableData1,row);
         // let a=this.tableData1.findIndex(item => {
         //   return item.id==row.id
         // })

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

@@ -85,12 +85,12 @@ export default{
     props:['reportId','row','noEdit'],
   data() {
     const isTime = (rule, value, callback) => {
-      console.log(this.isDate);
+      //console.log(this.isDate);
       if (this.isDate) {
         this.isDateTime= Date.parse(new Date)
       }
       let b = Date.parse(value)
-      console.log(this.isDateTime,b);
+      //console.log(this.isDateTime,b);
       if (value) {
         if (b+8.64e7<this.isDateTime) {//8.64e7一天的时间//只适用YYYY-mm-dd格式
             callback(new Error('禁止选择以前时间，请重新选择'))

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

@@ -282,7 +282,6 @@ export default {
           
     },
     handleChoice({ selected, choiceFormS }) {
-      console.log(selected, choiceFormS);
       this.selected=selected
       this.choiceFormS = choiceFormS
       this.isHandleSure = false
@@ -383,7 +382,6 @@ export default {
            await this.getPatentList()
         },
       async change() {
-          console.log(this.queryParams.compareResult);
             this.index = 0
           this.patentList = []
           await this.getPatentList()
@@ -458,7 +456,6 @@ export default {
                   this.tableData1.push(res.data.patentRightVos[i].compareMessageVOS[m])
                 }
             }
-            console.log(this.tableData1)
             // this.tableData = this.tableData1
             // this.$set(this,'tableData',this.tableData1)
             // this.TypeSelect(this.Type)//调用显示权要
@@ -495,7 +492,6 @@ export default {
         // column.property=“id”  
         if (this.mergeArr.indexOf(column.property) !== -1) {
           if (this.mergeObj[column.property][rowIndex]) {
-            console.log("@@",this.mergeObj[column.property][rowIndex]);
             return [this.mergeObj[column.property][rowIndex], 1]
           } else {
             return [0, 0];

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

@@ -201,12 +201,12 @@ import Features from '@/views/components/articles/components/features.vue'
     }
   },
   created() {
-    console.log(this.publicNo);
+    //console.log(this.publicNo);
   },
   watch: {
    
     publicNo(val) {
-      console.log(val);
+      //console.log(val);
       this.getPatent(val)
     },
     patentStatus2(val) {
@@ -244,10 +244,10 @@ import Features from '@/views/components/articles/components/features.vue'
       document.title = `${this.patent.publicNo} ${this.patent.name || ''}`
     },
     async getPatent(publicNo) {
-      console.log(publicNo)
+      //console.log(publicNo)
       this.loading = true
       const response = await this.$api.PatentByPatentNo({patentNo : publicNo})
-      console.log(response)
+      //console.log(response)
       this.patent = response.data
       if (this.taskId) {
         this.getPatentStatus()
@@ -302,7 +302,7 @@ import Features from '@/views/components/articles/components/features.vue'
         patentNo:this.publicNo,
       }
       this.$api.getPatentStatus(a).then(response => {
-        console.log("patentMessage",response.data);
+        //console.log("patentMessage",response.data);
         if (response.code == 200) {
           this.patentStatus2 = response.data
         }

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

@@ -20,7 +20,6 @@ export const changeDateType = {
                 }
             
             
-            console.log(date)
             return Date.parse(date)
         }
     },

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

@@ -76,12 +76,12 @@ export default{
     props:['reportId','reportType'],
   data() {
     const isTime = (rule, value, callback) => {
-      console.log(this.isDate);
+      //console.log(this.isDate);
       if (this.isDate) {
         this.isDateTime= Date.parse(new Date)
       }
       let b = Date.parse(value)
-      console.log(this.isDateTime,b);
+      //console.log(this.isDateTime,b);
       if (value) {
         if (b+8.64e7<this.isDateTime) {//8.64e7一天的时间//只适用YYYY-mm-dd格式
             callback(new Error('禁止选择以前时间，请重新选择'))
@@ -125,7 +125,7 @@ export default{
              this.$set(this.product, 'productName', this.$s.getSession('reportMessage1').signPatentNo)
         }
        
-        console.log(this.product.productName);
+        //console.log(this.product.productName);
         this.getProduct()
     },
   methods: {

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

@@ -82,7 +82,7 @@ export default {
     this.reportId = this.$route.query.id
     this.personId = this.$route.query.personId
     this.reportMessage = this.$s.getSession('reportMessage1')
-    console.log("@@@", this.patentNo, this.reportId,this.$s.getSession('reportMessage1'))
+    // console.log("@@@", this.patentNo, this.reportId,this.$s.getSession('reportMessage1'))
   },
   mounted() {
     let activeA = localStorage.activeWatch==undefined?localStorage.activeWatch:JSON.parse(localStorage.activeWatch)
@@ -169,7 +169,6 @@ export default {
         if (this.ChosePatentSure) {
           this.active += 1;
           this.stepSuc.push(this.active-1);
-          console.log(this.stepSuc)
           this.gong();
           this.ChosePatentSave = false;
           this.ChosePatentSure = false;
@@ -180,7 +179,6 @@ export default {
         if (this.keepSure) {
           this.active += 1;
           this.stepSuc.push(this.active-1);
-          console.log(this.stepSuc)
           this.gong();
         } else {//未保存提示
           this.$confirm('您的修改未保存，如果点击确定将直接跳转下一步，您的修改不会被保存，若想保存您的修改，请点击取消，点击保存按钮保存修改！', '温馨提示',  {
@@ -242,7 +240,6 @@ export default {
   },
   watch: {
     active(val) {
-      console.log(val);
       // localStorage.clear("activeWatch");
       var act = localStorage.activeWatch==undefined?localStorage.activeWatch:JSON.parse(localStorage.activeWatch)
       var a = {

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

@@ -194,14 +194,14 @@ export default {
     },
    
     // 'checkList'(val){
-    //   console.log(this.userInfo)
+    //   //console.log(this.userInfo)
     //   if (val.length == 0) {
-    //     console.log("进");
+    //     //console.log("进");
     //     this.fu()
     //   }
     // },
     isFinish(val) {
-      console.log(val);
+      //console.log(val);
       if(val){
         this.showTask()
       }
@@ -213,15 +213,15 @@ export default {
     // this.queryParams.patentNo=this.$route.params.patentNo
     this.reportNameA=this.$route.query.reportName
     this.params =this.$route.query.params?JSON.parse(this.$route.query.params):null
-    // console.log(this.tableDataA);
+    // //console.log(this.tableDataA);
   },
   mounted() {
-    console.log(this.reportName,this.params)
+    //console.log(this.reportName,this.params)
     if (this.params) {
-      console.log(2)
+      //console.log(2)
       this.getList2()
     } else {
-      console.log(1)
+      //console.log(1)
       this.getList()
     }
    
@@ -279,7 +279,7 @@ export default {
       }
       this.$api.getPartPersonnelID(par).then(res => {
         if (res.code==200) {
-          console.log(res);
+          //console.log(res);
           // res.data.name = res.data[0].personnelName
           // res.data[0].tenantName = res.data.personnelName
            res.data[0].patentNos=[]
@@ -342,7 +342,7 @@ export default {
     },
     showTask(){
       if(this.checkList.length>0){
-        console.log(this.reportName)
+        //console.log(this.reportName)
         this.taskInformation = true
         this.form = {
           name:this.reportName?this.reportName + (this.taskType=="2"?'对比':'初筛')+'任务':this.reportNameA + (this.taskType=="2"?'对比':'初筛')+'任务'
@@ -359,7 +359,7 @@ export default {
     },
 
     getCheck(val) {//人员信息
-      console.log("getCheck",val)
+      //console.log("getCheck",val)
       this.checkList = val
       this.personInformation=false
       this.beforeHandleConfirm()
@@ -398,7 +398,7 @@ export default {
     getPerson() {
       this.personInformation = true
       this.checkListA = JSON.parse(JSON.stringify(this.checkList))
-      console.log(this.checkListA);
+      //console.log(this.checkListA);
     },
     //移除人员
     removePerson(row){
@@ -448,7 +448,7 @@ export default {
           }
         }
         this.leaveNumber = Number(this.totalNumber) - Number(a)
-        console.log(this.leaveNumber,this.checkList);
+        //console.log(this.leaveNumber,this.checkList);
         var data = JSON.parse(JSON.stringify(this.checkList))
         if(this.leaveNumber>0){
           this.getRowNumber(data)
@@ -468,7 +468,7 @@ export default {
           i=data.length
         }
         }
-        // console.log(this.leaveNumber)
+        // //console.log(this.leaveNumber)
         if(data.length>1){
           if(this.leaveNumber>0){
             this.getRowNumber(data)
@@ -478,7 +478,7 @@ export default {
         
     },
     chosePatentFile(row) {
-      console.log(this.FilterList)
+      //console.log(this.FilterList)
       this.isSubmit = true
       this.patentInformation=true
       // this.$refs.getPatent.opens(this.tableData)
@@ -558,7 +558,7 @@ export default {
         }
       }
       
-      console.log(this.patentCheck)
+      //console.log(this.patentCheck)
       this.close()
     },
     handleCurrentChange(val) {//分页
@@ -588,7 +588,7 @@ export default {
           for(var i=0;i<this.checkList.length;i++){
             if(this.checkList[i].patentNos.length>0){
               for(var j=0;j<this.checkList[i].patentNos.length;j++){
-                // console.log(b)
+                // //console.log(b)
                 var index = this.tableData.findIndex(item=>{
                   return item.patentNo == this.checkList[i].patentNos[j]
                 })
@@ -609,10 +609,10 @@ export default {
     async getList2() {
       // 需要根据报告id查询所有对比文件
       await this.$api.getSureCompareFile(this.params).then(response => {
-        // console.log(res);
+        // //console.log(res);
         if(response.code==200){
           this.tableData = response.data.records
-          console.log(this.tableData,response.data.records);
+          //console.log(this.tableData,response.data.records);
           this.total = response.data.total
           this.totalNumber = this.total
           this.leaveNumber = this.leaveNumber===null?this.total:this.leaveNumber
@@ -621,7 +621,7 @@ export default {
           for(var i=0;i<this.checkList.length;i++){
             if(this.checkList[i].patentNos.length>0){
               for(var j=0;j<this.checkList[i].patentNos.length;j++){
-                // console.log(b)
+                // //console.log(b)
                 var index = this.tableData.findIndex(item=>{
                   return item.patentNo == this.checkList[i].patentNos[j]
                 })

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

@@ -153,7 +153,7 @@ export default {
       // this.taskReTaskStateCount()
     },
     getCount(id, node) {
-      // console.log(this.sourceData,id,node);
+      // //console.log(this.sourceData,id,node);
       if (!this.sourceData[id]) {
         return 0;
       }
@@ -171,12 +171,12 @@ export default {
       this.getPatentQueryFieldSource(item.id)
     },
     PushValue(data) {
-      console.log(data);
+      //console.log(data);
       data.forEach(items => {
       //   let a=this.sourceQuery[items.fieldId].checked.findIndex(item => {
       //     return item==items.id
       // })
-      //   console.log(data,a);
+      //   //console.log(data,a);
       //   if (a!=-1) {
       //     this.sourceQuery[items.fieldId].checked.splice(a,1)
       //   } else {
@@ -205,7 +205,7 @@ export default {
     },
     //勾选后进行筛选
     onChange1(node, checked) {
-      console.log(node, checked);
+      //console.log(node, checked);
       if (checked) {
         this.sourceQuery[node.fieldId].checked.push(node.id)
         if (node.children) {
@@ -254,16 +254,16 @@ export default {
         })
       });
       // const res = new Map()
-      console.log(this.field);
+      //console.log(this.field);
       let a=this.field[0].projectId
       // this.updateQueryData(key, (this.isClassNumber(key) ? this.classTemp.filter((a) => !res.has(a.value) && res.set(a.value, 1)) : this.sourceData[key]), field.find(item => item.key === key))
       // this.returnData.field = field
       // this.returnData.key = key
-      console.log(field);
+      //console.log(field);
       this.$emit('onChange', {field,a})
       // let field = []
       // let Change=[]
-      // console.log(this.sourceQuery);
+      // //console.log(this.sourceQuery);
       // let k = this.sourceQuery.filter(item => {
       //   return item.checked.length>0
       // })
@@ -284,9 +284,9 @@ export default {
       //   }
        
       // })
-      // console.log(Change);
-      // console.log(this.sourceData);
-      // console.log(this.data[0].projectId);
+      // //console.log(Change);
+      // //console.log(this.sourceData);
+      // //console.log(this.data[0].projectId);
       // // "projectId": 0,
      
       
@@ -294,7 +294,7 @@ export default {
     }, 
     //全选,点击勾选全部的自定义选项并查找相关专利
     handleSelectAll(item) {//全选
-      console.log(item);
+      //console.log(item);
         const key = item.id
         let params = {
           projectId: this.sourceQuery[key].projectId,
@@ -328,7 +328,7 @@ export default {
     },
     //加载更多
     handleLoadMore(item) {
-      console.log(item);
+      //console.log(item);
       this.sourceQuery[item.id].current = this.sourceQuery[item.id].current + 1
       this.getPatentQueryFieldSource(item.id)
     },
@@ -359,7 +359,7 @@ export default {
       this.sourceQuery[key].loading = true
       this.$api.postfieldFromPAS(params).then(response => {
         const records = response.data.records
-        console.log(records);
+        //console.log(records);
         let temp = this.sourceData[key]
         if (!temp || refresh) {
           temp = records
@@ -384,7 +384,7 @@ export default {
       //获取用户的自定义字段
       await this.$api.getfieldFromPAS(params).then(res => {
         this.data = res.data
-        console.log(this.data);
+        //console.log(this.data);
         // this.initFieldData(this.data)
         //   if (loadForm) {
         //     this.initFieldQueryForm()
@@ -410,13 +410,13 @@ export default {
       })
     },
     initFieldData(data) {
-      console.log(data)
+      //console.log(data)
       this.field = data
       this.form = JSON.parse(JSON.stringify(data))
     },
 
     initFieldQueryForm() {
-      console.log(this.form);
+      //console.log(this.form);
       this.form.map(item => {
         const temp = this.sourceQuery[item.id]
         if (!temp) {

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

@@ -278,24 +278,24 @@ mixins:[PatentDetails,importPatent],
   mounted() {
     this.getList()
     this.getSameData()
-    console.log(this.selectedTotal)
+    //console.log(this.selectedTotal)
   },
   methods: {
     // onChangeOne(val) {
-    //   console.log(val);
+    //   //console.log(val);
     //   this.$api.getPatentListPAS()
 
     // },
     //子页面自定义字段值
     onChangeList({field,a}) {
-      console.log(field,a);
+      //console.log(field,a);
       this.queryParams.field = field
       this.queryParams.projectId = a
       this.getListPro()
       
     },
     getListPro() {
-      console.log("进来");
+      //console.log("进来");
       this.tableData=[]
       this.$api.getPatentListPAS(this.queryParams).then(res => {
         this.tableData = res.data.records
@@ -347,7 +347,7 @@ mixins:[PatentDetails,importPatent],
       this.form = this.formS
     },
     getSelectedTotal() {
-      console.log(this.queryParams.isAdd,this.queryParams.isDelete);
+      //console.log(this.queryParams.isAdd,this.queryParams.isDelete);
       this.selectedTotal = Number(this.endNumber) - Number(this.startNumber) + 1 + Number(this.queryParams.isAdd.length) - Number(this.queryParams.isDelete.length)
     },
     Switch(type) {//选择...确定公用
@@ -374,7 +374,7 @@ mixins:[PatentDetails,importPatent],
         case 2:
           // this.selectNumberLoading = true
           // this.$api.getComPatentNos(params).then(response => {
-          //   console.log(response.data)
+          //   //console.log(response.data)
           //   this.queryParams.selected = response.data
           //   this.checkList = [...new Set(this.checkList.concat(this.queryParams.selected))]
           //   // this.checkList = this.queryParams.selected
@@ -402,15 +402,15 @@ mixins:[PatentDetails,importPatent],
       }
     },
     commonSwitch(){
-      console.log(this.queryParams.startNumber,this.queryParams.endNumber)
+      //console.log(this.queryParams.startNumber,this.queryParams.endNumber)
             if(this.queryParams.size*this.queryParams.current>=this.queryParams.startNumber ){
               if(this.queryParams.size*this.queryParams.current>=this.queryParams.endNumber){
                 if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
                   var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
-                  console.log(a,b)
+                  //console.log(a,b)
                   for(var y=a;y<=b;y++){
-                    console.log(this.tableData[y])
+                    //console.log(this.tableData[y])
                    this.toIsDelete(this.tableData[y].patentNo,y)
 
                   }
@@ -443,7 +443,7 @@ mixins:[PatentDetails,importPatent],
            this.checkList = [...new Set(this.checkList)]
            this.selected = this.checkList
            this.getSelectedTotal()
-      // console.log(this.checkList)
+      // //console.log(this.checkList)
           
     },
     toIsDelete(patentNo,y){
@@ -490,13 +490,13 @@ mixins:[PatentDetails,importPatent],
       this.getList()
     },
     handleClick(tab, event) {
-      console.log(tab.index, event);
+      //console.log(tab.index, event);
       if (tab.index==0) {
         this.showRight=false
       }
     },
     getFunInfo(val) {
-      console.log(this.quickSelect);
+      //console.log(this.quickSelect);
       if(this.quickSelect){
         var index4 = this.queryParams.selected.findIndex(item=>{
             return item == val
@@ -552,7 +552,7 @@ mixins:[PatentDetails,importPatent],
           return item == val
         })
         if(index!=-1){
-          console.log(val)
+          //console.log(val)
             this.queryParams.isDelete.push(val)
              this.selected.splice(index, 1)
         }else{
@@ -624,7 +624,7 @@ mixins:[PatentDetails,importPatent],
         reportId:this.reportId
       }
       this.$api.simFeaturePatent(rep).then(res => {//相似特征
-        console.log("simFeaturePatent", res);
+        //console.log("simFeaturePatent", res);
         if (res.code==200) {
           
           res.data.forEach(item=>{
@@ -642,7 +642,7 @@ mixins:[PatentDetails,importPatent],
           this.getSpanArr(this.sameData)
         }
       })
-      console.log(this.sameData)
+      //console.log(this.sameData)
      
       
     },
@@ -653,9 +653,9 @@ mixins:[PatentDetails,importPatent],
         let count = 0;
         this.mergeObj[key] = [];
         data.forEach((item, index) => {
-          console.log(item,index)
+          //console.log(item,index)
           if (index === 0) {
-            console.log(1)
+            //console.log(1)
             this.mergeObj[key].push(1);
           } else {
             if (item[key] === data[index - 1][key] && item[key] !== 'explainText') {
@@ -674,7 +674,7 @@ mixins:[PatentDetails,importPatent],
       // column.property=“id”  
       if (this.mergeArr.indexOf(column.property) !== -1) {
         if (this.mergeObj[column.property][rowIndex]) {
-          // console.log("@@",this.mergeObj[column.property][rowIndex]);
+          // //console.log("@@",this.mergeObj[column.property][rowIndex]);
           return [this.mergeObj[column.property][rowIndex], 1]
         } else {
           return [0, 0];
@@ -707,9 +707,9 @@ mixins:[PatentDetails,importPatent],
        reportId:this.reportId
       }
       this.btnLoading = true
-      // console.log(add)
+      // //console.log(add)
       this.$api.addCompareFile(add).then(res => {
-          console.log(res);
+          //console.log(res);
           if (res.code==200) {
             this.btnLoading = false
             this.startNumber = 1
@@ -729,7 +729,7 @@ mixins:[PatentDetails,importPatent],
         })
       // if (add.patentNos.length>0) {
       //   this.$api.addCompareFile(add).then(res => {
-      //     console.log(res);
+      //     //console.log(res);
       //     if (res.code==200) {
       //       this.$emit("save", true);
       //     }
@@ -755,7 +755,7 @@ mixins:[PatentDetails,importPatent],
    async getList(key) {
      this.queryParams.reportId = this.reportId
      let params = JSON.parse(JSON.stringify(this.queryParams))
-      console.log(params);
+      //console.log(params);
       params.tree.map(tree => {
         let field = params.field.filter(item => item.key === tree.key)
         if (field.length === 0) {
@@ -763,7 +763,7 @@ mixins:[PatentDetails,importPatent],
         }
       })
      params.tree = undefined
-     console.log(params);
+     //console.log(params);
      this.$store.commit('SET_PATENT_PARAMS', params)
       this.loading=true
      await this.$api.getCompareFile(params).then(response => {
@@ -787,14 +787,14 @@ mixins:[PatentDetails,importPatent],
       })
     },
     showPatent(even) {//选择下拉框
-      console.log(even);
+      //console.log(even);
     },
   },
   watch: {
     ChosePatentSure(val) {
       if (val) {
         if(this.queryParams.selectedTotal>0){
-          console.log(val)
+          //console.log(val)
           if(this.selectedTotal>0){
              this.savePatentList()
           }

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

@@ -125,7 +125,7 @@ export default {
   },
 
   mounted() {
-    console.log(this.$s.getSession('reportMessage1'))
+    //console.log(this.$s.getSession('reportMessage1'))
     // this.splitBy1 = this.$s.getSession('reportMessage1').splitBy.toString()
     // this.splitType1 = this.$s.getSession('reportMessage1').splitType.toString()
     this.show = this.isshow == false ? this.isshow : true
@@ -140,7 +140,7 @@ export default {
         return false
       }
       const offsetBodyHeight = body.offsetHeight
-      console.log( window.innerHeight,body,offsetBodyHeight,offsetTop)
+      //console.log( window.innerHeight,body,offsetBodyHeight,offsetTop)
       if (this.tableData.length && offsetBodyHeight < offsetTop) {
         this.tableHeight = offsetBodyHeight + 75
       } else if (!this.tableData.length) {
@@ -151,7 +151,7 @@ export default {
     },
     //选中特征
     getFunInfo(row,scope) {
-      console.log("row",row,scope)
+      //console.log("row",row,scope)
       // this.$emit('getfeatures', row)
       let Index=this.row.findIndex(item => {return item.id==row.id })
       if (Index<0) {
@@ -160,11 +160,11 @@ export default {
       } else {
         this.row.splice(Index,1)
       }
-      console.log("getFunInfo",this.row);
+      //console.log("getFunInfo",this.row);
     },
     //合并
     merge() {
-      console.log(this.row)
+      //console.log(this.row)
       var sign = this.row[0].rightId
       var allow = true
       this.row.forEach(item => {
@@ -187,7 +187,7 @@ export default {
       var str = ''
       var strText=""
       if (this.row != []) {
-        console.log(this.row);//explainText
+        //console.log(this.row);//explainText
         let row = this.row.sort((aId, bId) => {
             return aId.$index-bId.$index; 
           })
@@ -247,7 +247,7 @@ export default {
       //只对勾选的进行拆分
       this.keepSure=false
       this.checkList = []
-      console.log(this.row);
+      //console.log(this.row);
       this.row.forEach(ele=>{
         var Index = this.tableData1.findIndex(item => {
           return item.id==ele.id
@@ -276,12 +276,12 @@ export default {
               rightType: ele.rightType,
               splitBy: ele.splitBy,
         }
-        // console.log(tab)
+        // //console.log(tab)
         this.tableData1.splice(Index+1,0,tab)
       })
       this.TypeSelect(this.Type)//调用显示权要
       this.row = []
-      console.log(this.row);
+      //console.log(this.row);
     },
     //获取每个元素所需合并的行数
     getSpanArr(data) {
@@ -309,7 +309,7 @@ export default {
       // column.property=“id”  
       if (this.mergeArr.indexOf(column.property) !== -1) {
         if (this.mergeObj[column.property][rowIndex]) {
-          // console.log("@@",this.mergeObj[column.property][rowIndex]);
+          // //console.log("@@",this.mergeObj[column.property][rowIndex]);
           return [this.mergeObj[column.property][rowIndex], 1]
         } else {
           return [0, 0];
@@ -335,9 +335,9 @@ export default {
         splitBy: this.splitBy1,
         ReportId: this.reportId,
       }
-      console.log(PatentRight)
+      //console.log(PatentRight)
       this.$api.splitPatentRight(PatentRight).then(res => {
-        console.log("res",res);
+        //console.log("res",res);
         if (res.code == 200) {
           // this.splitBy1= res.data.splitBy.toString()
           // this.splitType1= res.data.splitType.toString()
@@ -388,7 +388,7 @@ export default {
           this.TypeSelect(this.Type)//调用显示权要
           this.loading=false
         }
-        // console.log("@@",this.tableData1);
+        // //console.log("@@",this.tableData1);
       })
     },
 
@@ -398,7 +398,7 @@ export default {
       this.splitPatentRight()
     },
     splitBySelect(event) {//按符号拆分
-      console.log(event);
+      //console.log(event);
       this.splitBy1 = event;
       this.splitPatentRight();
     },
@@ -409,12 +409,12 @@ export default {
       } else {
         this.typeArr.push(1, 0);
       }
-      // console.log("@@",this.tableData);
-      // console.log("@@",this.tableData1);
+      // //console.log("@@",this.tableData);
+      // //console.log("@@",this.tableData1);
       this.tableData = this.tableData1.filter(item => {
          return this.typeArr.includes(item.pType)
       })
-      // console.log("tableData",this.tableData);
+      // //console.log("tableData",this.tableData);
       this.getSpanArr(this.tableData)
     },
     //保存
@@ -440,7 +440,7 @@ export default {
       let j = 0;
       for (let i = 0; i < this.tableData1.length; i++){
         if (keepArr.findIndex(item => { return item.contentOut == this.tableData1[i].pContentOut }) < 0) {
-          console.log(this.tableData1[i]);
+          //console.log(this.tableData1[i]);
           j+=1
           keepArr.push(
             {
@@ -488,9 +488,9 @@ export default {
         // }
         
       }
-      console.log(keepArr)
+      //console.log(keepArr)
       this.$api.KeepPatentRight(keepArr).then(res => {
-        console.log(res);
+        //console.log(res);
         if (res.code == 200) {
           this.keepSure = true;
           this.btnLoading = false

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

@@ -37,6 +37,7 @@
       </div>
   
       <el-table
+      ref="table"
       :data="tableData.filter(item=>typeArr.includes(item.pType))"
       :span-method="objectSpanMethod"
       :row-class-name="tableRowClassName"
@@ -115,6 +116,7 @@
               <el-option v-for="item in rightList.filter(item=>typeArr.includes(item.type))" :key="item.rightId" :value="item.rightId" :label="item.pRightName"></el-option>
           </el-select>
         <el-table
+          ref="table"
           :data="tableData.filter(item=>item.rightId == ruleForm.type)"
           :span-method="objectSpanMethod"
           :row-class-name="tableRowClassName"
@@ -335,6 +337,14 @@ export default {
   created() {
 
   },
+  watch:{
+    tableData(){
+        //console.log(1)
+            this.$nextTick(() => {
+              this.$refs.table.doLayout();//doLayout()方法，让table重新布局
+            })
+        },
+  },
   computed:{
     taskId(){
       return this.$route.query.taskId
@@ -368,9 +378,9 @@ export default {
       var index2 = this.tableHeader.findIndex(item=>{//获取选中专利位置
         return item.patentNo == node.patentNo
       })
-      console.log(val1,node,index1,index2)
+      //console.log(val1,node,index1,index2)
       this.tableHeader[index1] = this.tableHeader.splice(index2,1,this.tableHeader[index1])[0]
-      console.log(this.tableHeader)
+      //console.log(this.tableHeader)
       this.addOrder()
       
     },
@@ -387,8 +397,8 @@ export default {
       // this.$nextTick(()=>{
       //   this.show = true
       // })
-        console.log(this.tableHeader)
-        console.log('tree drop: ', before,after,inner,ev);
+        //console.log(this.tableHeader)
+        //console.log('tree drop: ', before,after,inner,ev);
       },
       addOrder(){//给专利添加顺序
         var a = {
@@ -402,7 +412,7 @@ export default {
           })
         })
         this.$api.addOrder(a).then(response=>{
-          console.log(response)
+          //console.log(response)
           if(response.code == 200){
             this.show1 = false
             this.$nextTick(()=>{
@@ -414,8 +424,8 @@ export default {
       },
     handleCheckChange(val1,val2,val3){
       // var getCheck = this.$refs.tree.getCheckedNodes()
-      // console.log(getCheck)
-      console.log(val1,val2,val3)
+      // //console.log(getCheck)
+      //console.log(val1,val2,val3)
       if(val2){
         if(this.checked.length>1){
           this.$alert('只能对2条特征进行交换','提示',{
@@ -436,7 +446,7 @@ export default {
         }
       }
       
-      console.log(this.checked)
+      //console.log(this.checked)
     },
     exchange(){
       if(this.checked.length>2){
@@ -457,7 +467,7 @@ export default {
         return item.id == b.id
       })
       this.tableHeader[index1] = this.tableHeader.splice(index2,1,this.tableHeader[index1])[0]
-      console.log(this.tableHeader)
+      //console.log(this.tableHeader)
       this.show = false
       this.$nextTick(()=>{
         this.checked = []
@@ -491,7 +501,7 @@ export default {
       }
     },
     // open(row){
-    //   console.log(row)
+    //   //console.log(row)
     //   this.patentNo = row.signPatentNo,
     //   this.reportId = row.id
     //   this.getContrastList()
@@ -528,7 +538,7 @@ export default {
                       this.tableData.push(res.data.patentRightVos[i].features[m])
                     }
                 }
-                console.log(this.tableData)
+                //console.log(this.tableData)
                 var a = {
                   reportId:this.reportId,
                   taskId:this.taskId
@@ -536,7 +546,7 @@ export default {
                 // this.tableData = []
                 this.$api.selectCompareRecord(a).then(response=>{
                   if(response.code == 200){
-                    // console.log(response.data)
+                    // //console.log(response.data)
                     var b = JSON.parse(JSON.stringify(this.tableData[0]))
                     response.data.records.forEach(item => {
                       for(var i =0;i<item.features.length;i++){
@@ -603,7 +613,7 @@ export default {
     },
     // renderHeader(h, { column, $index }) {
 
-    //   console.log($index, this.tableHeader)
+    //   //console.log($index, this.tableHeader)
     //   return (
     //     <div>
     //       <span>{this.tableHeader[$index - 2].head}</span>
@@ -625,7 +635,7 @@ export default {
         featuresIDList:this.featuresId,
         recordIDList:this.recordList
       }
-      // console.log(a)
+      // //console.log(a)
       this.$api.addCompareScenarios(a).then(response=>{
         if(response.code == 200){
           this.recordList = []
@@ -652,7 +662,7 @@ export default {
       this.show = false
     },
     getFunInfo(row, patentNo,i) {
-      // console.log(row,patentNo?row[patentNo+'_Id']:'1')
+      // //console.log(row,patentNo?row[patentNo+'_Id']:'1')
       if(patentNo){
        var index = this.recordList.findIndex(item=>{
           return item == row[patentNo+'_Id'][i]

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

@@ -88,12 +88,12 @@ export default {
     this.reportId = this.$route.query.id
     // this.splitBy = this.$route.query.splitBy
     // this.splitType = this.$route.query.splitType
-    console.log("@@@", this.patentNo, this.reportId,this.$s.getSession('reportMessage1'))
+    //console.log("@@@", this.patentNo, this.reportId,this.$s.getSession('reportMessage1'))
     this.splitBy = this.$s.getSession('reportMessage1').splitBy?this.$s.getSession('reportMessage1').splitBy.toString():null
     this.splitType = this.$s.getSession('reportMessage1').splitType?this.$s.getSession('reportMessage1').splitType.toString():null
     this.personId = this.$route.query.personId
     this.reportMessage = this.$s.getSession('reportMessage1')
-    console.log("@@@", this.patentNo, this.reportId,this.$s.getSession('reportMessage1'))
+    //console.log("@@@", this.patentNo, this.reportId,this.$s.getSession('reportMessage1'))
   },
   mounted() {
     let activeA = localStorage.activeWatch==undefined?localStorage.activeWatch:JSON.parse(localStorage.activeWatch)
@@ -177,7 +177,7 @@ export default {
         if (this.ChosePatentSure) {
           this.active += 1;
           this.stepSuc.push(this.active-1);
-          console.log(this.stepSuc)
+          //console.log(this.stepSuc)
           this.gong();
           this.ChosePatentSave = false;
           this.ChosePatentSure = false;
@@ -188,7 +188,7 @@ export default {
         if (this.keepSure) {
           this.active += 1;
           this.stepSuc.push(this.active-1);
-          console.log(this.stepSuc)
+          //console.log(this.stepSuc)
           this.gong();
         } else {//未保存提示
           this.$confirm('您的修改未保存，如果点击确定将直接跳转下一步，您的修改不会被保存，若想保存您的修改，请点击取消，点击保存按钮保存修改！', '温馨提示',  {
@@ -250,7 +250,7 @@ export default {
   },
   watch: {
     active(val) {
-      console.log(val);
+      //console.log(val);
       // localStorage.clear("activeWatch");
       var act = localStorage.activeWatch==undefined?localStorage.activeWatch:JSON.parse(localStorage.activeWatch)
       var a = {
@@ -258,9 +258,9 @@ export default {
         stepSuc:this.stepSuc,
         active:val
       }
-      // console.log(act);
+      // //console.log(act);
       if (act) {
-        // console.log(11);
+        // //console.log(11);
         var c = act.findIndex(item => { return item.reportId == this.reportId })
         if (c < 0) {
           act.push(a)

RMS-FrontEnd/src/views/report/avoid/avoidPage/avoidDirection.vue

@@ -136,7 +136,7 @@ export default {
     };
   },
   mounted() {
-    console.log( this.$s.getSession('reportMessage1'),this.reportId);
+    // console.log( this.$s.getSession('reportMessage1'),this.reportId);
     // this.splitPatentRight()
     this.getSplitMessage()
   },
@@ -175,9 +175,7 @@ export default {
         reportId: this.reportId,
       }
       this.$api.getSplitMessage(a).then(res => {
-        console.log(res);
         if (res.code == 200) {
-          console.log(JSON.stringify(res.data) =='{}');
           if (JSON.stringify(res.data) =='{}') {
             this.isNum=1
           } else {
@@ -223,7 +221,6 @@ export default {
                 }
               })
             }
-            console.log(this.tableData1);
             this.TypeSelect(this.Type)
             this.loading=false
           }
@@ -351,7 +348,7 @@ export default {
     },
     //保存
     keep() { 
-      console.log(this.tableData1);
+      // console.log(this.tableData1);
       let keepArr = [
         {
           pRightName: this.tableData1[0].pRightName,
@@ -367,12 +364,11 @@ export default {
           features:[],
         }
       ]
-      console.log(keepArr);
       var j=0
       for (let i = 0; i < this.tableData1.length; i++) {
         // console.log(this.tableData1);
         if (keepArr.findIndex(item => { return (item.pRightName ||item.RightName) == this.tableData1[i].rightName }) < 0) {
-          console.log(this.tableData1[i]);
+          // console.log(this.tableData1[i]);
           j += 1
           keepArr.push(
             {
@@ -429,16 +425,12 @@ export default {
               pContentOut: this.tableData1[i].pContentOut,
         })
       }
-      console.log(keepArr,this.tableData1);
       let keepStr = {
         reportId: this.reportId,
         avoidDesignLittleDirectionDTOs: keepArr,
         wholeDirection:this.textarea1.wholeDirection?this.textarea1.wholeDirection:''
       }
-      console.log(this.textarea1.wholeDirection);
-      console.log(this.tableData,keepArr,keepStr);
       this.$api.addAvoidDesignDirection(keepStr).then(res => {
-        console.log(res);
         if (res.code == 200) {
           // if (this.isNum!=0) {
           //   
@@ -462,7 +454,7 @@ export default {
     },
     // 特征等合并
     merge() { 
-      console.log(this.checkList,this.row);
+      // console.log(this.checkList,this.row);
       if (this.row.length > 1) {
         var str=''
         var str1=''
@@ -510,7 +502,6 @@ export default {
             this.tableData1[Index2].contentOut=str1
             this.tableData1[Index2].littleDirection=str2
             this.tableData1[Index2].explainText = str3
-            console.log(this.tableData1);
           }
           // console.log(this.tableData1[Index2]);
           

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

@@ -291,7 +291,6 @@ export default {
       }
     },
     onChange(file, fileList) {
-      console.log(file,fileList)
       if(this.form.reportFiles){
         var index3 = this.form.reportFiles.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
@@ -341,7 +340,6 @@ export default {
       }
     },
     onChange1(file, fileList){
-      console.log(file)
       let formData = new FormData()
       formData.append('file', file.raw)
       this.$api.import(formData).then(response => {
@@ -359,7 +357,7 @@ export default {
       this.webSocket.onmessage = (e) => {
         // console.log(e)
         const { code, data, message } = JSON.parse(e.data)
-        console.log(JSON.parse(e.data))
+        // console.log(JSON.parse(e.data))
         if (code === 903 || code === 904) {
           this.loading = false
           this.$message.success('专利导入成功')
@@ -402,10 +400,10 @@ export default {
       if(index!=-1){
         this.file.splice(index,1)
       }
-      console.log(this.file, fileList);
+      // console.log(this.file, fileList);
       },
     handlePreview(file) {
-      console.log(file);
+      // console.log(file);
       // this.$api.seeFile()
       // this.imageUrl ='https://view.xdocin.com/view?src=' + URL.createObjectURL(file.raw)
       // this.showFile = true
@@ -469,7 +467,6 @@ export default {
     },
     //接收创建报告类型
     open(row,dictMessage) {
-      console.log(row)
       this.verify=true
       var a = ''
       this.form = row
@@ -553,7 +550,6 @@ export default {
                             
                     });
           }else{
-            console.log(this.form)
             let formData = new FormData()
             if(this.file){
               for (var i = 0; i < this.file.length; i++) {

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

@@ -344,7 +344,6 @@
         // this.getClientList()
         this.show = this.showbtn == false?this.showbtn:true
         this.projectId = this.pId?this.pId:this.projectId
-       console.log(this.show)
     },
     watch:{
       value(val){

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

@@ -189,7 +189,6 @@ export default {
         this.$message.error('请选择文件')
         return false
       }
-      console.log(this.ruleForm)
       let formData = new FormData()
 
       // formData.append('reportId', this.reportId)

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

@@ -81,7 +81,6 @@ export default {
             a.forEach(item => {
                 b[item.dictChildValue] = item.dictChildLabel
             });
-            // console.log(b)
             return b
         },
     },
@@ -92,7 +91,7 @@ export default {
         getList(){
             this.$api.getTemplateByType(this.queryParams).then(response=>{
                 if(response.code == 200){
-                    console.log(response.data)
+                    // console.log(response.data)
                     this.tableData = response.data.records
                     this.total = response.data.total
                 }
@@ -103,7 +102,6 @@ export default {
             this.getList()
         },
         getTemplateId(val){
-            console.log(val)
             this.$emit('getReportTemplateId',val)
         },
     },

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

@@ -387,7 +387,7 @@
         this.getList()
       },
       handleClick(tab, event) {
-        console.log(tab, event);
+        // console.log(tab, event);
       },
       getFunInfo(val) {
         if(this.quickSelect){
@@ -444,7 +444,6 @@
             return item == val
           })
           if(index!=-1){
-            console.log(val)
               this.queryParams.isDelete.push(val)
               this.selected.splice(index, 1)
           }else{
@@ -515,7 +514,7 @@
           reportId:this.reportId
         }
         this.$api.simFeaturePatent(rep).then(res => {//相似特征
-          console.log("simFeaturePatent", res);
+          // console.log("simFeaturePatent", res);
           if (res.code==200) {
           }
         })
@@ -577,9 +576,7 @@
          endNumber:this.endNumber,
          reportId:this.reportId
         }
-        console.log(add)
         this.$api.deleteCompareNo(add).then(res => {
-            console.log(res);
             if (res.code==200) {
               this.startNumber = 1
               this.endNumber = 0
@@ -627,7 +624,6 @@
       },
      async getList(key) {
        this.queryParams.reportId = this.reportId
-        console.log(this.queryParams);
         let params = JSON.parse(JSON.stringify(this.queryParams))
         params.tree.map(tree => {
           let field = params.field.filter(item => item.key === tree.key)
@@ -656,7 +652,7 @@
         })
       },
       showPatent(even) {//选择下拉框
-        console.log(even);
+        // console.log(even);
       },
     },
     watch: {
@@ -670,7 +666,6 @@
       ChosePatentSure(val) {
         if (val) {
           if(this.checkList.length>0){
-            console.log(val)
              this.deletePatentList()
              this.$nextTick(_=>{
               this.$emit("save", true);

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

@@ -86,7 +86,7 @@ export default {
         return false
       }
       const offsetBodyHeight = body.offsetHeight
-      console.log(offsetTop,offsetBodyHeight)
+      // console.log(offsetTop,offsetBodyHeight)
       if (this.data.length && offsetBodyHeight < offsetTop) {
         this.tableHeight = offsetBodyHeight + 75
       } else if (!this.data.length) {
@@ -110,7 +110,7 @@ export default {
     },
 
     sortChange({ column, prop, order }) {
-      console.log(order)
+      // console.log(order)
       if (!order) {
         this.sortData('create_time', 'desc')
         return false

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

@@ -20,7 +20,7 @@ export const explain = {
   methods: {
      // 解释所需方法
     saveValue(val) {//点击输入触发,第一次为空不打印
-      console.log("saveValue",val);
+      // console.log("saveValue",val);
       if (this.keepSure) {
         this.keepSure = false;
       }
@@ -29,10 +29,10 @@ export const explain = {
           if(this.tableHeight){
             this.setHeight()
           }
-      console.log(this.innerhtml)
+      // console.log(this.innerhtml)
     },
     getValue(row,name) {//失去焦点触发，row本行数据，name是传过来的row里面每一个属性
-      console.log("getValue",row[name]);
+      // console.log("getValue",row[name]);
       if (this.innerhtml != '') {
         row[name] = this.innerhtml
         this.innerhtml = ''
@@ -43,19 +43,18 @@ export const explain = {
       var e = event || window.event
       e.preventDefault();
       const items = (event.clipboardData || window.clipboardData).items;
-      console.log((event.clipboardData || window.clipboardData).getData('Html'))
+      // console.log((event.clipboardData || window.clipboardData).getData('Html'))
       let file = null;
       if (!items || items.length === 0) {//？
         this.$message.error("当前浏览器不支持本地");
         return;
       }
       for (let i = 0; i < items.length; i++) {
-        console.log(items[i].type)
+        // console.log(items[i].type)
         if (items[i].type.indexOf("text") !== -1) {
           var text =  (e.originalEvent || e).clipboardData.getData('text/plain') || prompt('在这里输入文本');
           //清除回车
           text = text.replace(/\[\d+\]|\n|\r/ig,"")
-          console.log(text)
           let str = row[name]?row[name]:''
           this.$set(row,name,str +text)
           this.saveValue(row[name])
@@ -79,7 +78,6 @@ export const explain = {
         var blobUrl = event.target.result
         var new_img = '<img src="' + blobUrl + '" style="width:80px;height: 80px;border: 1px solid #f9f6f675;vertical-align:middle" >';
         let str = row[name]?row[name]:''
-        console.log(str,this.innerhtml)
       // var arr =  this.SplitHtmlTag(this.innerhtml)
       // var b = []
       // arr.forEach(item => {
@@ -145,7 +143,7 @@ export const explain = {
       if(currentIndex< temInnerHtml.length){
           splitStrings[i] = {"text": temInnerHtml.substring(currentIndex,temInnerHtml.length), "type":"text"};
       }
-      console.log(splitStrings)
+      // console.log(splitStrings)
       return splitStrings;
 
   },

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

@@ -203,7 +203,7 @@ export default{
     if (this.choiceMark) {
         await this.getList()
       }
-    console.log(this.choiceTableData,this.tableData,this.selected,this.choiceMark,this.queryParams);
+    // console.log(this.choiceTableData,this.tableData,this.selected,this.choiceMark,this.queryParams);
   },
   watch:{
     isSubmit(val){
@@ -214,9 +214,7 @@ export default{
       }
     },
     isHandleSure(val) {
-      console.log(val);
       if (val) {
-        console.log(this.selected,this.choiceFormS);
         let a = {
           selected:this.selected,
           choiceFormS:this.choiceFormS,
@@ -289,7 +287,7 @@ export default{
       this.$emit('PersonPatent', this.checkList)
       if (this.choiceMark) {
         this.selected = this.checkList
-        console.log(this.checkList,this.selected);
+        // console.log(this.checkList,this.selected);
       }
         
       // }
@@ -334,7 +332,6 @@ export default{
         // this.choiceQueryParams.compareResult = this.choiceFormS.compareResult//比对结果
         this.getList()
         
-        console.log(this.choiceFormS);
         this.visible = false
       } else {
         this.formS = JSON.parse(JSON.stringify(this.form))
@@ -345,7 +342,7 @@ export default{
       // this.form = {}
     },
     change(val) {
-      console.log(val);
+      // console.log(val);
     },
    
   },

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

@@ -64,7 +64,6 @@ export default {
   mounted() {
     this.check = []
     if (this.allCheck.length > 0) {
-      console.log(1)
       var a = []
       for (let i = 0; i < this.allCheck.length; i++){
         a.push(this.allCheck[i].id)
@@ -86,7 +85,6 @@ export default {
       this.check = a
       this.queryParams.notInPersonIds = a
       this.getList()
-      console.log(this.check)
     },
   },
   methods: {
@@ -96,7 +94,6 @@ export default {
     },
     getList() {
       this.loading = true;
-      console.log(1)
       // this.queryParams.tenant = this.userinfo.tenantId
       this.$api.getPartPersonnel(this.queryParams)
         .then((response) => {
@@ -125,7 +122,6 @@ export default {
         
       }
       
-      console.log(this.allCheck)
     },
     submitPerson(){
       if(this.allCheck.length>0){

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

@@ -159,7 +159,7 @@ export default {
   },
   methods: {
     handleRemove(file, fileList) {
-      console.log(file, fileList);
+      // console.log(file, fileList);
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -167,11 +167,9 @@ export default {
     },
 
     async getfeatures() {
-      console.log(this.patentId, this.projectId)
       await this.$api.getPatentById(this.patentId, { projectId: this.projectId }).then(response => {
         this.tableData = []
         this.patent = response.data
-        // console.log(this.patent)
         this.$nextTick(() => {
           var id = 0
           for (var i = 0; i < this.patent.rights.length; i++) {
@@ -218,7 +216,7 @@ export default {
       //   }
 
       this.patentId = data.id
-      console.log(this.patentId)
+      // console.log(this.patentId)
       this.getfeatures()
     },
     getSpanArr(data) {

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

@@ -98,7 +98,6 @@ export default {
     //校验协同人是否为空
     const isCollaborator = (rule, value, callback) => {
       if (!this.clientForm.handlePersonIds) {
-        console.log("进来");
         callback(new Error('请选择协同人'))
       } else {
         callback()
@@ -122,7 +121,7 @@ export default {
         this.isEndTimes = Date.parse(new Date)
       }
       let b = Date.parse(value)
-      console.log(this.isEndTimes,b);
+      // console.log(this.isEndTimes,b);
       if (value) {
         if (b<this.isEndTimes) {
           callback(new Error('禁止选择现在及以前时间，请重新选择'))
@@ -203,7 +202,7 @@ export default {
     if (this.reportType==4) {
       this.queryParams.patentNos.push(this.patentNo1)
     }
-    console.log(this.selected);
+    // console.log(this.selected);
     this.getPersonnelList()
     
   },
@@ -236,7 +235,6 @@ export default {
                 }
               }
           }
-          console.log(this.selected, this.queryParams.patentNos,this.choiceFormS);
           if (this.selected==undefined) {
             this.selected=[]
           }
@@ -254,7 +252,6 @@ export default {
 
           if (Object.keys(this.choiceFormS).length > 0) {
             for (let k in this.choiceFormS) {
-              console.log(k, this.choiceFormS);
                 if (k=='title') {
                   this.queryParams.patentVO.patentName = this.choiceFormS[k]
                 } else if (k == 'compareResult') {
@@ -266,7 +263,6 @@ export default {
                 
               }
           }
-          console.log(this.personnelList,this.queryParams);
           this.$api.addSyneryTask(this.queryParams).then(res => {
             if (res.code == 200) {
               this.close()
@@ -278,13 +274,12 @@ export default {
               // this.isEndTime=true
             }
           })
-          console.log(this.queryParams);
         }
       })
      
     },
     getCheck(val) {
-      console.log("getCheck", val)//每行数据对象
+      // console.log("getCheck", val)//每行数据对象
       this.checked = val
       this.submit()
     },
@@ -298,7 +293,6 @@ export default {
         } else {
           for (var i = 0; i < this.checked.length; i++) {
             var a = this.checked[i].name + "<" + this.checked[i].email + ">"
-            console.log(a);
             if (this.clientForm.syneryCCLists.indexOf(a) == -1) {
               this.clientForm.syneryCCLists.push(a)
               this.queryParams.syneryCCList.push({
@@ -361,18 +355,15 @@ export default {
       
     },
     change(item) {
-      console.log(item);
       this.queryParams.personEmail = ''
       this.queryParams.handlePersonId=item
       this.personnelList = []
     },
     change1(item) {
-      console.log(item);
       var a = item.length - 1
       var arr = this.AllpersonnelList.filter(item1 => {
         return item1.id == item[a]
       })
-      console.log(arr);
       if (arr.length>0) {
         if (this.queryParams.syneryCCList.findIndex(it=>{ return it.ccId==arr[0].id })==-1) {
           this.queryParams.syneryCCList.push({
@@ -395,7 +386,6 @@ export default {
           }
         }
       })
-      console.log(item, this.queryParams.syneryCCList);
     },
     clear(val) {
       if (val==0) {

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

@@ -162,7 +162,6 @@ export default {
             this.reportTemplateId = ''
             this.reportTemplate = false
             this.loadingTemplate=false
-            console.log(response.data)
           } else{
             this.$message.error('导出失败,请重试')
             this.loadingTemplate=false
@@ -226,7 +225,6 @@ export default {
       this.$refs.ReportForm.open(form)
     },
     handleOption({ option, row }) {
-      console.log(this.dataList)
       switch (option) {
         case '0':
           this.handleImportPatent(row)
@@ -292,13 +290,11 @@ export default {
       })
     },
     exportReport(row){
-      console.log(row)
       this.reportId = row.id
       this.reportType = row.type
       this.reportTemplate = true
     },
     handleDetails(val){
-      console.log("row", val);
       this.$s.setSession('reportMessage1',val)
       switch(val.type){
         case 0:
@@ -365,7 +361,6 @@ export default {
       })
     },
     handleFields(row) {
-      console.log(row);
       this.reportId=row.id
       this.setVisible = true
       //  this.$api.listPatentField().then(res=>{})
@@ -383,11 +378,10 @@ export default {
       window.open(a.href,"_blank")
     },
     handleEdit(row) {
-      console.log(row)
       this.$refs.ReportForm.open(row)
     },
     handleSort(sort) {
-      console.log(sort)
+      // console.log(sort)
       this.queryParams.orderBy = sort.prop
       this.queryParams.orderDesc = sort.order
       // this.queryParams.sort = { ...sort }

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

@@ -186,20 +186,20 @@ export default {
     },
     methods: {
       getInfo(val){
-       console.log(this.checkList2)
+       //console.log(this.checkList2)
         var a = this.checkList2.findIndex(item=>{
-          console.log(item,val)
+          //console.log(item,val)
           return item == val
         })
-        console.log(a)
+        //console.log(a)
         if(a==-1){
-          console.log(1)
+          //console.log(1)
           this.checkList2.push(val)
         }else{
           this.checkList2.splice(a,1)
         }
         this.$forceUpdate()
-        console.log(val,this.checkList2)
+        //console.log(val,this.checkList2)
       },
       checkPatentList(){
         var a = this.checkList2.map(item=>{
@@ -216,7 +216,7 @@ export default {
         this.$nextTick(()=>{
           this.show = true
         })
-        // console.log(this.tableData)
+        // //console.log(this.tableData)
       },
       getChecked(){
         this.$refs.tree.setCheckedNodes(this.checkList2)
@@ -227,7 +227,7 @@ export default {
         this.tableData = []
         this.tableData = JSON.parse(JSON.stringify(this.tableData1))
         this.getSpanArr(this.tableData)
-        console.log(this.checkList2)
+        //console.log(this.checkList2)
         this.show = false
         this.$nextTick(()=>{
           this.show = true
@@ -240,7 +240,7 @@ export default {
       this.showFile = true
     },
     filterHandler(value, row, column) {
-      console.log(value, row, column)
+      //console.log(value, row, column)
         const property = column['property'];
         return row[property] === value;
       },
@@ -253,7 +253,7 @@ export default {
         }
       },
       delPlan(){
-        console.log(this.checkList)
+        //console.log(this.checkList)
         this.$confirm('此操作将永久删除, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -278,7 +278,7 @@ export default {
         getContrastPlan(){
             this.$api.selectCompareScenarios({reportID:this.reportId}).then(response=>{
                 if(response.code == 200){
-                    console.log(response.data)
+                    //console.log(response.data)
                     response.data.forEach((item,index)=>{
                       var a = this.rightList.findIndex(i=>{
                         return i.value == item.right
@@ -322,7 +322,7 @@ export default {
                         return a.featureId - b.featureId
                       })
                     })
-                    console.log(this.resultant)
+                    //console.log(this.resultant)
                     this.tableData = response.data
                     this.tableData1 = JSON.parse(JSON.stringify(this.tableData))
                     this.getSpanArr(this.tableData)

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

@@ -130,7 +130,7 @@ export default {
     // this.queryParams.type = this.$route.query.type
     //接收从任务分配跳转数据
     // this.signPatentNo = this.$route.query.signPatentNo
-    console.log(this.$route.query.personId,this.row);
+    //console.log(this.$route.query.personId,this.row);
     this.personId = this.$route.query.personId?this.$route.query.personId:this.$s.getSession('row').personId
     this.reportMessage = this.$s.getSession('row')?this.$s.getSession('row'):this.$s.getSession('reportMessage')
   },
@@ -162,20 +162,20 @@ export default {
     // 子组件传勾选中的字段，表格进行筛选
     onChanges(val) {
       this.onChangesIn = val
-      console.log(this.onChangesIn);
+      //console.log(this.onChangesIn);
     },
     onTaskStatus(val) {
       this.taskStatus=val
     },
     handleNodeClick(treeData) {
-        console.log(treeData);
+        //console.log(treeData);
     },
     close() {
       this.visible = false
       this.form = this.formS
     },
     sift() {
-      console.log(111111);
+      //console.log(111111);
       this.visible = true
     },
     sure() {
@@ -184,7 +184,7 @@ export default {
       // this.form={}
     },
     treeFilterChange(data) {
-      console.log(data);
+      //console.log(data);
       this.queryParams.tree = data
       this.handleSearch()
     },
@@ -194,7 +194,7 @@ export default {
     },
     // 任务分配
     taskFeil() {
-      // console.log("分配");
+      // //console.log("分配");
       this.taskFeilSure=true
     },
     // 工作协同

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

@@ -92,7 +92,6 @@ export default {
             }
         },
         onChange(file, fileList) {
-      console.log(file,fileList)
       if(this.form.reportFiles){
         var index3 = this.form.reportFiles.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
@@ -150,7 +149,7 @@ export default {
             }
         },
         handlePreview(file) {
-            console.log(file);
+            // console.log(file);
             // this.imageUrl ='https://view.xdocin.com/view?src=' + URL.createObjectURL(file.raw)
             // this.showFile = true
         },

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

@@ -179,7 +179,7 @@ export default {
       this.taskReTaskStateCount()
     },
     getCount(id, node) {
-      console.log(this.sourceData,id,node);
+      //console.log(this.sourceData,id,node);
       if (!this.sourceData[id]) {
         return 0;
       }
@@ -191,18 +191,18 @@ export default {
     },
     //模糊查询，每个面板中查询自定义字段的选项
     handleSearch(item) {
-      console.log(item, this.sourceData, this.sourceQuery);
+      //console.log(item, this.sourceData, this.sourceQuery);
       this.sourceData[item.id] = []
       this.sourceQuery[item.id].checked = []
       this.sourceQuery[item.id].current = 1
-      // console.log(item);
+      // //console.log(item);
       let sourceQueryName = this.sourceQuery[item.id].name
       let a = {
         fieldId: item.id,
         name: sourceQueryName,
       }
       this.$api.getPatentField(a).then(res => {
-        console.log("查询成功", res);
+        //console.log("查询成功", res);
         res.data.map(item => {
           item.label = item.name
           // item.key = item.id
@@ -213,7 +213,7 @@ export default {
       
     },
     onChangeTree1(a,b){
-      console.log(a,b)
+      //console.log(a,b)
       // var c = this.taskSources1.findIndex(ele=>{
       //   return ele.taskTypeId == b.halfCheckedNodes[0].taskTypeId
       // })
@@ -234,13 +234,13 @@ export default {
        
         this.taskSources1 = this.taskSources1.filter(item=>{
           var c = b.halfCheckedNodes.length>0?b.halfCheckedNodes[0].taskTypeId:a.taskTypeId
-          console.log(item.taskTypeId,c,item.taskTypeId != c)
+          //console.log(item.taskTypeId,c,item.taskTypeId != c)
           return item.taskTypeId != c
         })
-        console.log(this.taskSources1)
+        //console.log(this.taskSources1)
         // this.taskSources1.forEach((item,index)=>{
         //     if(item.taskTypeId == b.halfCheckedNodes.length>0?b.halfCheckedNodes[0].taskTypeId:a.taskTypeId){
-        //       console.log(index)
+        //       //console.log(index)
         //       this.taskSources1.splice(index,1)
         //     }
         //   })
@@ -263,19 +263,19 @@ export default {
         taskSources:this.taskSources1,
         notAssignTypes:this.notAssignTypes
       }
-      console.log(c)
+      //console.log(c)
       this.$emit('search',c)
     },
     // 树类型勾选后进行筛选
     onChangeTree(a, b) {
-      console.log(a,b);
+      //console.log(a,b);
       if (b) {
         this.sourceQuery[a.fieldId].checked.push(a.id);
         if (a.children) {
           this.onTree(a.children)
         }
       } else {
-        console.log(this.sourceQuery[a.fieldId].checked);
+        //console.log(this.sourceQuery[a.fieldId].checked);
         let aId=this.sourceQuery[a.fieldId].checked.findIndex(item => {
           return item==a.id
         })
@@ -289,18 +289,18 @@ export default {
       this.onChange();
     },
     onTree2(data) {
-      console.log(data,"进来");
+      //console.log(data,"进来");
       for (let i = 0; i < data.length; i++){
         let aId=this.sourceQuery[data[i].fieldId].checked.findIndex(item => {
           return item==data[i].id
         })
-        console.log(aId);
+        //console.log(aId);
         if (aId!=-1) {
           this.sourceQuery[data[i].fieldId].checked.splice(aId, 1)
-          console.log(this.sourceQuery[data[i].fieldId].checked);
+          //console.log(this.sourceQuery[data[i].fieldId].checked);
         }
         if (this.sourceQuery[data[i].fieldId].checked.length>0) {
-          console.log("进来子节点");
+          //console.log("进来子节点");
           if (data[i].children) {
             this.onTree2(data[i].children)
           } 
@@ -308,7 +308,7 @@ export default {
       }
     },
     onTree(data) { 
-      console.log(data);
+      //console.log(data);
       data.forEach(item => {
           this.sourceQuery[item.fieldId].checked.push(item.id)
           if (item.children) {
@@ -319,11 +319,11 @@ export default {
     //勾选后进行筛选
     onChange(id) {
       let field = []
-      console.log(this.sourceQuery);
+      //console.log(this.sourceQuery);
       let k = this.sourceQuery.filter(item => {
         return item.checked.length>0
       })
-      console.log(k,id);
+      //console.log(k,id);
       k.forEach(item => {
         for (let i = 0; i < item.checked.length; i++){
            field.push({
@@ -333,13 +333,13 @@ export default {
         }
        
       })
-      console.log(field);
+      //console.log(field);
       
       this.$emit("onChange",field)
     }, 
     //全选,点击勾选全部的自定义选项并查找相关专利
     handleSelectAll(item) {//全选
-      // console.log(item);
+      // //console.log(item);
       const key = item.id
       let params = {
         // projectId: this.sourceQuery[key].projectId,
@@ -355,7 +355,7 @@ export default {
       this.sourceQuery[key].loading = true
        // 查询源接口(返回的数据是自定义选项)
       this.$api.sourceQueryPatentField(params).then(response => {
-        // console.log(response.data);
+        // //console.log(response.data);
         const records = response.data
         this.sourceQuery[key].checked = records.map(item => item.key)
         this.onChange(key)
@@ -395,7 +395,7 @@ export default {
             datePicker: ['', '']
           })
         }
-        console.log(this.sourceQuery);
+        //console.log(this.sourceQuery);
       })
       this.handleChange([this.form[0].id])
     },
@@ -474,13 +474,13 @@ export default {
     },
     //将自定义字段全部数据给field
     initFieldData(data) {
-      // console.log("initFieldData",data);
+      // //console.log("initFieldData",data);
       this.field = data
       this.form = JSON.parse(JSON.stringify(data))
     },
     // 请求自定义选项列表
     getPatentQueryFieldSource(id, refresh = false) {//(key, refresh = false)
-      // console.log(this.params);
+      // //console.log(this.params);
       // let data = JSON.parse(JSON.stringify(this.params))
       let value = {
         fieldId: id,
@@ -498,14 +498,14 @@ export default {
         refresh: false,
       }
       this.$api.sourceQueryPatentField(value).then(response => {
-        // console.log(response.data);
+        // //console.log(response.data);
         if (response.code == 200) {
-          // console.log("每一项自定义字段数据中的值", response.data);
+          // //console.log("每一项自定义字段数据中的值", response.data);
           // if (response.data.type==1) {
           //   response.data
           // }
           const records = response.data
-          console.log(response.data);
+          //console.log(response.data);
           let temp = this.sourceData[id]
           
           if (!temp || refresh) {
@@ -513,7 +513,7 @@ export default {
           } else {
             temp.push(...records)
           }
-          console.log(temp);
+          //console.log(temp);
         this.sourceQuery[id].isEnd = temp.length >= response.data.length
         this.$set(this.sourceData, id, temp)
         }
@@ -521,7 +521,7 @@ export default {
     },
     // 每一行事件,每点击一次调用一次接口，传入自定义字段id
     handleChange(data) {
-      // console.log("每一项自定义字段数据", this.data);
+      // //console.log("每一项自定义字段数据", this.data);
       const val = data[data.length - 1];
       if (val && this.hasSource.indexOf(val) === -1) {
         this.hasSource.push(val)
@@ -530,7 +530,7 @@ export default {
     },
     // 自定义头部事件(全部/已读/未读)
     handleReadQuery(type) {
-      console.log(type);
+      //console.log(type);
       //all  read   unread
       this.taskStatus = type
       this.returnData.read = type
@@ -557,14 +557,14 @@ export default {
       }
       if(this.taskId){
         a.taskId = this.taskId
-        console.log(this.taskId);
+        //console.log(this.taskId);
         this.$api.taskReTaskStateCount(a).then(res => {
-          console.log(res);
+          //console.log(res);
           this.readList=res.data
         })
       }else {
         this.$api.ReStateCount(a).then(res => {
-          console.log(res);
+          //console.log(res);
           this.readList=res.data
         })
       }

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

@@ -86,7 +86,6 @@ export default {
   methods: {
     //排序
     sortChange({ column, prop, order }) {
-      console.log(order)
       if (!order) {
         return false
       }
@@ -109,7 +108,6 @@ export default {
       this.$api.getSureCompareFile(this.queryParams).then(res => {
         // console.log(res);
         if (res.code == 200) {
-          console.log(res.data.records);
           this.queryParams.total =  res.data.total
           this.tableData = res.data.records
           this.loading=false

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

@@ -188,7 +188,6 @@ export default {
           this.$message.error('请选择文件')
           return false
         }
-        console.log(this.ruleForm)
         let formData = new FormData()
   
         // formData.append('reportId', this.reportId)

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

@@ -154,7 +154,6 @@
   computed:{
     reportType(){
       var a = this.$store.state.dictMessage.dictMessage.TASK_TYPE
-      console.log(a);
       var b = {}
       if(a){
          a.forEach(item => {
@@ -172,7 +171,6 @@
   methods: {
 	  //查询任务
     getList() {
-      console.log(this.queryParams);
       this.loading=true
       this.$api.ReviewTheTasks(this.queryParams).then(response => {
 

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

@@ -72,7 +72,6 @@ export default {
         }
     },
     mounted() {
-        console.log(this.row)
         this.changePageTitle()
     },
     methods: {

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

@@ -57,7 +57,6 @@ import ProductContrast from './tortPage/ProductContrast.vue'
         this.personId = this.$route.query.personId
         this.type = this.$route.query.type
         this.reportMessage = this.$s.getSession('reportMessage1')
-        console.log("@@@",this.$s.getSession('reportMessage1'))
     },
     watch:{
         active(val) {

RMS-FrontEnd/src/views/task/MyHandle.vue

@@ -77,17 +77,22 @@
 			  <!-- <el-table-column prop="remark" label="理由" sortable  align="center" v-if="queryParams.taskStatus == 1"></el-table-column> -->
 			  <el-table-column prop="operation" label="操作" align="center" fixed="right" v-if="queryParams.taskStatus == 0" width="180px" >
 				  <template slot-scope="scope">	
-						  <el-button size="mini" @click="handleEdit(scope.row)">处理</el-button>
-            <el-popconfirm 
-              style="margin-left: 10px;"
-              v-if="scope.row.type!=0"
-                  title="这一条任务确定完成吗？" 
-                  confirm-button-text='确定'
-                  cancel-button-text='取消'
-                  @confirm="handleFinsh(scope.row)">
-                  <!--  @click="handleFinsh(scope.row)" -->
-              <el-button size="mini" slot="reference"  type="primary">确认完成</el-button>
-            </el-popconfirm>
+					<div class="caozuo" >
+						 <span><el-button size="mini" @click="handleEdit(scope.row)">处理</el-button></span> 
+						 <span v-if="scope.row.type!=1">
+							 <el-popconfirm 
+								style="margin-left: 10px;"
+									title="这一条任务确定完成吗？" 
+									confirm-button-text='确定'
+									cancel-button-text='取消'
+									@confirm="handleFinsh(scope.row)">
+									<!--  @click="handleFinsh(scope.row)" -->
+								<el-button size="mini" slot="reference"  type="primary">确认完成</el-button>
+								</el-popconfirm>
+						 </span>
+					</div>
+						
+           
 				  </template>
 			  </el-table-column>
 		  </el-table>
@@ -330,12 +335,11 @@
           var aendTime = Date.parse(row.endTime)
           
         if (aendTime < bendTime) {
-          console.log(aendTime, bendTime, row.endTime);
             return 'red'
           }
         // }
         // if (aendTime < bendTime) {
-        //       console.log("超时",aendTime,bendTime);
+        //       //console.log("超时",aendTime,bendTime);
         //       return 'red'
         // } 
       }
@@ -364,7 +368,7 @@
       }
     },
     handleFinsh(row) {
-      console.log(row);
+      //console.log(row);
       this.$api.taskFinish({ id: row.id }).then((res) => {
         if (row.type==1) {
           this.$message.success("任务完成，已成功发送邮件")
@@ -380,13 +384,13 @@
         reportId:row.reportId
       }
       this.$api.QueryReport(queryParams).then(response=>{
-        console.log(response)
+        //console.log(response)
         this.showDialog=true
         this.form = response.data[0]
       })
     },
     coordinationTask(row) {
-      console.log(row);
+      //console.log(row);
       if (row.reportType == 4) {
         let queryParams = {
           taskId: row.id,
@@ -399,7 +403,7 @@
           filedOptions: [],
         }
         this.$api.reTaskPatents(queryParams).then(res => {
-          console.log(res);
+          //console.log(res);
           if (res.code == 200) {
             var b = {
                 taskId:row.id,
@@ -440,9 +444,9 @@
     },
     contrastTask(row) {
 		// this.$store.commit('SET_ADMIN_SIGNPATENTNO',row.signPatentNo)
-		// console.log(row.signPatentNo,this.$store.state.admin)
+		// //console.log(row.signPatentNo,this.$store.state.admin)
 		// localStorage.signPatentNo = row.signPatentNo
-    // console.log(row);
+    // //console.log(row);
       let a=this.$router.resolve({
         path: '/Incomplete',
         query: {
@@ -464,9 +468,9 @@
 			result: this.btn.value,
 			reportStatus:this.btn.value
       }
-    console.log(a);
+    //console.log(a);
       this.$api.AuditTask(a).then(response => {
-      console.log(response);
+      //console.log(response);
 			if(response.code == 200){
 				// this.$message.success('审核通过')
 				this.showDialog = false
@@ -492,4 +496,13 @@
 .red{
     background: #f4b8ae !important;
   }
+  .caozuo .el-button--mini{
+		margin: 0;
+	}
+  </style>
+  <style lang="scss" scoped>
+	.caozuo{
+		display: flex;
+	}
+	
   </style>

RMS-FrontEnd/src/views/task/MyInitiate.vue

@@ -117,7 +117,7 @@ export default {
          this.changeEndTime = Date.parse(new Date)
       }
       let b = Date.parse(value)
-      console.log(this.changeEndTime,b);
+      //console.log(this.changeEndTime,b);
       if (value) {
         if (b<this.changeEndTime) {
           callback(new Error('禁止选择现在及以前时间，请重新选择'))
@@ -175,7 +175,7 @@ export default {
      //获取全部人员
      getAllPersonnelList(){
       this.$api.getAllPersonnel().then(response=>{
-        // console.log(response)
+        // //console.log(response)
         this.personnelList = response.data
       })
     },
@@ -195,13 +195,13 @@ export default {
     },
     //编辑报告
     edit(row) {
-      console.log(row,11);
+      //console.log(row,11);
       this.showDialog=true
       this.form =JSON.parse(JSON.stringify(row))
     },
     // 查看(确认)结果
     taskWorkRemakBtn(ev,row) {
-      console.log(ev, row);
+      //console.log(ev, row);
       if (ev == 1) {
         if (row.reportType==4) {
           let queryParams = {
@@ -215,7 +215,7 @@ export default {
             filedOptions: [],
           }
           this.$api.reTaskPatents(queryParams).then(res => {
-          console.log(res);
+          //console.log(res);
           if (res.code == 200) {
             var b = {
                 taskId:row.id,

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

@@ -150,27 +150,27 @@ export default {
     this.taskWorkRemak = this.$route.query.taskWorkRemak
     if (this.taskWorkRemak==0) {
       this.taskWorkRemakShow = false
-      console.log(this.taskWorkRemakShow);
+      //console.log(this.taskWorkRemakShow);
     }
-    console.log(this.queryParams,this.reportId,this.coordination,this.reportType,);
+    //console.log(this.queryParams,this.reportId,this.coordination,this.reportType,);
   },
   mounted() {
-    console.log(this.coordination);
+    //console.log(this.coordination);
   },
   methods: {
     getList() { },
     // customFields子页面
     onChanges(val) {
-      console.log(val);
+      //console.log(val);
       this.onChangesIn = val
-      console.log(this.onChangesIn);
+      //console.log(this.onChangesIn);
     },
     //(全、未、已完成标识)
     onTaskStatus(val) {
       this.taskStatus=val
     },
     handleNodeClick(treeData) {
-        console.log(treeData);
+        //console.log(treeData);
     },
     close() {
       this.visible = false

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

@@ -75,7 +75,6 @@ export default {
     getList() {
       this.loading=true
       this.$api.reTaskPatents(this.queryParams).then(res => {
-        console.log(res);
         if (res.code == 200) {
           this.queryParams.total=res.data.total
           this.tableData = res.data.records
@@ -90,7 +89,6 @@ export default {
       this.getList()
     },
     onChangesIn(val) {
-      console.log(val);
       this.queryParams.filedOptions = val
       this.getList()
     },

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

@@ -153,7 +153,6 @@ export default {
       // console.log(item);
       let sourceQueryName = this.sourceQuery[item.id].name
       this.$api.getPatentField({ filedId: item.id, name: sourceQueryName }).then(res => {
-        console.log("查询成功", res);
         res.data.map(item => {
           item.label = item.name
           item.key = item.id
@@ -161,24 +160,17 @@ export default {
         })
         // this.sourceData[item.id] = res.data
         this.$set(this.sourceData,item.id,res.data)
-        console.log(this.sourceData,item.id,res.data);
       })
       
       // this.getPatentQueryFieldSource(item.id)
     },
-    //勾选框
-    // onChanges(key) {
-    //   console.log(id);
-    // },
+    
     onChange(id) {
       let field = []
-      // for (let name in this.sourceQuery) {
-      //     console.log(this.sourceQuery[name]);
-      console.log(this.sourceQuery);
+     
       let k = this.sourceQuery.filter(item => {
         return item.checked.length>0
       })
-      console.log(k);
       k.forEach(item => {
         for (let i = 0; i < item.checked.length; i++){
            field.push({
@@ -201,7 +193,6 @@ export default {
       //     })
       //   // }
       // // }
-      console.log(field);
       this.$emit("onChange",field)
       // 左侧字段勾选调用
       // this.$api.PatentQueryFieldSourceVO(params).then(res => {
@@ -215,7 +206,6 @@ export default {
     }, 
     //全选,点击勾选全部的自定义选项并查找相关专利
     handleSelectAll(item) {//全选
-      console.log(item);
       const key = item.id
       let params = {
         // projectId: this.sourceQuery[key].projectId,
@@ -230,7 +220,6 @@ export default {
       this.sourceQuery[key].loading = true
        // 查询源接口(返回的数据是自定义选项)
       this.$api.sourceQueryPatentField(params).then(response => {
-        console.log(response.data);
         const records = response.data
         this.sourceQuery[key].checked = records.map(item => item.key)
         this.onChange(key)
@@ -313,7 +302,6 @@ export default {
     },
     //将自定义字段全部数据给field
     initFieldData(data) {
-      console.log("initFieldData",data);
       this.field = data
       this.form = JSON.parse(JSON.stringify(data))
     },
@@ -336,12 +324,9 @@ export default {
         refresh: false,
       }
       this.$api.sourceQueryPatentField(value).then(response => {
-        console.log(response.data);
         if (response.code == 200) {
-          console.log("每一项自定义字段数据中的值", response.data);
           
           const records = response.data
-          console.log(records);
           let temp = this.sourceData[id]
           if (!temp || refresh) {
             temp = records
@@ -362,7 +347,6 @@ export default {
     },
     // 每一行事件,每点击一次调用一次接口，传入自定义字段id
     handleChange(data) {
-      console.log("每一项自定义字段数据", data);
       const val = data[data.length - 1];
       if (val && this.hasSource.indexOf(val) === -1) {
         this.hasSource.push(val)

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

@@ -3,7 +3,7 @@ export const Contrast = {
         toContrast(row,index){
           var location = (index + 1) + ((this.queryParams.current - 1) * this.queryParams.size)
         if (this.reportType != 3 && this.reportType!=4) {
-            console.log("不是",this.reportType);
+            //console.log("不是",this.reportType);
             var router = this.$router.resolve({
                 path: '/ContrastIndex/' + row.id,
                 query: {
@@ -16,9 +16,9 @@ export const Contrast = {
             this.$s.setSession('params', this.queryParams)
             window.open(router.href, '_blank');
         } else {
-          console.log("是", this.reportType, row, this.reportId,this.taskWorkRemak,this.coordination);
+          //console.log("是", this.reportType, row, this.reportId,this.taskWorkRemak,this.coordination);
           if (this.taskWorkRemak == 0 && this.type == 1) {
-            console.log(this.taskWorkRemak,this.type);
+            //console.log(this.taskWorkRemak,this.type);
             var router = this.$router.resolve({
               path: '/FTOContrast/' + row.id,
               query: {
@@ -34,7 +34,7 @@ export const Contrast = {
             window.open(router.href, '_blank');
           }
           // else if (this.coordination) {
-          //   console.log(row.id);
+          //   //console.log(row.id);
           //   var router = this.$router.resolve({
           //     path: '/FTOContrasts/' + row.id,
           //     query: {

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

@@ -37,7 +37,7 @@ export default {
   },
   methods: {
     handleClick(tab) {
-      console.log(tab)
+      // console.log(tab)
     }
   },
 }