专利挖掘bug修复

src/views/patentMining/components/details/components/drawer.vue

@@ -8,7 +8,7 @@
           </el-tabs>
         </el-header>
         <el-main>
-          <component :is='activeName' :id="id"></component>
+          <component :is='activeName' :id="id" :pathObj="pathObj"></component>
         </el-main>
       </el-container>
     </el-drawer>
@@ -38,6 +38,7 @@ export default {
           path: 'FileMessage'
         },
       ],
+      pathObj:{},
     }
   },
   mounted() {
@@ -46,6 +47,7 @@ export default {
   methods: {
     // 打开
     open(data) {
+      this.pathObj=data
       this.drawer = true
     },
     // 关闭

src/views/patentMining/components/details/components/projectPath.vue

@@ -6,10 +6,19 @@
     <svg viewBox="0 0 1800 400" width="100%" height="100%">
       <g transform=translate(0,0) class="svgG">
         <g @click="toDrawer('创新点梳理', 1)">
-          <rect width="200" height="120" :fill="getColor('创新点梳理')"> </rect>
+          <rect width="200" height="120" :fill="getColor('创新点梳理',1)"> </rect>
           <text x="30" y="65">创新点梳理</text>
-          <circle cx="150" cy="60" r="16" stroke-width="1" stroke="#fff" :fill="getColor('创新点梳理')" />
-          <text :x="getNumber('创新点梳理') > 9 ? '140' : '145'" y="65" fill="#fff">{{ getNumber('创新点梳理') }}</text>
+        </g>
+        <g @click="toFilePage('创新点梳理', 1,'任务')">
+          <text x="120" y="45">任务：</text>
+          <circle cx="180" cy="40" r="16" stroke-width="1" stroke="#fff" :fill="getColor('创新点梳理',1)" />
+          <text :x="getNumber('创新点梳理',1) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('创新点梳理',1, '任务') }}</text>
+          <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
+        </g>
+        <g @click="toFilePage('创新点梳理', 1,'文件')">
+          <text x="120" y="85">文件：</text>
+          <circle cx="180" cy="80" r="16" stroke-width="1" stroke="#fff" :fill="getColor('创新点梳理',1)" />
+          <text :x="getNumber('创新点梳理',1) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('创新点梳理',1 , '文件') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
         <polygon points="350,55,360,60,350,65"></polygon>
@@ -93,7 +102,16 @@ export default {
   props: ['id'],
   data() {
     return {
-      numObj: {
+      numFileObj: {
+        '创新点梳理': 2,
+        '查新检索': 0,
+        '保护主题规划': 0,
+        '独权撰写': 0,
+        '从权撰写': 0,
+        '申请文件定稿': 0,
+        '说明书规划撰写': 0,
+      },
+      numTaskObj: {
         '创新点梳理': 2,
         '查新检索': 0,
         '保护主题规划': 0,
@@ -123,13 +141,18 @@ export default {
       })
     },
     // 获取文件数量
-    getNumber(str) {
-      return this.numObj[str]
+    getNumber(str, id, type) {
+      if (type == '任务') {
+        return this.numTaskObj[str]
+      } else {
+        return this.numFileObj[str]
+      }
     },
     // 获取背景颜色
     getColor(str) {
       return this.getNumber(str) > 0 ? '#5ed325' : 'pink'
     },
+    // 打开抽屉弹窗
     toDrawer(str, id) {
       let obj = {
         pathName: str,
@@ -138,10 +161,11 @@ export default {
       this.$emit('on-drawer',obj)
     },
     // 跳转文件列表界面
-    toFilePage(str, id) {
+    toFilePage(str, id , type) {
       let obj = {
         pathName: str,
-        pathId: id
+        pathId: id,
+        type:type
       }
       this.$emit('grandson',obj)
     },

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

@@ -47,8 +47,11 @@ export default {
   },
   watch: {
     activeName(val) {
-      if (val != 'FileMessage') {
-        this.pathObj=''
+      if (val != 'FileMessage' || val != 'ExcavateTaskIndex') {
+        this.$nextTick(() => {
+          this.pathObj=''
+        })
+        
       }
     },
   },
@@ -64,7 +67,11 @@ export default {
     // 项目流程孙传祖的值，用于跳转文件列表
     handleGrandson(val) {
       if (val) {
-        this.activeName = 'FileMessage'
+        if (val.type == '任务') {
+          this.activeName = 'ExcavateTaskIndex'
+        } else {
+          this.activeName = 'FileMessage'
+        }
         this.pathObj=val
       }
     },

src/views/patentMining/components/excavateTask/index.vue

@@ -13,7 +13,7 @@
 import Table from '@/views/task/components/table.vue'
 
 export default {
-  props:['id'],
+  props:['id','pathObj'],
   components: {
     // excavateTask
     Table,
@@ -21,13 +21,16 @@ export default {
   data() {
     return {
       obj: {
-        search:{projectId:this.id},
+        search: {
+          projectId: this.id?this.id:'',
+          processId: this.pathObj ? this.pathObj.pathId : '',
+        },
       },
     }
   },
   computed: {},
   mounted() {
-
+    
   },
   methods: {
 

src/views/patentMining/components/fileMessage.vue

@@ -79,17 +79,7 @@ export default {
         true:'是',
       },
       // 数据源
-      tableData: [
-        {
-          fileName: '加热器',
-          uploader: '朱豪',
-          status: '处理中',
-          uploadTime: '2023-9-28 17:09',
-          type: '',
-          endFile: '否',
-          id: 1
-        }
-      ],
+      tableData: [],
       // table栏位信息
       columnList: [
         {
@@ -135,6 +125,8 @@ export default {
       searchOption: {},
       //排序字段
       sort: [{ "orderBy": "createTime", "orderType": 1 }],
+      // 复制传过来的参数
+      pathObjCopy:JSON.parse(JSON.stringify(this.pathObj)),
     }
   },
   watch: {
@@ -148,9 +140,9 @@ export default {
     // 获取table栏位
     this.columnList = await this.$commonJS.getCustomField('patentDigProjectFiles')
     // 获取栏位
-    this.getColumn()
+    await this.getColumn()
     // 获取数据
-    this.getList()
+    await this.getList()
   },
   methods: {
     // 新增/更新文件列表成功
@@ -176,9 +168,9 @@ export default {
       })
     },
     // 获取数据
-    getList() {
+    async getList() {
       let searchOption = {
-        processId: this.pathObj.id || '',//流程节点id
+        processId: this.pathObjCopy?this.pathObjCopy.pathId : '',//流程节点id
         projectId: this.id,//固有检索
         ...this.searchOption
       }
@@ -187,6 +179,7 @@ export default {
         searchQuery: this.$commonJS.objectToString(searchOption || {}),//检索条件
         orderDTOList: this.sort,//排序信息
       }
+      
       this.$api.queryPatentDigProjectFiles(params).then(res => {
         if (res.code == 200) {
           this.tableData = res.data.data

src/views/task/components/table.vue

@@ -75,14 +75,14 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { column } from '@/views/patentMining/components/mixins/index2'
+import { column,optionsData} from '@/views/patentMining/components/mixins/index2'
 import { taskPatentMining } from './mixins/task'
 import auditRecords from '@/views/patentMining/components/dialog/auditRecords.vue'
 import createTask from '@/views/patentMining/components/dialog/createTask.vue'
 import handleTask1 from '@/views/patentMining/components/dialog/handleTask1.vue'
 import handleTask2 from '@/views/patentMining/components/dialog/handleTask2.vue'
 export default {
-  mixins: [column, taskPatentMining],
+  mixins: [column,optionsData, taskPatentMining],
   props: ['type', 'id', 'obj'],
   components: {
     auditRecords,
@@ -93,64 +93,7 @@ export default {
   data() {
     return {
       // table数据
-      tableData: [
-        {
-          name: '加热器专利挖掘1',
-          taskType: '1',
-          createPerson: '朱豪',
-          handlerName: '张三',
-          createTime: '2023-9-28 13:52',
-          endTime: '2023-9-28 18:02',
-          status: '未完成'
-        },
-        {
-          name: '加热器专利挖掘2',
-          taskType: '1',
-          createPerson: '朱豪',
-          handlerName: '朱豪',
-          createTime: '2023-9-28 13:52',
-          endTime: '2023-9-28 18:02',
-          status: '未完成'
-        },
-        {
-          name: '加热器专利挖掘3',
-          taskType: '2',
-          createPerson: '张三',
-          handlerName: '朱豪',
-          createTime: '2023-9-28 13:52',
-          endTime: '2023-9-28 18:02',
-          status: '未完成'
-        },
-        {
-          name: '加热器专利挖掘4',
-          taskType: '3',
-          createPerson: '朱豪',
-          handlerName: '朱豪',
-          createTime: '2023-9-28 13:52',
-          endTime: '2023-9-28 18:02',
-          status: '未完成',
-          taskPath: '创新点梳理',
-          endTime: '2023-10-10',
-        },
-        {
-          name: '加热器专利挖掘5',
-          taskType: '1',
-          createPerson: '张三',
-          handlerName: '朱豪',
-          createTime: '2023-9-28 13:52',
-          endTime: '2023-9-28 18:02',
-          status: '已完成'
-        },
-        {
-          name: '加热器专利挖掘6',
-          taskType: '1',
-          createPerson: '朱豪',
-          handlerName: '张三',
-          createTime: '2023-9-28 13:52',
-          endTime: '2023-9-28 18:02',
-          status: '已完成'
-        },
-      ],
+      tableData: [],
       // 分页及总数信息
       queryParams: {
         current: 1,
@@ -194,7 +137,7 @@ export default {
     // 获取table栏位
     this.columnList = await this.$commonJS.getCustomField('projectTask')
     // 获取栏位
-    this.getColumn()
+    await this.getColumn()
     // 获取数据
     this.getList()
   },
@@ -461,7 +404,9 @@ export default {
               })
             }
           }
-
+          var obj3 = this.searchFiled.find(item => { return item.label == '所属流程' })
+          obj3.options=this.pathOptions
+          
         }
       })