去除不需要的代码

RMS-FrontEnd/src/api/patent.js

@@ -8,15 +8,7 @@ export default{
     return axios.get('/v2/patent/family/list', { params })
   },
 
-  //查看某一件专利状态
-  getPatentStatus(params){
-    return axios.get('/report/api/task/look', { params })
-  },
-
-  //更新某一件专利状态
-  updatePatentStatus(params){
-    return axios.get('/report/api/task/read', { params })
-  },
+ 
 
    /**
    * 专利关键词高亮模板

RMS-FrontEnd/src/api/report.js

@@ -12,7 +12,15 @@ export default {
     //   params: params
     // })
   },
+ //查看某一件专利状态
+ getPatentStatus(params){
+  return axios.get('/report/api/task/look', { params })
+},
 
+//更新某一件专利状态
+updatePatentStatus(params){
+  return axios.get('/report/api/task/read', { params })
+},
   /** 
    * 创建报告
   */

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

@@ -137,642 +137,6 @@ export const commonMixins = {
   }
 }
 
-export const addContrast1 = {
-    props:['isTrue','type1','reportType'],
-  data() {
-    return {
-      isFirst:true,
-      StartText:'',
-      isSelecting:false,
-      mX :0,
-      mY:0,
-      currentColor:"#dff209",
-      isMarking: false,
-      dt:null,
-      anchorOffset:0,
-      selectString:'',
-      currentSelectObj:{},
-      selectMarkObjectId:null,
-      add:this.isTrue
-    }
-  },
-  mounted() {
-    document.onselectionchange = () => {
-      this.isSelecting=true;
-    };
-  },
-  watch:{
-    isTrue(val){
-        this.add = val
-    }
-  },
-  methods:{
-    mousemove(e){
-      this.mX = e.pageX;
-      this.mY = e.pageY;
-  },
-
-  mouseup(){
-    this.$emit('isTrues',false)
-    // 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();
-          this.anchorOffset =0;
-          let temSelectObj = this.getSelectobj(selectObj);
-          var tempdt = this.getColumnName(selectObj.anchorNode);
-          if(tempdt != undefined && selectObj.toString()!=''){
-              this.currentSelectObj = temSelectObj;
-              this.currentSelectObj.color = this.currentColor;
-              this.currentSelectObj.Type = 0;
-              this.currentSelectObj.patentNo = this.patent.patentNo
-              // this.showPizhu();
-
-              this.isMarking = true;
-              
-          }
-          else{
-            this.currentSelectObj = {};
-          }
-          
-        //   console.log(this.currentSelectObj)
-          if(this.currentSelectObj.Id){
-            this.$emit('openContrast',this.currentSelectObj)
-          }
-          if(this.add){
-            this.gaoliang()
-            
-          }
-        
-      }
-    }
-   
-  },
-
- showPizhu(){
-      let dl =document.getElementsByClassName("dialog");
-      if((document.body.clientWidth - this.mX - 320) <0){
-        this.mX = document.body.clientWidth -320;
-      }
-
-      if((document.body.clientHeight - this.mY - 40)<0){
-        this.mY = document.body.clientHeight - 40;
-      }
-              
-      dl[0].setAttribute("style", "opacity:0.95;box-shadow: 10px 10px 5px #888888;display:block;position:absolute;left:" + this.mX.toString() +"px;top:" + this.mY.toString() +"px;background-color: #CCFF99;border-radius: 15px 15px;height:30px;");
-              
-  },
-
-   hiddenPizhu(){
-      let dl =document.getElementsByClassName("dialog");
-              
-      dl[0].setAttribute("style", "display:none;");
-        
-  },
-
-  getSelectobj(selectObj){
-      var temNode = selectObj.anchorNode;
-    //   console.log(temNode)
-      var a = temNode.parentElement
-      NotIncludeDataType(a)
-        function NotIncludeDataType(node){
- 
-        // console.log('11',node.getAttribute("data-type"))
-        if (node.getAttribute("data-type") != null) {
-          //       console.log(temNode)
-          // return temNode
-          temNode = node
-        } else {
-       
-          NotIncludeDataType(node.parentElement);
-        }
-
-    
-      }
-      //取得选择的栏位节点
-      
-          // do{
-          //     temNode = temNode.parentNode;
-          // }
-          // while(this.NotIncludeDataType(temNode));
-     
-      let index =0;
-      this.getColumn(temNode,selectObj);
-      this.isFirst = true
-      return {"Id":this.uuid(),"column":temNode.getAttribute("data-type"),"index":this.anchorOffset,"text":selectObj.toString(),'temNode':temNode};
-
-  },
-
-  NotIncludeDataType(temNode){
- 
-    // console.log('11',temNode.getAttribute("data-type"))
-    if (temNode.getAttribute("data-type") != null) {
-      			// console.log(temNode)
-      return temNode
-    } else {
-   
-      this.NotIncludeDataType(temNode.parentElement);
-    }
-    // console.log(temNode.nodeType)
-    //   if(temNode.nodeType ==3){
-    //       return true;
-    //   }
-    //   else{
-    //       // console.log(temNode.hasOwnProperty('getAttribute'))
-    //       // if(temNode.hasOwnProperty('getAttribute')){
-    //       //     return true
-    //       // }
-    //       return temNode.hasOwnProperty('getAttribute');
-    //   }
-
-  },
-
-  uuid() {
-      var s = [];
-      var hexDigits = "0123456789abcdef";
-      for (var i = 0; i < 36; i++) {
-          s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-      }
-      s[14] = "4";  // bits 12-15 of the time_hi_and_version field to 0010
-      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
-      s[8] = s[13] = s[18] = s[23] = "-";
-  
-      var uuid = s.join("");
-      return uuid;
-  },
-
-  getColumn(node,selectObj){
-    if(this.isFirst){
-      this.StartText = node
-      
-      // console.log(node.innerHTML)
-    }
-      // console.log(node,selectObj.anchorNode.data);
-      if(node != selectObj.anchorNode){
-        this.isFirst = false
-          if(node.nodeValue != null ){
-            this.anchorOffset += node.nodeValue.trim().length;
-          }
-
-          let iIndex =0;
-          while(iIndex<node.childNodes.length){
-              if(this.getColumn(node.childNodes[iIndex],selectObj)){
-                  return true;
-              }
-              iIndex +=1;
-          }
-          // console.log("anchorOffset1",this.anchorOffset)
-          return false;
-      }
-      else{
-        if(selectObj.anchorNode.nodeValue!=null){
-          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)
-            if(this.StartText.getAttribute("data-type").indexOf('权利要求')!=-1){
-              if( this.StartText.innerHTML.indexOf('\n')==0){
-                  var num = Number(this.anchorOffset + selectObj.anchorOffset) - 1
-              }else{
-                var num = Number(this.anchorOffset + selectObj.anchorOffset)
-              }
-            }else{
-              var len = str.match(/\n/g)?Number(str.match(/\n/g).length):0
-              var num = len + Number(this.anchorOffset + selectObj.anchorOffset)
-            }
-            
-           
-            // if(this.anchorOffset != 0){
-            //   num += 1
-            // }
-            this.anchorOffset = num
-          }else{
-            var str = a.substring(0,this.anchorOffset + selectObj.extentOffset)
-            if(this.StartText.getAttribute("data-type").indexOf('权利要求')!=-1){
-              if( this.StartText.innerHTML.indexOf('\n')==0){
-                  var num = Number(this.anchorOffset + selectObj.extentOffset) - 1
-              }else{
-                var num = Number(this.anchorOffset + selectObj.extentOffset)
-              }
-            }else{
-              var len = str.match(/\n/g)?Number(str.match(/\n/g).length):0
-              var num = len + Number(this.anchorOffset + selectObj.extentOffset)
-            }
-
-            // if(this.anchorOffset != 0){
-            //   num += 1
-            // }else{
-            //   num -= 1
-            // }
-            this.anchorOffset = num
-          }
-           this.StartText  = ''
-        }
-        // console.log("anchorOffset2",this.anchorOffset,selectObj)
-          return true;
-      }
-  },
-
-  setColor(color){
-    this.currentSelectObj.color = color;
-    this.currentColor = color;
-      let dropbtn = document.getElementsByClassName("dropbtn");
-      dropbtn[0].style.backgroundColor = color;
-      
-  },
-
-  xiahuaxian(){
-
-      if(this.currentSelectObj.Id != undefined){
-        this.currentSelectObj.Type = 1;
-        this.hiddenPizhu();
-        this.AddClass(this.currentSelectObj);
-        this.isMarking = false;
-
-          //保存到数据库
-      }
-  },
-
-   gaoliang(){
-      if(this.currentSelectObj.Id != undefined){
-        this.currentSelectObj.Type = 2;
-        // this.hiddenPizhu();
-
-        this.AddClass(this.currentSelectObj);
-        this.isMarking = false;
-
-          //保存到数据库
-      }
-  },
-
-  pizhu(){
-      if(this.currentSelectObj.Id != undefined){
-        this.currentSelectObj.Type = 2;
-        this.hiddenPizhu();
-
-        this.AddClass(this.currentSelectObj);
-        this.isMarking = false;
-
-          //保存到数据库
-      }
-  },
-
-  delMark(){
-      if(this.selectMarkObjectId != undefined){
-          let markTag = document.getElementById(this.selectMarkObjectId);
-
-          while(markTag !=undefined){
-              if(markTag != undefined){
-                  markTag.parentElement.innerHTML = markTag.parentElement.innerHTML.replace(markTag.outerHTML,markTag.innerHTML);
-              }
-
-              markTag = document.getElementById(this.selectMarkObjectId);
-          }
-      }
-
-      //从数据库中删除
-
-      this.hiddenPizhu();
-  },
-
-  getColumnName(el){
-      let root = el;
-
-      if(el == undefined){
-          return undefined;
-      }
-
-      if(!(el instanceof HTMLElement)){
-          root = el.parentElement;
-      }
-      
-
-      let dt = root.getAttribute("data-Type");
-
-      if (dt != undefined){
-          return root;
-      }
-      
-      return dt = this.getColumnName(root.parentElement);
-
-  },
-
-  SplitHtmlTag(el){
-      let temInnerHtml = el.innerHTML.trim();
-      let pattern = /<[^>]+>/g;
-      let Indexs =[];
-      let i=0
-      var match = null
-      while((match = pattern.exec(temInnerHtml)) != null){
-          Indexs[i] = match;
-        //   console.log(match);
-          //Indexs[i] =[ match.index,m.value];
-          i++;
-      }
-      //var m = temInnerHtml.match(pattern);
-      var splitStrings = new Array();
-      i=0;
-      var currentIndex =0;
-      for(var index=0;index<Indexs.length;index++){
-          if(Indexs[index].index >currentIndex){
-              splitStrings[i] = {"text":  temInnerHtml.substring(currentIndex,Indexs[index].index), "type":"text"};
-              i++;
-              splitStrings[i] = {"text":  Indexs[index][0], "type":"tag"};
-              i++;
-          }
-          else
-          {
-              splitStrings[i] = {"text":  Indexs[index][0], "type":"tag"};;
-              i++;
-          }
-
-          currentIndex = Indexs[index].index + Indexs[index][0].length;
-
-      }
-
-      if(currentIndex< temInnerHtml.length){
-          splitStrings[i] = {"text": temInnerHtml.substring(currentIndex,temInnerHtml.length), "type":"text"};
-      }
-
-      return splitStrings;
-
-  },
-
- selectMark(Id){
-    // console.log(Id)
-  this.selectMarkObjectId = Id;
-//   this.showPizhu();
-  },
-
-  AddClass(selectObject){
-    // console.log(selectObject)
-
-    //   let el = this.getColumnNode(selectObject.column);
-      let el = selectObject.temNode;
-        let splitStrings = this.SplitHtmlTag(el);
-// console.log(splitStrings)
-      let bgColor = selectObject.color;
-      let startTag ='<span onclick="selectMark(\'' + selectObject.Id + '\')" id="' + selectObject.Id +'" style="background-color:' + selectObject.color + '">';
-      if(selectObject.Type ==1){
-          startTag ='<span onclick="selectMark(\'' + selectObject.Id + '\')" id="' + selectObject.Id +'" style="border-bottom:2px solid ' + selectObject.color + '">';
-      }
-      let imgTag = '<span Id="' + selectObject.Id + '"><i class="el-icon-location-outline"></i></span>';
-      let endTag ='</span>';
-      let elText = '';
-
-      splitStrings.forEach(function (item){
-          if(item.type =='text'){
-              elText = elText + item.text;
-          }
-      });
-
-      let pattern = new RegExp(selectObject.text.replace(/[\r\n]/g,"").replace(/\ +/g,""),"g");
-
-      let Indexs =[];
-      let i=0
-
-      if(selectObject.index <0){
-          while((match = pattern.exec(elText)) != null){
-              Indexs[i] = match;
-            //   console.log(match);
-              //Indexs[i] =[ match.index,m.value];
-              i++;
-          }
-      }
-      else
-      {
-          Indexs[i] = [selectObject.text];
-          Indexs[i].index =selectObject.index;
-      }
-      Indexs.forEach(function (match){
-        let currentIndex =0;
-        let temSplitStrings = new Array();
-        
-        splitStrings.forEach(function (item){
-            if(item.type =='text'){
-                if(match.index >= currentIndex && match.index < (currentIndex + item.text.length)){
-                    if((match.index + match[0].length) <= (currentIndex + item.text.length)){
-                        if(match.index > currentIndex){
-                            temSplitStrings.push({text:item.text.substring(0,match.index-currentIndex),type:'text'});
-                        }
-                        // console.log(1)
-                        temSplitStrings.push({text:startTag,type:'tag'});
-                        temSplitStrings.push({text:match[0],type:'text'});
-                        if(selectObject.Type ==2){
-                        //   console.log(12)
-                          temSplitStrings.push({text:imgTag,type:'tag'});
-                      }
-                        temSplitStrings.push({text:endTag,type:'tag'});
-                        
-                        if((match.index + match[0].length) < (currentIndex + item.text.length)){
-                            temSplitStrings.push({text:item.text.substring((match.index + match[0].length)-currentIndex),type:'text'}); 
-                        }
-                    }
-                    else
-                    {
-                        // console.log(2)
-                        if(match.index > currentIndex){
-                            temSplitStrings.push({text:item.text.substring(0,match.index-currentIndex),type:'text'});
-                        }
-                        if(temSplitStrings.length>1){
-                            // console.log(temSplitStrings[temSplitStrings.length-2].text.substr(1,1))
-                            if(temSplitStrings[temSplitStrings.length-2].text.substr(1,1)!='/'){
-                                let index = temSplitStrings[temSplitStrings.length-2].text.indexOf('background-color:')
-                                let colorStr = temSplitStrings[temSplitStrings.length-2].text.substr(index+17,7)
-                                let index2 = startTag.indexOf('background-color:')
-                                let colorStr2 = startTag.substr(index2+17,7)
-                            let acolor = colourBlend(colorStr,colorStr2,0.5)
-                            let startTag2 = "<span style='background-color:"+acolor+"'>"
-                            temSplitStrings.push({text:startTag2,type:'tag'});  
-                            }else{
-                                temSplitStrings.push({text:startTag,type:'tag'});
-                            }
-                            
-                        }else{
-                            temSplitStrings.push({text:startTag,type:'tag'});
-                        }
-                       
-                        temSplitStrings.push({text:item.text.substring(match.index-currentIndex),type:'text'});     
-                        temSplitStrings.push({text:endTag,type:'tag'});
-                    }
-                    
-                }
-                else
-                {
-                   
-                    if((match.index + match[0].length) <= (currentIndex + item.text.length) && (match.index + match[0].length)>currentIndex){
-                        // console.log( temSplitStrings[temSplitStrings.length-1])
-                        if(temSplitStrings[temSplitStrings.length-1].text.substr(1,1)!='/'){
-                             let index = temSplitStrings[temSplitStrings.length-1].text.indexOf('background-color:')
-                             let colorStr = temSplitStrings[temSplitStrings.length-1].text.substr(index+17,7)
-                             let index2 = startTag.indexOf('background-color:')
-                             let colorStr2 = startTag.substr(index2+17,7)
-                             let acolor = colourBlend(colorStr,colorStr2,0.5)
-                             let startTag2 = "<span style='background-color:"+acolor+"'>"
-                        temSplitStrings.push({text:startTag2,type:'tag'});
-                        }else{
-                            temSplitStrings.push({text:startTag,type:'tag'});
-                        }
-                       
-                        temSplitStrings.push({text:item.text.substring(0,match.index + match[0].length-currentIndex),type:'text'});
-                        if(selectObject.Type ==2){
-                          temSplitStrings.push({text:imgTag,type:'tag'});
-                      }
-                        temSplitStrings.push({text:endTag,type:'tag'});
-                        // console.log(3)
-                        if((match.index + match[0].length) < (currentIndex + item.text.length)){
-                            temSplitStrings.push({text:item.text.substring((match.index + match[0].length-currentIndex)),type:'text'}); 
-                        }
-                    }
-                    else
-                    {
-                        if(match.index < currentIndex && (match.index + match[0].length) >= (currentIndex + item.text.length)){
-                            // console.log(4)
-                            temSplitStrings.push({text:startTag,type:'tag'});
-                            temSplitStrings.push(item);
-                            temSplitStrings.push({text:endTag,type:'tag'});
-                        }
-                        else
-                        {
-                            // console.log(5)
-                            temSplitStrings.push(item);
-                        }
-                        
-                    }
-                    
-                }
-
-                currentIndex = currentIndex + item.text.length;
-            }
-            else
-            {
-                temSplitStrings.push(item);
-            }
-        });
-        
-        splitStrings = temSplitStrings;
-    });
-      // Indexs.forEach(function (match){
-      //     let currentIndex =0;
-      //     var temSplitStrings = new Array();
-          
-      //     splitStrings.forEach(function (item){
-      //         if(item.type =='text'){
-      //             if(match.index >= currentIndex && match.index < (currentIndex + item.text.length)){
-      //                 if((match.index + match[0].length) <= (currentIndex + item.text.length)){
-      //                     if(match.index > currentIndex){
-      //                         temSplitStrings.push({text:item.text.substring(0,match.index-currentIndex),type:'text'});
-      //                     }
-
-      //                     temSplitStrings.push({text:startTag,type:'tag'});
-      //                     temSplitStrings.push({text:match[0],type:'text'});
-      //                     if(selectObject.Type ==2){
-      //                         temSplitStrings.push({text:imgTag,type:'tag'});
-      //                     }
-      //                     temSplitStrings.push({text:endTag,type:'tag'});
-                          
-      //                     if((match.index + match[0].length) < (currentIndex + item.text.length)){
-      //                         temSplitStrings.push({text:item.text.substring((match.index + match[0].length)-currentIndex),type:'text'}); 
-      //                     }
-      //                 }
-      //                 else
-      //                 {
-      //                     if(match.index > currentIndex){
-      //                         temSplitStrings.push({text:item.text.substring(0,match.index-currentIndex),type:'text'});
-      //                     }
-
-      //                     temSplitStrings.push({text:startTag,type:'tag'});
-      //                     temSplitStrings.push({text:item.text.substring(match.index-currentIndex),type:'text'});     
-      //                     temSplitStrings.push({text:endTag,type:'tag'});
-      //                 }
-                      
-      //             }
-      //             else
-      //             {
-      //                 if((match.index + match[0].length) <= (currentIndex + item.text.length) && (match.index + match[0].length)>currentIndex){
-      //                     temSplitStrings.push({text:startTag,type:'tag'});
-      //                     temSplitStrings.push({text:item.text.substring(0,match.index + match[0].length-currentIndex),type:'text'});
-      //                     if(selectObject.Type ==2){
-      //                         temSplitStrings.push({text:imgTag,type:'tag'});
-      //                     }
-      //                     temSplitStrings.push({text:endTag,type:'tag'});
-
-      //                     if((match.index + match[0].length) < (currentIndex + item.text.length)){
-      //                         temSplitStrings.push({text:item.text.substring((match.index + match[0].length-currentIndex)),type:'text'}); 
-      //                     }
-      //                 }
-      //                 else
-      //                 {
-      //                     if(match.index < currentIndex && (match.index + match[0].length) >= (currentIndex + item.text.length)){
-      //                         temSplitStrings.push({text:startTag,type:'tag'});
-      //                         temSplitStrings.push(item);
-      //                         temSplitStrings.push({text:endTag,type:'tag'});
-      //                     }
-      //                     else
-      //                     {
-      //                         temSplitStrings.push(item);
-      //                     }
-                          
-      //                 }
-                      
-      //             }
-
-      //             currentIndex = currentIndex + item.text.length;
-      //         }
-      //         else
-      //         {
-      //             temSplitStrings.push(item);
-      //         }
-      //     });
-          
-      //     splitStrings = temSplitStrings;
-      // });
-
-      let temInnerHtml = '';
-      splitStrings.forEach(function (item){
-          temInnerHtml = temInnerHtml + item.text;
-      });
-// console.log(temInnerHtml)
-
-      el.innerHTML = temInnerHtml;
-  
-},
-   getColumnNode(dataType){
-    // console.log(dataType)
-      let ret = document.querySelector('[data-Type*="' + dataType +'"]');
-    //   console.log('ret:',ret)
-      return ret;
-      
-  },
-
-   rdmRgbColor() {
-      //随机生成RGB颜色
-      const arr = [];
-      for (let i = 0; i < 3; i++) {
-          // 暖色
-          // arr.push(Math.floor(Math.random() * 128 + 64));
-          // 亮色
-          arr.push(Math.floor(Math.random() * 128 + 128));
-      }
-      const [r, g, b] = arr;
-      // rgb颜色
-      // var color=`rgb(${r},${g},${b})`;
-      // 16进制颜色
-      const color = `#${
-          r.toString(16).length > 1 ? r.toString(16) : "0" + r.toString(16)
-      }${g.toString(16).length > 1 ? g.toString(16) : "0" + g.toString(16)}${
-          b.toString(16).length > 1 ? b.toString(16) : "0" + b.toString(16)
-      }`;
-      return color;
-  },
-
-
-   
-  }
-}
-
 export const addContrast = {
   props:['reportId','activeName','evidenceFlieId','signPatentNo','reportType','taskId','type'],
   data() {

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

@@ -401,52 +401,6 @@ export const patentKeywordsHighlight = {
         });
       
       }
-      // return
-      // if (this.piZhuContrastList.length > 0) {
-      //   for (let i = 0; i < this.piZhuContrastList.length; i++) {
-      //     if (this.piZhuContrastList[i].patentNo == this.patent.publicNo) {
-      //       if (this.piZhuContrastList[i].scratchField.indexOf(field) != -1) {
-      //         // if(this.piZhuContrastList[i].id==401){
-      //         //   this.piZhuContrastList[i].position = 69
-      //         // }
-      //         var a = {
-      //           color: this.piZhuContrastList[i].color,
-      //           Type: this.piZhuContrastList[i].scratchType,
-      //           Id: this.piZhuContrastList[i].id,
-      //           column: this.piZhuContrastList[i].scratchField,
-      //           index: Number(this.piZhuContrastList[i].position),
-      //           text: this.piZhuContrastList[i].text,
-      //           remark: this.piZhuContrastList[i].remark,
-      //           temNode: text,
-      //           selectType:0,//标识为0是批注
-      //         }
-      //         text = this.AddClass1(a);
-      //       }
-      //     }
-      //   }
-      // }
-      // if (this.contrastList.length > 0) {
-      //   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) {
-      //         // if(this.contrastList[i].id==261){
-      //         //   this.contrastList[i].position = 9
-      //         // }
-      //         var a = {
-      //           color: this.contrastList[i].color,
-      //           Type: 1,//1是默认高亮
-      //           Id: this.contrastList[i].id,
-      //           column: this.contrastList[i].fields,
-      //           index: Number(this.contrastList[i].position),
-      //           text:this.contrastList[i].content,
-      //           temNode: text,
-      //           selectType:1,//标识为1是对比
-      //         }
-      //         text = this.AddClass1(a);
-      //       }
-      //     }
-      //   }
-      // }
       if (!this.highlight.enable || !text) {
         return text
       }

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

@@ -3,7 +3,7 @@ import { cron } from "@/views/components/common/components/mixins";
 import { mapGetters } from "vuex";
 export const common = {
     mixins:[cron],
-    props: ['form','reportId','tableHeight','review','webSockets','productId'],
+    props: ['form','reportId','tableHeight','review','productId'],
     data() {
         return {
             // statusObj: {

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

@@ -118,14 +118,8 @@ export default {
     };
   },
   watch: {
-    // webSockets(val){
-    //   this.initTask2()
-    // }
   },
   computed: {
-    // webSocket1(){
-    //   return this.webSockets
-    // }
   },
   created() {},
   mounted() {

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

@@ -3,10 +3,10 @@
         <div class="header-tabs">
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
             <el-tab-pane label="实时进度" name="0"> 
-              <component :is='components' v-bind="$attrs" v-if="activeName == 0" :review="review" :tableHeight="height" :webSockets="webSocket"></component>
+              <component :is='components' v-bind="$attrs" v-if="activeName == 0" :review="review" :tableHeight="height"></component>
             </el-tab-pane>
             <el-tab-pane label="任务列表" name="1">
-              <component :is='components' v-bind="$attrs" v-if="activeName == 1" :review="review" :tableHeight="height" :webSockets="webSocket"></component>
+              <component :is='components' v-bind="$attrs" v-if="activeName == 1" :review="review" :tableHeight="height"></component>
             </el-tab-pane>
           </el-tabs>
           
@@ -30,7 +30,6 @@ export default {
         components:'realTime',
         height:null,
         review:false,
-        webSocket:''
     };
   },
   watch: {},
@@ -42,23 +41,8 @@ export default {
   created() {},
   mounted() {
     this.getHeight()
-    // this.connectWebSocket()
   },
   methods: {
-    // connectWebSocket() {
-    //   let webSocket = new WebSocket(`ws://${this.$c.hostname}:8877/api/v2/ws/`+this.userinfo.id)
-    //   // let webSocket = new WebSocket(`ws://192.168.1.24:8877/api/v2/ws/`+this.userinfo.id)
-    //   this.webSocket = webSocket
-    //   webSocket.onopen = () => {
-    //     console.log('WebSocket连接成功')
-    //   }
-    //   webSocket.onerror = () => {
-    //     console.log('WebSocket连接失败')
-    //   }
-    //   webSocket.onclose = () => {
-    //     console.log('WebSocket连接关闭')
-    //   }
-    // },
     getQueueList(){
       this.review = true
       this.$nextTick(()=>{