修改专利号导入

RMS-FrontEnd/src/router/index.js

@@ -274,8 +274,8 @@ const routes = [
         component:() => import('@/views/report/InvalidResponse/components/evidenceAndRequestRouter.vue'),
       },
       {
-        path:'/fileDetails/:id',
-        name:'fileDetails/:id',
+        path:'/checkFileDetails/:id',
+        name:'checkFileDetails/:id',
         meta:{
           title:'证据文献详情',
           aside:true,

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

@@ -1,8 +1,9 @@
 import { downLoad2, getFileName } from "@/utils";
 import { cron } from "@/views/components/common/components/mixins";
+import { mapGetters } from "vuex";
 export const common = {
     mixins:[cron],
-    props: ['form','reportId','tableHeight','review','webSocket'],
+    props: ['form','reportId','tableHeight','review','webSockets'],
     data() {
         return {
             // statusObj: {
@@ -36,11 +37,13 @@ export const common = {
         }
     },
     computed: {
+        ...mapGetters(['webSocket']),
         userinfo() {
             return this.$store.state.admin.userinfo
         }
       },
     watch:{
+        
         reportId(val){
             this.queryParams.reportId = val
             this.getList()

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

@@ -19,7 +19,7 @@
             <el-table-column label="实时进度" align="center" min-width="200px" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div style="display:flex">
-                  <span style="width:100%"><el-progress :text-inside="true" :stroke-width="20" :percentage="scope.row.percentage?scope.row.percentage:Math.floor(Number(scope.row.successNum)/Number(scope.row.total)*100)" :color="customColors"></el-progress></span>
+                  <span style="width:calc(100% - 30px)"><el-progress :text-inside="true" :stroke-width="20" :percentage="scope.row.percentage?scope.row.percentage:Math.floor(Number(scope.row.successNum)/Number(scope.row.total)*100)" :color="customColors"></el-progress></span>
                   <span ><span >{{ scope.row.successNum }}/</span><span>{{ scope.row.total }}</span></span>
                 </div>
                 
@@ -114,7 +114,7 @@ export default {
   },
   computed: {
     webSocket1(){
-      return this.webSocket
+      return this.webSockets
     }
   },
   created() {},
@@ -124,7 +124,7 @@ export default {
   },
   methods: {
     initTask() {
-      var webSocket = this.webSocket1
+      var webSocket = this.webSocket1|| this.webSocket
       webSocket.onmessage = (e) => {
         const { code, data, message } = JSON.parse(e.data)
         console.log({ code, data, message });

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

@@ -272,7 +272,8 @@ export default {
     },
     //更新日志
     updateLog(row){
-      this.$refs.updateLog.open(row,this.webSocket)
+      var webSocket = this.webSockets || this.webSocket
+      this.$refs.updateLog.open(row,webSocket)
     },
     // 网站导入暂停，继续任务操作
     async handleSuspend(row) {

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" :webSocket="webSocket"></component>
+              <component :is='components' v-bind="$attrs" v-if="activeName == 0" :review="review" :tableHeight="height" :webSockets="webSocket"></component>
             </el-tab-pane>
             <el-tab-pane label="任务列表" name="1">
-              <component :is='components' v-bind="$attrs" v-if="activeName == 1" :review="review" :tableHeight="height" :webSocket="webSocket"></component>
+              <component :is='components' v-bind="$attrs" v-if="activeName == 1" :review="review" :tableHeight="height" :webSockets="webSocket"></component>
             </el-tab-pane>
           </el-tabs>
           

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

@@ -130,7 +130,7 @@ export default {
         this.$s.setSession('params',this.params)
         this.getPiZhuContrastList(this.params.signPatentNo)
         await this.$router.push({
-        path: '/fileDetails/' + -1,
+        path: '/checkFileDetails/' + -1,
       })
     },
     //打开陈述意见
@@ -173,7 +173,7 @@ export default {
         // })
      }
       await this.$router.push({
-        path: '/fileDetails/' + val.id,
+        path: '/checkFileDetails/' + val.id,
       })
     },
     //查询证据文献

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

@@ -57,7 +57,11 @@
                 {{ scope.row[item.key] }}
               </span>
             </div>
-            <div v-else-if="item.key == 'court'">{{ getData(scope.row,item.key) }} <span style="margin-left:20px;float:right" v-if="scope.row.invalidName == 3 || scope.row.invalidName == 2"> <el-link type="primary" @click="toogleExpand(scope.row,scope.$index)">详情</el-link> </span></div>
+            <div v-else-if="item.key == 'court'"><span :style="{'margin-left':(scope.row.invalidName == 3 || scope.row.invalidName == 2)?'45px':0}">{{ getData(scope.row,item.key) }} </span>
+              <span style="margin-left:20px;float:right" v-if="scope.row.invalidName == 3 || scope.row.invalidName == 2"> 
+                <el-link type="primary" @click="toogleExpand(scope.row,scope.$index)">详情</el-link> 
+              </span>
+            </div>
             <div v-else v-html="getData(scope.row,item.key)"></div>
         </template>
       </el-table-column>
@@ -685,7 +689,7 @@ export default {
     //查看证据文献
     check(item,val) {
       var router = this.$router.resolve({
-        path: '/fileDetails/' + val.id,
+        path: '/checkFileDetails/' + val.id,
       })
       let params = this.$s.getSession('params')
       params.type=7

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

@@ -101,7 +101,7 @@
 
     <el-dialog :title="title" :visible.sync="showFile" width="1200px"  @close="handleFile" append-to-body  :close-on-click-modal="false">
       <!-- <importPatent :reportId="this.queryParams.reportId"></importPatent> -->
-      <component :is='isComponent' :reportId="this.queryParams.reportId"></component>
+      <component :is='isComponent' :reportId="this.queryParams.reportId" :downloadId="8"></component>
         <!-- <span slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitFile" >确 定</el-button>
         </span> -->
@@ -184,7 +184,7 @@ export default {
       //   path: '/ContrastIndex/' + val.id,
       // })
       var router = this.$router.resolve({
-        path: '/fileDetails/' + val.id,
+        path: '/checkFileDetails/' + val.id,
       })
       let params = this.$s.getSession('params')
       params.type=7

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

@@ -95,7 +95,7 @@ export default {
         if (res.code==200) {
           // this.tableData=res.data[0].id
           var router = this.$router.resolve({
-            path: '/fileDetails/' +res.data[0].id,
+            path: '/checkFileDetails/' +res.data[0].id,
           })
           let params = this.$s.getSession('params')
           params.type=7

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

@@ -1,6 +1,6 @@
 <template>
   <div class="responseDialog">
-    <el-dialog  :title="form.id?'编辑' +title[form.processType]:'添加' +title[form.processType]" :visible.sync="showDialog" width="500px" :close-on-click-modal="false"  @close="handleClose" append-to-body>
+    <el-dialog  :title="form.id?'编辑' +title[form.processType]:'添加' +title[form.processType]" :visible.sync="showDialog" width="500px" :close-on-click-modal="false"  :before-close="handleClose" append-to-body>
       <el-form  :model="form" :rules="rules" ref="reportForm" label-width="120px" label-position="left" v-loading="loading">
         <el-form-item v-if="form.processType!=5" :label="timeType[form.processType]">
           <el-date-picker v-model="form.occuredTime" value-format="yyyy-MM-dd" type="date"  placeholder="请选择时间" style="width: 100%;"></el-date-picker>
@@ -10,10 +10,10 @@
         </el-form-item>
         <template v-if="form.processType==0">
           <el-form-item  label="地点">
-            <el-input  v-model="form.oralExam.address" autocomplete="off" placeholder="请输入地点"></el-input>
+            <el-input  v-model="form.address" autocomplete="off" placeholder="请输入地点"></el-input>
           </el-form-item>
           <el-form-item  label="参与人">
-            <el-input  v-model="form.oralExam.participants" autocomplete="off" placeholder="请输入参与人"></el-input>
+            <el-input  v-model="form.participants" autocomplete="off" placeholder="请输入参与人"></el-input>
           </el-form-item>
         </template>
         <el-form-item v-if="form.processType!=0" label="附件：">
@@ -74,6 +74,10 @@ export default {
   methods: {
     open(form) {
       this.form = JSON.parse(JSON.stringify(form))
+      if(this.form.processType == 0){
+        this.$set(this.form,'address',this.form.oralExam.address)
+        this.$set(this.form,'participants',this.form.oralExam.participants)
+      }
       this.showDialog=true
     },
     // 弹窗确定