报告详情

src/router/index.js

@@ -259,6 +259,16 @@ const routes = [
             },
             component: () => import('@/views/report/index.vue'),
           },
+          {
+            path:'/reportDetails',
+            name:'reportDetails',
+            meta: {
+              title: '报告详情',
+              sign:'reportDetails',
+              belong:'AllReport'
+            },
+            component: () => import('@/views/report/components/details'),
+          },
       //     //无效分析、第三方意见、稳定性分析
       //     {
       //       path: '/InvalidIndex',

src/views/project/patentCollection/components/views/Table.vue

@@ -10,7 +10,7 @@
       <el-table-column v-for="item in column.filter(item => !item.ifHidden)" :render-header="$commonJS.renderHeaderMethods"
         :key="item.value" :prop="item.value" :label="item.name" sortable="custom" align="center">
         <template slot-scope="scope">
-          <div v-if="['name'].includes(item.value)">
+          <div v-if="['patentNo'].includes(item.value)">
             <el-link type="primary" @click="handleClick(scope.row, item.value)">
               <span v-html="$commonJS.getColumnData(scope.row, item)"></span>
             </el-link>

src/views/project/patentCollection/index.vue

@@ -112,6 +112,7 @@
     </el-container>
 
     <Field-Drawer ref="FieldDrawer"></Field-Drawer>
+    <field ref="field" type="patent" @getFieldList="getFieldList"></field>
   </div>
 </template>
 
@@ -122,12 +123,14 @@ import PatentAbstractListView from './components/views/Abstract'
 import PatentTableListView from './components/views/Table.vue'
 import PatentPictureListView from './components/views/Picture'
 // import PatentPDFListView from './components/views/PDF.vue'
+import field from '@/views/components/dialog/fields.vue';
 export default {
   components: {
     FieldDrawer,
     PatentAbstractListView,
     PatentTableListView,
-    PatentPictureListView
+    PatentPictureListView,
+    field
   },
   props: {},
   data() {
@@ -297,29 +300,17 @@ export default {
       this.getList();
     },
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     //自定义栏位管理
     handleField() {
       this.$refs.FieldDrawer.open(5)
     },
+    //获取自定义栏位
+    getFieldList(data) {
+      this.customList = data
+    },
     //显示栏位管理
     async handleFieldManage() {
-      this.$refs.patentViewField.open(this.patentViewField, this.projectId, this.viewSelected)
+      this.$refs.field.open(this.customList)
     },
     //批量上传说明书
     handleBatch() {

src/views/project/patentDetails/components/menu.vue

@@ -9,7 +9,7 @@
               <patent-keywords-highlight :project-id="projectId" />
             </el-popover>
             <el-tooltip content="返回专题库专利清单" placement="top">
-              <el-button size="small" @click="handleClick"><i class="iconfont icon-fanhui"></i></el-button>
+              <el-button size="small" @click="goBack()"><i class="iconfont icon-fanhui"></i></el-button>
             </el-tooltip>
             <el-tooltip :content="isRight ? '设置菜单栏为左侧' : '设置菜单栏为右侧'" placement="top">
               <el-button size="small" class="articles-Loop" @click="isRight = !isRight">
@@ -44,7 +44,7 @@
       <div v-else class="articles-Loop-div">
         <el-tooltip content="返回专题库专利清单" placement="right">
           <div class="articles-Loop">
-            <i class="iconfont icon-fanhui"></i>
+            <i class="iconfont icon-fanhui" @click="goBack()"></i>
           </div>
         </el-tooltip>
         <el-tooltip :content="isRight ? '设置菜单栏为左侧' : '设置菜单栏为右侧'" placement="right-end">
@@ -66,7 +66,7 @@
           </el-popover>
         </el-tooltip>
         <el-tooltip content="对比" placement="right-end">
-          <div class="articles-Loop" @click="value = !value" :style="{ background: value ? '#9cb2e5' : 'white' }">
+          <div class="articles-Loop" @click="contrast()" :style="{ background: value ? '#9cb2e5' : 'white' }">
             <i v-if="!value" class="iconfont icon-duibi"></i>
             <i v-else class="iconfont icon-duibi1"></i>
           </div>
@@ -119,12 +119,19 @@ export default {
     //分页
     handleCurrentChange(val){
         this.queryParams.current = val
+    },
+    goBack(){
+
+    },
+    contrast(){
+      this.value = !this.value
+      this.$emit('contrast',this.value)
     }
   },
 };
 </script>
 <style lang="scss" scoped>
-.articles_menu{
+.article_menu{
 .articles-Loop-div {
     width: 51px;
     height: 100%;

src/views/project/patentDetails/components/patentDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="height_100">
     <el-container>
         <el-header style="min-height: 100px !important;height: auto;">
             <div class="patent-articles-title-box">

src/views/project/patentDetails/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="height_100 article">
-    <articleMenu></articleMenu>
+    <articleMenu @contrast="contrast"></articleMenu>
     <div class="height_100">
-        <my-View>
+        <my-View :showView="showView">
             <div slot="left">
               <Patent-Details></Patent-Details>
             </div>
@@ -26,13 +26,18 @@ export default {
   props: {},
   data() {
     return {
+      showView:false,
     };
   },
   watch: {},
   computed: {},
   created() {},
   mounted() {},
-  methods: {},
+  methods: {
+    contrast(val){
+      this.showView = val
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/report/components/details/components/basicMessage.vue

@@ -0,0 +1,21 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {},
+  data() {
+    return {
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/report/components/details/index.vue

@@ -1,6 +1,19 @@
 <template>
-  <div>
-    <component :is='componentName'></component>
+  <div class="height_100">
+    <el-container>
+      <el-aside width="200px">
+        <el-menu class="theme-dark" :default-active="activeMenu" @select="changeComponent">
+          <el-menu-item v-for="item in menuList" :key="item.name" :index="item.name" v-if="!item.show">
+            <i class="el-icon-film"></i>
+            <span slot="title">{{item.label}}</span>
+          </el-menu-item>
+        </el-menu>
+      </el-aside>
+      <el-main>
+        <component :is='componentName'></component>
+      </el-main>
+    </el-container>
+    
   </div>
 </template>
 
@@ -10,8 +23,20 @@ export default {
   props: {},
   data() {
     return {
+        activeMenu:'Table',
         componentName:'',
-        menu:[],
+        menuList:[
+          {
+            label:'基本信息',
+            name:'Table',
+            path:'report/components/details/components/basicMessage.vue'
+          },
+          {
+            label:'任务清单',
+            name:'task',
+            path:'task/components/index.vue'
+          }
+        ],
         comments:{}
     };
   },
@@ -23,20 +48,33 @@ export default {
   },
   methods: {
     getMenu(){
-        this.menu = [
-            {
-                name:'Table',
-                path:'task/components/index.vue'
-            },
-            {
-                name:'report',
-                path:'report/components/index.vue'
-            }
-        ]
+      var menu = [
+        {
+          label:'标的专利特征拆分',
+          name:'splitPatent',
+          path:'task/components/index.vue'
+        },
+        { 
+          label: '回避设计方案', 
+          name:"avoid",
+          path:'report/avoid/components/avoidDirection.vue'
+        }, 
+        { 
+          label: '回避设计结果', 
+          name:"direction",
+          path:'report/avoid/components/avoidDirection.vue'
+        },
+        { 
+          label: '报告文档', 
+          name:"reportFile",
+          path:'report/components/reportFile/reportFileTable.vue'
+        },
+      ]
+        this.menuList.splice(1,0,...menu)
         this.getComponents()
     },
     getComponents(){
-        this.menu.forEach((item,index)=>{
+        this.menuList.forEach((item,index)=>{
          import(`@/views/${item.path}`).then(res=>{
           this.comments[item.name] = res.default
           if(index == 0){
@@ -46,8 +84,10 @@ export default {
       })
     },
     changeComponent(name){
+      this.activeMenu = name
         this.componentName = this.comments[name]
-    }
+    },
+
   },
 };
 </script>

src/views/report/components/mixins/index.js

@@ -24,7 +24,11 @@ export default {
   methods: {
     // 点击名称等事件
     handleItem(row, key) {
-      
+      this.$router.push(
+        {
+          path:'/reportDetails'
+        }
+      )
     },
     //操作列事件
     handleCommand(option, row) {

src/views/task/components/index.vue

@@ -187,7 +187,6 @@ export default {
         searchQuery: this.$commonJS.objectToString(searchOption),//检索条件
         orderDTOList: this.sort,//排序信息
       }
-      
       this.$api.queryProjectTask(params).then(response => {
         if (response.code == 200) {
           this.tableData = response.data.data