协同

RMS-FrontEnd/src/App.vue

@@ -147,10 +147,7 @@ html, body, #app {
     line-height: 50px;
   }
 }
-.el-pagination{
-  padding:20px 10px 0 0;
-  margin: 20px;
-}
+
 .scrollable {-webkit-overflow-scrolling: touch;}
 ::-webkit-scrollbar {width: 5px;height: 10px;}
 ::-webkit-scrollbar-thumb {background-color: rgba(50, 50, 50, 0.3);}

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

@@ -1,15 +1,14 @@
 <template>
 <div :style="{ top: showPositionTop + 'px', left: showPositionLeft + 'px' }">
-  <div style="background:white;display:flex; justify-content:flex-end" >
-    <el-button type="primary" size="small" @click="checkResult" style="margin-top:20px;margin-right:10px;height:32px;"> 查看结果 </el-button>
-    <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" style="margin-top:20px">
+  <div style="background:white;display:flex; justify-content:flex-end;align-items: center;height: 50px;" >
+    <el-button type="primary" size="small" @click="checkResult" style="margin-right:10px;height:32px;"> 查看结果 </el-button>
+    <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" >
       <patent-keywords-highlight :project-id="projectId" />
         <el-button :disabled="!$permission('/workspace/common/highlight')" slot="reference" size="small" type="primary" class="margin-right_10">
            高亮<i class="el-icon-arrow-down el-icon--right"></i>
         </el-button>
     </el-popover>
     <el-switch
-      style="margin-top:25px"
       v-model="value"
       :disabled="!$permission('/workspace/details/comparison')"
       inactive-text="对比"

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

@@ -3,7 +3,7 @@
     <header class="header">
       <div class="header-left">
         <div class="logo-bar">
-          <img src="@/assets/logo-3.png" class="logo">
+          <img src="@/assets/logo-3.png" class="logo" @click="imgBtn">
         </div>
       </div>
       <div class="header-right">
@@ -142,6 +142,11 @@ export default {
         this.$store.commit("SET_DictMessage",response.data)
       })
     },
+    imgBtn() {
+      this.$router.push({
+        path: "/admin/rManage",
+      })
+    },
   }
 }
 </script>

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

@@ -1,20 +1,21 @@
 <template>
   <div style="top:0px;left:0px;">
-    <div style="background:white;display:flex; justify-content:flex-end">
+    <div style="background:white;display:flex; justify-content:flex-end;align-items: center;height: 50px;">
       <!-- <el-tag :type="patentStatus2=='0'?'info':'primary'" effect="dark" size="mini" class="margin-left_10"
         style="cursor: pointer" @click="changeStatus(patentStatus2)">{{ patentStatus[patentStatus2] }}</el-tag> -->
       <!-- <el-button type="primary" size="small" @click="checkResult" style="margin-top:20px;margin-right:10px;height:32px;"> 查看结果 </el-button> -->
-      <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" style="margin-top:20px">
+      <el-button v-if="reportType==4 && !taskId" @click="taskWork" type="primary" size="small" style="height: 32px;"> 协同办公 </el-button>
+      <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" style="margin-left: 20px;">
         <patent-keywords-highlight :project-id="projectId" />
         <el-button slot="reference" size="small" type="primary"
           class="margin-right_10">
           高亮<i class="el-icon-arrow-down el-icon--right"></i>
         </el-button>
       </el-popover>
-      <el-switch style="margin-top:25px" v-model="value" 
+      <el-switch v-model="value" 
         inactive-text="查看详情" active-color="#00BFFF" inactive-color="#D3D3D3">
       </el-switch>
-      <patent-list v-if="taskId" :patent-id="patentId" :project-id="projectId" @on-change="onChange" :taskId="taskId"
+      <patent-list v-if="taskId && reportType!=4" :patent-id="patentId" :project-id="projectId" @on-change="onChange" :taskId="taskId"
         :location="location1" :state="state" :ban='ban' @behindNumber="behindNumber"/>
     </div>
 
@@ -104,7 +105,7 @@
         </div>
       </el-main>
     </el-container>
-
+    <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="reportId" :patentNo1="patentNo1"></sendCollaboration>
     <!-- <el-dialog :visible.sync="dialogVisible">
         <img width="100%" :src="dialogImageUrl" alt="">
     </el-dialog> -->
@@ -137,6 +138,7 @@ import Other from '@/views/components/articles/components/history/other.vue'
 import { getPatentCountry } from "@/utils";
 import Import from '@/views/components/import/index.vue'
 import Features from '@/views/components/articles/components/features.vue'
+import sendCollaboration from "@/views/report/components/sendCollaboration.vue"
 
 export default {
   mixins: [patentKeywordsHighlight, changeTranslation],
@@ -162,6 +164,7 @@ export default {
     Invalid,
     Litigation,
     Other,
+    sendCollaboration,
   },
   data() {
     return {
@@ -198,6 +201,7 @@ export default {
       activeOption: 'PatentField',
       width: '100%',
       dialogVisible: false,
+      visibleWork: false,
       dialogImageUrl: '',
       FeaturesNumber: null,
       // isKeepA:null,
@@ -297,6 +301,14 @@ export default {
     console.log(this.reportId, this.$s.getSession('params'));
   },
   methods: {
+      // 侵权分析工作协同
+      taskWork() { 
+        this.visibleWork = true
+        // this.compareResult=this.queryParams.compareResult
+      },
+      collaboration(val) { 
+        this.visibleWork=val
+      },
     isRead(val) {
       if(this.patentStatus2==0 && this.reportType != 4){
         this.changeStatus(val)

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

@@ -15,17 +15,17 @@
               <el-button @click="merge" :disabled="row.length>0?false:true">合并</el-button>
               <el-button @click="split" :disabled="row.length>0?false:true">拆分</el-button>
           </el-button-group>
-          <div v-if="!this.coordinationA && this.typeFto!=1">
-            <el-select v-if="taskWorkRemakA!=0"  placeholder="请选择拆分类型" v-model="splitType1" @change="splitTypeSelect($event)" >
+          <div>
+            <el-select v-if="typeFto!=1"  placeholder="请选择拆分类型" v-model="splitType1" @change="splitTypeSelect($event)" >
               <el-option label="仅拆主权要" value="0"></el-option>
               <el-option label="全部拆分" value="1"></el-option>
             </el-select>
-            <el-select v-if="taskWorkRemakA!=0" placeholder="请选择拆分符号" v-model="splitBy1" style="margin-left: 10px;" @change="splitBySelect($event)">
+            <el-select v-if="typeFto!=1" placeholder="请选择拆分符号" v-model="splitBy1" style="margin-left: 10px;" @change="splitBySelect($event)">
                 <el-option label="逗号拆分" value="0"></el-option>
                 <el-option label="分号拆分" value="1"></el-option>
                 <el-option label="逗号和分号拆分" value="2"></el-option>
             </el-select>
-            <el-select v-if="taskWorkRemakA!=0" placeholder="请选择显示类型" v-model="Type" style="margin-left: 10px;" @change="TypeSelect($event)" >
+            <el-select placeholder="请选择显示类型" v-model="Type" style="margin-left: 10px;" @change="TypeSelect($event)" >
                 <el-option label="仅显示主权要" value="1"></el-option>
                 <el-option label="全部显示" value="0"></el-option>
             </el-select>
@@ -121,36 +121,34 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column v-if="this.taskWorkRemakA==0"  prop="targetDescription" align="center" label="协同标的说明(可粘贴图片)" min-width="300px">
+          <el-table-column v-if="this.taskWorkRemakA==0"  prop="targetDescription2" align="center" label="协同标的说明(可粘贴图片)" min-width="300px">
             <template slot-scope="scope">   
               <!-- <div>
                   <el-input type="textarea" style="width:100%" autosize v-model="scope.row.explainText"> {{scope.row.explainText}}</el-input>
               </div> -->
-              <div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview" contenteditable="true" 
-                v-html="scope.row.targetDescription2"  @input="saveValue($event.target.innerHTML)"  @click="saveValue($event.target.innerHTML)"
-                @blur="getValue(scope.row,'targetDescription')"  v-on:paste="handlePaste($event,scope.row,'targetDescription')">
+              <div v-html="scope.row.targetDescription2"  >
                 <!-- {{scope.row.explainText}} -->
               </div>
             </template>
           </el-table-column>
           <el-table-column v-if="this.taskWorkRemakA==0" prop="compareResult2" align="center" label="协同比对结果" width="300px">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.compareResult2" placeholder="请选择">
+              <div v-if="scope.row">
+                  <span v-if="scope.row.compareResult.toString()!=''">{{ options.filter(item=>item.value==scope.row.compareResult)[0].label }}</span> 
+               </div>
+              <!-- <el-select v-model="scope.row.compareResult2" placeholder="请选择">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
                 </el-option>
-              </el-select>
+              </el-select> -->
             </template>
           </el-table-column>
-          <el-table-column v-if="this.taskWorkRemakA==0"  prop="compareDescription" align="center" label="协同比对说明(可粘贴图片)" min-width="300px">
-            <template slot-scope="scope">   
-              <div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview" contenteditable="true" 
-                v-html="scope.row.compareDescription2"  @input="saveValue($event.target.innerHTML)"  @click="saveValue($event.target.innerHTML)"
-                @blur="getValue(scope.row,'compareDescription')"  v-on:paste="handlePaste($event,scope.row,'compareDescription')">
-              </div>
+          <el-table-column v-if="this.taskWorkRemakA==0"  prop="compareDescription2" align="center" label="协同比对说明(可粘贴图片)" min-width="300px">
+            <template slot-scope="scope"> 
+              <div v-html="scope.row.compareDescription2">  </div>
             </template>
           </el-table-column>
           <el-table-column v-if="this.taskWorkRemakA==0" label="操作" min-width="120"  align="center" >
@@ -594,63 +592,12 @@
         // console.log("tableData",this.tableData);
         this.getSpanArr(this.tableData)
       },
-      //addSynery
-      // handlePaste(a, b, c) {
-      //   console.log(a,b,c);
-      // },
-
-      // getValue(row) {
-      //   // console.log(row);
-      //   var keepAddSynery=[]
-      //   for (let i = 0; i < this.tableData1.length; i++){
-         
-      //     keepAddSynery.push(
-      //       {
-      //         taskId:this.taskId,
-      //         compareMessageList: {
-      //           featureId:row.id,
-      //           targetDescription: this.tableData1[i].targetDescription ? this.tableData1[i].targetDescription:row.targetDescription,
-      //           compareDescription: this.tableData1[i].compareDescription ? this.tableData1[i].compareDescription : row.compareDescription,
-      //           compareResult: this.tableData1[i].compareResult ? this.tableData1[i].compareResult : row.compareResult,
-      //         }
-      //       }
-      //     )
-      //   }
-      //   console.log(row,keepAddSynery);
-      // },
-
-      // saveValue(a, b) {
-      //   console.log(a,b);
-      // },
+     
       //保存
       keep() {
         console.log(this.tableData1);
         this.loadings = true
         this.$emit("isRead",0)
-        // for (let i = 0; i < this.tableData1.length; i++){
-        //   let keepArr = [];
-        //     this.keepArr.push(
-        //         {
-        //             taskId:this.taskId,
-        //             signPatentNo: this.tableData1[i].signPatentNo,
-        //             contentOut: this.tableData1[i].contentOut,
-        //             content: this.tableData1[i].content,
-        //             rightId: this.tableData1[i].rightId,
-        //             isFinal: this.tableData1[i].isFinal,
-        //             reportId: this.tableData1[i].reportId,
-        //             rightName: this.tableData1[i].rightName,
-        //             rightType: this.tableData1[i].rightType,
-        //             splitBy: this.tableData1[i].splitBy,
-        //             explainText: this.tableData1[i].explainText ? this.tableData1[i].explainText : "",
-        //             targetDescription: this.tableData1[i].targetDescription ? this.tableData1[i].targetDescription : "",
-        //             compareDescription: this.tableData1[i].compareDescription ? this.tableData1[i].compareDescription : "",
-        //             compareResult: this.tableData1[i].compareResult.toString() !="" ? this.tableData1[i].compareResult : "",
-        //         }
-        //       )
-        // }
-
-
-        // console.log(this.tableData1);
         if (this.coordination || (this.typeFto==1&&this.taskWorkRemakA!=0) ) {
           console.log(1111, this.coordination,this.typeFto);
           var keepAddSynerys = {
@@ -676,12 +623,12 @@
           })
 
         }else if (this.taskWorkRemakA==0) {
-          console.log(2222, this.taskWorkRemakA);
+          console.log(2222, this.taskWorkRemakA,this.tableData1);
           let keepUpdate=[]
           for (let i = 0; i < this.tableData1.length; i++) {
             keepUpdate.push(
               {
-                id: this.tableData1[i].CMid,
+                featureId: this.tableData1[i].id,
                 targetDescription: this.tableData1[i].targetDescription ? this.tableData1[i].targetDescription : "",
                 compareDescription: this.tableData1[i].compareDescription ? this.tableData1[i].compareDescription : "",
                 compareResult: this.tableData1[i].compareResult,
@@ -753,12 +700,12 @@
       // 一键修改
       handleClick(row) {
         // console.log(this.tableData1,row);
-        let a=this.tableData1.findIndex(item => {
-          return item.id==row.id
-        })
-        this.tableData1[a].targetDescription=row.targetDescription2
-        this.tableData1[a].compareDescription=row.compareDescription2
-        this.tableData1[a].compareResult = row.compareResult2
+        // let a=this.tableData1.findIndex(item => {
+        //   return item.id==row.id
+        // })
+        row.targetDescription=row.targetDescription2
+        row.compareDescription=row.compareDescription2
+        row.compareResult = row.compareResult2
         this.$message.success("修改成功,请进行保存")
       },
     },

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

@@ -78,7 +78,7 @@
                 <el-date-picker style="width:100%"
                     v-model="form.date"
                     type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:mm"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>

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

@@ -5,7 +5,7 @@
         <el-form :model="clientForm" :rules="clientRules" ref="clientForm">
 
           <el-form-item label="协同人 :" prop="handlePersonIds">
-            <el-select style="width:100%;padding-right: 20px;" ref="select1" v-model="clientForm.handlePersonIds" clearable
+            <el-select style="width:100%;" ref="select1" v-model="clientForm.handlePersonIds" clearable
                filterable remote placeholder="请输入协同人" :remote-method="remoteMethod" @change="change" @clear="clear(0)"
               @visible-change="visibleChange" :loading="ploading">
               <el-option v-for="item in personnelList" :key="item.value" :label="item.label" :value="item.value" :disabled="!item.value">
@@ -44,7 +44,7 @@
           </el-form-item>
 
           <el-form-item label="完成日期 :" prop="endTime">
-            <el-date-picker style="width:100%" v-model="clientForm.endTime" value-format="yyyy-MM-dd" type="date"  placeholder="选择日期">
+            <el-date-picker style="width:100%" v-model="clientForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"  placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="备注 :" prop="remark">
@@ -90,7 +90,7 @@
 import { mapGetters } from 'vuex'
 import PersonnelList from './personnelList'
 export default {
-  props: ["visibleCollaborations", "reportId", "onChangesIn", "formS","compareResultA"],
+  props: ["visibleCollaborations", "reportId", "onChangesIn", "formS","compareResultA","patentNo1"],
   components: {
     PersonnelList
   },
@@ -131,7 +131,7 @@ export default {
         // reportId: this.reportId,
         // applicationName: "",//申请人
         // obligeeName: "",//权利人
-        // patentNo: "",
+        patentNo: this.patentNo1,
         // applicationNo: "",
         // numberIpc: "",
         // numberCpc: "",
@@ -150,9 +150,9 @@ export default {
         // endTime: this.clientForm.date,
         // remark: this.clientForm.remark,
         // clientForm: {},
-        type: this.type,
         patentVO: {},
-        compareResult:this.compareResultA,
+        compareResult: this.compareResultA,
+        isAll:0,
       },
       ploading: false,
       userInformation: false,
@@ -198,24 +198,27 @@ export default {
       // this.queryParams.clientForm=this.clientForm
       this.$refs.clientForm.validate((valid) => {
         if (valid) {
-          if (this.queryParams.type==4) {
-            //侵权分析
-          } else {
-            if (this.queryParams.compareResult=='') {
+          // if (this.queryParams.reportType != 4) {
+          if (this.onChangesIn) {
               this.queryParams.patentVO.filedOptions = this.onChangesIn
+              this.queryParams.isAll = 1;
               if (Object.keys(this.formS).length > 0) {
                 for (let k in this.formS) {
                   this.queryParams.patentVO[k] = this.formS[k]
                 }
               }
-            }
           }
+          if (this.queryParams.patentNo) {
+            this.queryParams.isAll=null
+          }
+            
+          // }
           if (Object.keys(this.clientForm).length > 0) {
               for (let kForm in this.clientForm) {
                 this.queryParams[kForm] = this.clientForm[kForm]
               }
           }
-          console.log(this.personnelList);
+          console.log(this.personnelList,this.queryParams);
           this.$api.addSyneryTask(this.queryParams).then(res => {
             if (res.code==200) {
               this.visibleCollaboration = false

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

@@ -121,7 +121,7 @@ export default {
       // tableDataA: [],//子页面的tableData数据
       taskFeilSure: false,
       showRight: true,
-      show:true
+      show: true,
     }
   },
   created() {
@@ -192,7 +192,7 @@ export default {
     },
     // 工作协同
     taskWork() { 
-      this.visibleWork = true
+      this.visibleWork = true;
     },
     collaboration(val) { 
       this.visibleWork=val

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

@@ -295,20 +295,57 @@
       })
     },
     coordinationTask(row) {
-      let a = this.$router.resolve({
-        path: '/Incomplete',
-        query: {
+      console.log(row);
+      if (row.reportType == 4) {
+        let queryParams = {
           taskId: row.id,
-          reportId:row.reportId,
+          reportId: row.reportId,
           type:row.type,
-		      reportType:row.reportType,
-          signPatentNo:row.signPatentNo,
-          // coordination: this.coordination
+          reportType:row.reportType,
+          current: 1,
+          size: 10,
+          taskStatus: "3",
+          filedOptions: [],
         }
-        // path: '/Incomplete'+`taskId=470&reportId=350&type=3&reportType=${}`,
-        // path: '/customer_review',
-      })
-      window.open(a.href, "_blank")
+        this.$api.reTaskPatents(queryParams).then(res => {
+          console.log(res);
+          if (res.code == 200) {
+            var b = {
+                taskId:row.id,
+                type:row.type,
+                reportId:row.reportId,
+                patentNo:res.data.records[0].patentNo,
+                reportType : row.reportType,
+                reportStatus:""
+            }
+            this.$s.setSession('params',b)
+            var a = this.$router.resolve({
+              path: '/FTOContrast/' + res.data.records[0].id,
+              query: {
+                patentNo:res.data.records[0].patentNo,
+                reportId:row.reportId,
+              }
+            })
+            window.open(a.href, "_blank")
+          }
+        })
+         
+      } else {
+        var a = this.$router.resolve({
+          path: '/Incomplete',
+          query: {
+            taskId: row.id,
+            reportId:row.reportId,
+            type:row.type,
+            reportType:row.reportType,
+            signPatentNo:row.signPatentNo,
+            // coordination: this.coordination
+          }
+          // path: '/Incomplete'+`taskId=470&reportId=350&type=3&reportType=${}`,
+          // path: '/customer_review',
+        })
+        window.open(a.href, "_blank")
+      }
     },
     contrastTask(row) {
 		// this.$store.commit('SET_ADMIN_SIGNPATENTNO',row.signPatentNo)

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

@@ -91,7 +91,7 @@
               <el-input v-model="form.createTime" :disabled="true" autocomplete="off" placeholder="请输入创建时间"></el-input>
             </el-form-item>
             <el-form-item label="期限">
-              <el-date-picker v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:mm" type="datetime" placeholder="选择日期时间" style="width:100%"> </el-date-picker>
+              <el-date-picker v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width:100%"> </el-date-picker>
             </el-form-item>
 
         </el-form>
@@ -158,22 +158,60 @@ export default {
     // 查看(确认)结果
     taskWorkRemakBtn(ev,row) {
       console.log(ev, row);
-      if (ev==1) {
-        let a = this.$router.resolve({
-          path: '/Incomplete',
-          query: {
+      if (ev == 1) {
+        if (row.reportType==4) {
+          let queryParams = {
             taskId: row.id,
             reportId: row.reportId,
-            type: row.type,
-            taskWorkRemak:0,
-            reportType: row.reportType,
-            signPatentNo:row.signPatentNo
-            // coordination: this.coordination
+            type:row.type,
+            reportType:row.reportType,
+            current: 1,
+            size: 10,
+            taskStatus: "3",
+            filedOptions: [],
           }
-        // path: '/Incomplete'+`taskId=470&reportId=350&type=3&reportType=${}`,
-        // path: '/customer_review',
-         })
-        window.open(a.href, "_blank")
+          this.$api.reTaskPatents(queryParams).then(res => {
+          console.log(res);
+          if (res.code == 200) {
+            var b = {
+                taskId:row.id,
+                type:row.type,
+                reportId:row.reportId,
+                patentNo:res.data.records[0].patentNo,
+                reportType : row.reportType,
+                reportStatus: "",
+            }
+            this.$s.setSession('params',b)
+            let a = this.$router.resolve({
+              path: '/FTOContrast/' + res.data.records[0].id,
+              query: {
+                patentNo:res.data.records[0].patentNo,
+                reportId: row.reportId,
+                taskWorkRemak:0,
+              }
+            })
+            window.open(a.href, "_blank")
+          }
+        })
+         
+        } else {
+          let a = this.$router.resolve({
+            path: '/Incomplete',
+            query: {
+              taskId: row.id,
+              reportId: row.reportId,
+              type: row.type,
+              taskWorkRemak:0,
+              reportType: row.reportType,
+              signPatentNo:row.signPatentNo
+              // coordination: this.coordination
+            }
+          // path: '/Incomplete'+`taskId=470&reportId=350&type=3&reportType=${}`,
+          // path: '/customer_review',
+          })
+          window.open(a.href, "_blank")
+        }
+        
       } else {
         console.log("完成任务");
         this.$api.taskFinish({id:row.id}).then((res) => {

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

@@ -152,7 +152,7 @@ export default {
       this.taskWorkRemakShow = false
       console.log(this.taskWorkRemakShow);
     }
-    console.log(this.queryParams,this.reportId,this.coordination);
+    console.log(this.queryParams,this.reportId,this.coordination,this.reportType,);
   },
   mounted() {
     console.log(this.coordination);

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

@@ -2,7 +2,7 @@ export const Contrast = {
     methods:{
         toContrast(row,index){
           var location = (index + 1) + ((this.queryParams.current - 1) * this.queryParams.size)
-        if (this.reportType != 3) {
+        if (this.reportType != 3 && this.reportType!=4) {
             console.log("不是",this.reportType);
             var router = this.$router.resolve({
                 path: '/ContrastIndex/' + row.id,