回避设计新增报告详情

RMS-FrontEnd/src/router/index.js

@@ -172,6 +172,15 @@ const routes = [
         component:() => import('@/views/report/FTO/FTOPage/ReportDetails/index.vue'),
       },
       {
+        path: '/avoidAside',
+        name:"avoidAside",
+        meta:{
+          aside: true,
+          showHeader:true,
+        },
+        component:() => import('@/views/report/avoid/avoidAsid/index.vue'),
+      },
+      {
         path: '/taskReportDetails',
         name:"taskReportDetails",
         meta:{

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

@@ -0,0 +1,98 @@
+<template>
+  <div>
+      <el-container>
+      <el-aside width="210px" style="overflow:hidden" class="patent-articles-menu">
+        <el-menu class="theme-dark" :default-active="activeMenu" @select="handleSelect">
+          <el-menu-item v-for="item in menuList" :index="item.path" >
+            <i class="el-icon-film"></i>
+            <span slot="title">{{item.title}}</span>
+          </el-menu-item>
+        </el-menu>
+      </el-aside>
+      <el-container>
+        <!-- <el-header></el-header> -->
+        <el-main class="admin-main-box">
+          <!-- <component :row="row" :is="activeMenu" :reportId="reportId" :patentNo="signPatentNo" :signPatentNo="signPatentNo" :reportId2="reportId"></component> -->
+          <component :row="row" :is="activeMenu" :reportId="reportId" :patentNo="signPatentNo" :splitBy="splitBy" :splitType="splitType"></component>
+        </el-main>
+      </el-container>
+    </el-container>
+  </div>
+</template>
+
+<script>
+import BasicInformation from '@/views/report/reportDetails/components/basicMessage.vue';
+import avoid from '@/views/report/avoid/index.vue';
+// import SignPatent from '@/views/components/articles/components/features.vue';
+// import ContrastFile from './components/SelectedPatent.vue';
+// import ContrastResult from '../Invalid/InvalidPage/Result.vue';
+// import ContrastPlan from './components/ContrastPlan.vue';
+import ReportFile from '@/views/report/reportDetails/components/reportFile.vue';
+// import referenceFile from './components/referenceFile.vue';
+import TaskDetails from '@/views/report/reportDetails/components/taskDetails.vue';
+export default {
+  components:{
+    BasicInformation,
+    avoid,
+      // SignPatent,
+      // ContrastFile,
+      // ContrastResult,
+      // ContrastPlan,
+      ReportFile,
+      TaskDetails,
+  // referenceFile
+  },
+  data() {
+      return {
+          activeMenu: "BasicInformation",
+          menuList: [
+              { title: '基本信息', path:"BasicInformation"}, 
+              { title: '回避设计方案', path:"avoid"}, 
+              // { title: '标的专利特征拆分详情', path:"SignPatent"}, 
+              // { title: '对比文件', path:"ContrastFile"}, 
+              // // { title: '新对比文件', path:"referenceFile"}, 
+              // { title: '对比结果', path:"ContrastResult"}, 
+              // { title: '对比方案', path:"ContrastPlan"}, 
+              { title: '报告文档', path:"ReportFile"}, 
+              { title: '任务清单', path:"TaskDetails"}, 
+          ],
+      }
+  },
+  watch: {
+
+  },
+  computed:{
+      dictMessage() {
+          return this.$s.getSession('row').dictMessage.REPORT_TYPE
+      },
+      row(){
+          return this.$s.getSession('row')
+      },
+      reportId(){
+          return this.$s.getSession('row').id
+      },
+      splitBy(){
+          return this.$s.getSession('row').splitBy
+      },
+      splitType(){
+          return this.$s.getSession('row').splitType
+      },
+      signPatentNo(){
+          return this.$s.getSession('row').signPatentNo
+      }
+  },
+  mounted() {
+    this.changePageTitle()
+      console.log(this.row);
+  },
+  methods: {
+      changePageTitle() {
+          document.title = `${this.row.name} ${'报告详情'}`
+      },
+      handleSelect(index, path) {
+          // console.log(index, path);
+          this.activeMenu = index
+      },
+  },
+}
+</script>

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

@@ -33,10 +33,11 @@
       <el-table
         :data="tableData"
         border
+        ref="table"
         :span-method="objectSpanMethod"
         v-loading="loading"
         style="width: 100%"
-        max-height="1000px">
+        :height="tableHeight">
           <el-table-column
             prop="pRightName"
             label="权要"
@@ -133,14 +134,41 @@ export default {
       Index_row: [],
       isNum: 1,
       isTypeBy:0,
+      tableHeight:null,
     };
   },
+  watch: {
+    tableData(){
+      this.$nextTick(() => {
+        this.setHeight()
+      })
+    },
+  },
   mounted() {
     // console.log( this.$s.getSession('reportMessage1'),this.reportId);
     // this.splitPatentRight()
     this.getSplitMessage()
+    console.log(this.reportId);
   },
   methods: {
+    setHeight() {
+      const offsetTop = window.innerHeight - this.$refs.table.$el.offsetTop - 40
+      this.height = offsetTop
+      const body = document.querySelector('.el-table__body')
+      if (!body) {
+        return false
+      }
+      const offsetBodyHeight = body.offsetHeight
+      //console.log( window.innerHeight,body,offsetBodyHeight,offsetTop)
+      if (this.tableData.length && offsetBodyHeight < offsetTop) {
+        this.tableHeight = offsetBodyHeight + 75
+      } else if (!this.tableData.length) {
+        this.tableHeight = null
+      } else {
+        this.tableHeight = offsetTop
+      }
+      this.tableHeight = this.tableHeight>200?this.tableHeight:200
+    },
     //完成
     // finish() {
     //   this.$confirm('请您确定任务不再修改, 是否继续?', '提示', {

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

@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -1,18 +1,22 @@
 <template>
   <div>
-    <avoid-Direction :patentNo="patentNo" :reportId="reportId" :splitBy="splitBy" :splitType="splitType"></avoid-Direction>
+    <avoid-Direction :patentNo="patentNo?patentNo:patentNos" :reportId="reportId?reportId:reportIds" :splitBy="splitBy?splitBy:splitBys" :splitType="splitType?splitType:splitTypes"></avoid-Direction>
   </div>
 </template>
 
 <script>
 import avoidDirection from '@/views/report/avoid/avoidPage/avoidDirection.vue'
 export default {
+  props:['row'],
   components: {
     avoidDirection
   },
   data() {
     return {
-
+      patentNos:this.row.signPatentNo,
+      reportIds:this.row.id,
+      splitBys:this.row.splitBy,
+      splitTypes:this.row.splitType,
     }
   },
   computed: {
@@ -29,6 +33,9 @@ export default {
       return this.$route.query.splitType
     },
   },
+  mounted() {
+    console.log(this.row);
+  },
   
 }
 </script>

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

@@ -228,6 +228,11 @@ export default {
           window.open(router.href, '_blank');
           break;
         case 5:
+          var router = this.$router.resolve({
+              name: 'avoidAside' ,
+            })
+            window.open(router.href, '_blank');
+          break;
         case 6:
       }