添加地址配置及解决部分没显示报告名称

RMS-FrontEnd/src/config/index.js

@@ -3,4 +3,5 @@ export default {
     host: window.location.host,
     staticURL: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8084' : (process.env.NODE_ENV === 'test'?'http://192.168.1.24:8084':'http://192.168.1.24:8084'),
     staticURL2: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8081' : 'http://139.224.24.90:8081',
+    pasURL:process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:80' : 'http://localhost:8085',
 }

RMS-FrontEnd/src/router/index.js

@@ -149,7 +149,8 @@ const routes = [
         path: '/result',
         name:"result",
         meta:{
-          aside:true
+          aside:true,
+          showHeader:true
         },
         component:() => import('@/views/report/Invalid/InvalidPage/Result.vue'),
       },

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

@@ -1,7 +1,7 @@
 <template>
 <div :style="{ top: showPositionTop + 'px', left: showPositionLeft + 'px' }">
   <div style="display:flex;justify-content: space-between;align-items: center;">
-    <div >
+    <div :style="{'visibility':this.taskId?'visible':'hidden'}">
       <el-tooltip class="item" effect="dark" content="返回任务页面" placement="top-start">
         <el-button type="primary" size="small" @click="goBack"> 返回 </el-button>
       </el-tooltip>
@@ -219,6 +219,7 @@ export default {
 },
   data() {
     return {
+      params:{},
       imgList:[],
       reportType:'',
       patentStatus:{
@@ -328,6 +329,7 @@ export default {
   created() {
   },
   mounted() {
+    this.params = this.$s.getSession('params')
     window.selectMark = this.selectMark
     this.signPatentNo = this.$s.getSession('params').signPatentNo
     // console.log(this.$s.getSession('params'))
@@ -479,6 +481,7 @@ if(index!=-1){
                   type:this.type
                 }
               })
+      this.$s.setSession('params',this.params)
       window.open(router.href, '_blank');
     },
 

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

@@ -143,7 +143,7 @@ export default {
         case 'AnalysisSystem':
           // window.open('http://139.224.24.90:80/workspace?token='+this.userinfo.token)
           
-          window.open('http://139.224.24.90:80/workspace')
+          window.open(this.$c.pasURL + '/workspace')
           break; 
         case 'clientble':
           this.clientVisible = true

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

@@ -221,7 +221,6 @@
 
   
 <script>
-import { CodeNode } from 'source-list-map'
 import { editContrast } from '../../components/mixins'
 import {explain} from '../../components/mixins'
 export default {
@@ -241,7 +240,7 @@ export default {
       checkRecord:[],
       recordList:[],
       featuresId:[],
-      typeArr:[1],
+      typeArr:[0,1],
       Type:"0",
       isSelect:true,
       menu: [
@@ -343,6 +342,13 @@ export default {
               // this.$refs.table.doLayout();//doLayout()方法，让table重新布局
             })
         },
+        dataHeight(){
+        //console.log(1)
+            this.$nextTick(() => {
+              this.setHeight()
+              // this.$refs.table.doLayout();//doLayout()方法，让table重新布局
+            })
+        },
     show(){
       this.$nextTick(() => {
               this.setHeight()
@@ -350,6 +356,9 @@ export default {
     }
   },
   computed:{
+    dataHeight(){
+      return this.tableData.filter(item=>item.rightId == this.ruleForm.type)
+    },
     taskId(){
       return this.$route.query.taskId
     },

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

@@ -62,6 +62,7 @@ export default {
       queryParams: {
         signPatentNo:this.signPatentNo,
         // taskId: this.taskId,
+        reportName:this.reportMessage.name,
         reportId: this.reportId,
         applicationName: "",//申请人
         obligeeName: "",//权利人