Merge remote-tracking branch 'origin/develop' into develop

DAPlatform-front/src/components/OngoingTaskDetail.vue

@@ -8,7 +8,7 @@
           发布时间：{{task.date|formatDate}}
         </el-col>
         <el-col offset="11" span="5">
-          <el-button type="primary" plain>提交标注</el-button>
+          <el-button type="primary" plain @click="finsihTask">提交标注</el-button>
           <el-button plain @click="giveUpTask">放弃任务</el-button>
         </el-col>
         </el-row></p>
@@ -101,7 +101,7 @@ export default {
                       type: 'info',
                       message: '任务已放弃标注'
                   });
-                  this.$router.push({ path: "/ongoingtask" });
+                  this.$router.push({ path: "/ongoing" });
                 }
                 else{
                   this.$message({
@@ -117,7 +117,34 @@ export default {
                 message: '已取消放弃任务'
             });
         });
-    }
+    },
+     finsihTask(){
+     //   判断分片完成度是否都为100%
+         console.log("piece")
+        console.log(piece)
+         // this.axios({
+         //     method:'post',
+         //     url:'task/finsihTask',
+         //     params:{
+         //         userId:this.$store.state.userInfo.userId,
+         //         taskId:this.task.id
+         //     }
+         // }).then(res=>{
+         //      if(res.code == 1){
+         //          this.$message({
+         //              type:'info',
+         //              message:"完成任务"
+         //          })
+         //          this.$router.push({ path: "/ongoing" });
+         //      }
+         //      else{
+         //          this.$message({
+         //              type:'info',
+         //              message:"提交任务失败"
+         //          })
+         //      }
+         // })
+     }
   }
 }
 </script>