Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/api/newApi/task.js

@@ -80,4 +80,10 @@ export default {
   updateTaskStatus(params) {
     return axios.get("/xiaoshi/projectTask/updateTaskStatus", {params});
   },
+  /**
+   * 查询专利挖掘流程节点相关的任务/文件数量
+   */
+  getCountOfProcess(params) {
+    return axios.get("/xiaoshi/patentDigProjectFiles/getCountOfProcess", {params});
+  },
 };

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

@@ -14,13 +14,13 @@
         <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, 'task') }}</text>
+          <text :x="getNumber('创新点梳理',1) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('创新点梳理',1, 'taskCount') }}</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 , 'file') }}</text>
+          <text :x="getNumber('创新点梳理',1) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('创新点梳理',1 , 'fileCount') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
         <polygon points="350,55,360,60,350,65"></polygon>
@@ -35,13 +35,13 @@
         <g>
           <text x="120" y="45">任务：</text>
           <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('查新检索',2)" />
-          <text :x="getNumber('查新检索',2) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('查新检索',2,'task') }}</text>
+          <text :x="getNumber('查新检索',2) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('查新检索',2,'taskCount') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
         <g>
           <text x="120" y="85">文件：</text>
           <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('查新检索',2)" />
-          <text :x="getNumber('查新检索',2) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('查新检索',2,'file') }}</text>
+          <text :x="getNumber('查新检索',2) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('查新检索',2,'fileCount') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
         <polygon points="350,55,360,60,350,65"></polygon>
@@ -56,13 +56,13 @@
         <g>
           <text x="120" y="45">任务：</text>
           <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('保护主题规划',3)" />
-          <text :x="getNumber('保护主题规划',3) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('保护主题规划',3,'task') }}</text>
+          <text :x="getNumber('保护主题规划',3) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('保护主题规划',3,'taskCount') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
         <g>
           <text x="120" y="85">文件：</text>
           <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('保护主题规划',3)" />
-          <text :x="getNumber('保护主题规划',3) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('保护主题规划',3,'file') }}</text>
+          <text :x="getNumber('保护主题规划',3) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('保护主题规划',3,'fileCount') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
 
@@ -78,13 +78,13 @@
         <g>
           <text x="120" y="45">任务：</text>
           <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('独权撰写',4)" />
-          <text :x="getNumber('独权撰写',4) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('独权撰写',4,'task') }}</text>
+          <text :x="getNumber('独权撰写',4) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('独权撰写',4,'taskCount') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
         <g>
           <text x="120" y="85">文件：</text>
           <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('独权撰写',4)" />
-          <text :x="getNumber('独权撰写',4) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('独权撰写',4,'file') }}</text>
+          <text :x="getNumber('独权撰写',4) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('独权撰写',4,'fileCount') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
 
@@ -101,13 +101,13 @@
         <g>
           <text x="120" y="45">任务：</text>
           <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('从权撰写',5)" />
-          <text :x="getNumber('从权撰写',5) > 9 ? '170' : '175'"  y="45" fill="#fff">{{ getNumber('从权撰写',5,'task') }}</text>
+          <text :x="getNumber('从权撰写',5) > 9 ? '170' : '175'"  y="45" fill="#fff">{{ getNumber('从权撰写',5,'taskCount') }}</text>
           <line x1="100" y1="120" x2="100" y2="190" stroke='#333'></line>
         </g>
         <g>
           <text x="120" y="85">文件：</text>
           <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('从权撰写',5)" />
-          <text :x="getNumber('从权撰写',5) > 9 ? '170' : '175'"  y="85" fill="#fff">{{ getNumber('从权撰写',5,'file') }}</text>
+          <text :x="getNumber('从权撰写',5) > 9 ? '170' : '175'"  y="85" fill="#fff">{{ getNumber('从权撰写',5,'fileCount') }}</text>
           <line x1="100" y1="120" x2="100" y2="190" stroke='#333'></line>
         </g>
         <polygon points="95,190,100,200,105,190"></polygon>
@@ -128,13 +128,13 @@
         <g>
           <text x="120" y="45">任务：</text>
           <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('申请文件定稿',6)" />
-          <text :x="getNumber('申请文件定稿',6) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('申请文件定稿',6,'task') }}</text>
+          <text :x="getNumber('申请文件定稿',6) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('申请文件定稿',6,'taskCount') }}</text>
           <line x1="0" y1="60" x2="-150" y2="60" stroke='#333'></line>
         </g>
         <g>
           <text x="120" y="85">文件：</text>
           <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('申请文件定稿',6)" />
-          <text :x="getNumber('申请文件定稿',6) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('申请文件定稿',6,'file') }}</text>
+          <text :x="getNumber('申请文件定稿',6) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('申请文件定稿',6,'fileCount') }}</text>
           <line x1="0" y1="60" x2="-150" y2="60" stroke='#333'></line>
         </g>
         <polygon points="-150,55,-160,60,-150,65"></polygon>
@@ -148,12 +148,12 @@
         <g>
           <text x="120" y="45">任务：</text>
           <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('说明书规划撰写',7)" />
-          <text :x="getNumber('说明书规划撰写',7) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('说明书规划撰写',7,'task') }}</text>
+          <text :x="getNumber('说明书规划撰写',7) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('说明书规划撰写',7,'taskCount') }}</text>
         </g>
         <g>
           <text x="120" y="85">文件：</text>
           <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('说明书规划撰写',7)" />
-          <text :x="getNumber('说明书规划撰写',7) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('说明书规划撰写',7,'file') }}</text>
+          <text :x="getNumber('说明书规划撰写',7) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('说明书规划撰写',7,'fileCount') }}</text>
         </g>
       </g>
     </svg>
@@ -181,15 +181,15 @@ export default {
   },
   computed: {},
   async mounted() {
-    // await this.getFileNumber()
+    await this.getFileNumber()
   },
   methods: {
     // 获取流程节点及相对应的文件
     async getFileNumber() {
       let params = {
-        id: this.id,
+        projectId: this.id,
       }
-      await this.$api.query(params).then(response => {
+      await this.$api.getCountOfProcess(params).then(response => {
         if (response.code == 200) {
           this.numObj = response.data
         }
@@ -199,11 +199,11 @@ export default {
     },
     // 获取文件数量
     getNumber(str, id, type) {
-      return this.numObj[str][type]
+      return this.numObj[id][type]
     },
     // 获取背景颜色
-    getColor(str) {
-      let num=this.numObj[str].task + this.numObj[str].file
+    getColor(str,id) {
+      let num=this.numObj[id].taskCount + this.numObj[id].fileCount
       return num > 0 ? '#5ed325' : 'pink'
     },
     // 打开抽屉弹窗

src/views/patentMining/components/dialog/uploadFile.vue

@@ -69,8 +69,8 @@ export default {
       }
       this.$api.addPDProjectFilesTask(patentDigProjectFilesDTO).then(res => {
         if (res.code == 200) {
-          this.getList()
-          this.$refs.examine.close()
+          this.$emit('isSuccess', '新增成功')
+          this.$refs.examine.handleCloseTask()
           this.handleClose()
         }
       })

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

@@ -1,16 +1,12 @@
 <template>
   <div class="height_100">
-    <!-- <excavateTask :id="id"></excavateTask> -->
-    <Table :type="1" :id="id" :obj="obj">
-    </Table>
-
-    <!-- <createTask ref="createTaskDialog" @isCreate="isCreate"></createTask> -->
+    <Table :type="1" :id="id" :obj="obj"></Table>
   </div>
 </template>
 
 <script>
 // import excavateTask from './excavateTask.vue'
-import Table from '@/views/task/components/table.vue'
+import Table from '@/views/task/components/index.vue'
 
 export default {
   props:['id','pathObj'],

src/views/task/components/table.vue

@@ -258,34 +258,8 @@ export default {
       if (row.status != 2 || row.handlerName != this.userinfo.name) {// 负责人不是自己
         this.handleTypeTask2(row)
       } else {
-        // if (row.status != 3) {/
         this.handleTypeTask(row)
-        // }
       }
-
-
-
-      // if (row.handlerName != this.userinfo.name) {// 负责人不是自己
-      //   if (row.taskType == '1') {// 项目审核任务
-      //     this.$refs.handleTask1Dialog.open(row, false)
-      //   } else if (row.taskType == '2') {//文件分配任务
-      //     this.$refs.handleTask2Dialog.open(row, false)
-      //   }
-      // } else {//未完成状态
-      //   if (row.taskType == '1') {// 项目审核任务
-      //     this.$refs.handleTask1Dialog.open(row, true)
-      //   } else if (row.taskType == '2') {//文件分配任务
-      //     this.$refs.handleTask2Dialog.open(row, true)
-      //   } else {//文件审核任务
-      //     let router = this.$router.resolve({
-      //       path: '/handleExamine',
-      //       query: {
-      //         row: JSON.stringify(row)
-      //       }
-      //     })
-      //     window.open(router.href, '_blank')
-      //   }
-      // }
     },
     // 处理人和负责人相同是处理流程
     handleTypeTask(row) {
@@ -294,6 +268,7 @@ export default {
           this.getPatentMining(row,2)
           break;
         case 5://任务审核任务
+        case 7://文件审核任务
           row.disabled = false
           let router = this.$router.resolve({
             path: '/handleExamine',
@@ -419,10 +394,6 @@ export default {
         }
       })
 
-      // this.showView = false
-      // this.$nextTick(() => {
-      //   this.showView = true
-      // })
     },
 
   },

src/views/task/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
-    <table></table>
+    <Table></Table>
   </div>
 </template>
 
 <script>
-import table from './components/table.vue'
+import Table from './components/index.vue'
 export default {
   components: {
-    table
+    Table
   },
   data() {
     return {