add ongoingtaskdetail

DAPlatform/src/components/CompletedTask.vue

@@ -5,11 +5,12 @@
         <div class="tasklist">
           <div class="task-item" v-for="(item, index) in tasks" :key='index'>
             <div>{{item.title}}</div>
-            <div>发布时间：{{item.date}}&emsp;&emsp;分片数量:{{item.number}}&emsp;&emsp;
+            <div>发布者:{{item.creater}}&emsp;&emsp;发布时间：{{item.date}}&emsp;&emsp;分片数量:{{item.number}}&emsp;&emsp;任务状态：{{'已完成'}}
               <span v-if="item.type == 'text'">文本大小：{{item.size}}k</span>
               <span v-else>图片张数：{{item.size}}张</span>
             </div>
-            <el-button class="task-enter-btn1" type="primary" plain>查看任务详情</el-button>
+            <el-button class="task-enter-btn1" type="primary" plain>查看任务</el-button>
+            <el-button class="task-enter-btn2" type="primary" plain>导出任务</el-button>
           </div>
         </div>
         <div class="page-navigator">
@@ -95,7 +96,12 @@
             }
             .task-enter-btn1{
               position: absolute;
-              right: 10px;
+              right: 120px;
+              bottom: 10px;
+            }
+            .task-enter-btn2{
+              position: absolute;
+              right: 0px;
               bottom: 10px;
             }
           }

DAPlatform/src/components/OngoingTaskDetail.vue

+<template>
+    <div class="task-container">
+        <div class="task-panel">
+            <h2>桥梁勘测文件标注</h2>
+            <p>发布者：小明</p>
+            <p>发布时间：2019-12-13</p>
+            <p v-if="task.type == 'text'">文本大小：{{task.size}}k</p>
+            <p v-else>图片张数：20张</p>
+            <el-divider></el-divider>
+          <div class="tasklist">
+            <div class="task-item" v-for="(item, index) in tasks" :key='index'>
+              <div>{{item.title}}</div>
+              <div>模板：{{item.moban}}&emsp;
+                <span v-if="item.type == 'text'">文本大小：{{item.size}}k</span>
+                <span v-else>图片张数：{{item.size}}张</span>
+              </div>
+              <el-button class="task-enter-btn" type="primary" plain @click="enterTask(item)">进入任务</el-button>
+            </div>
+          </div>
+          <div class="page-navigator">
+            <el-pagination
+              :page-size="20"
+              :pager-count="11"
+              layout="prev, pager, next"
+              :total="1000">
+            </el-pagination>
+          </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: 'task',
+  data () {
+    return {
+      tasks:[
+        {
+          title:'分片1',
+          moban:'moban1',
+          type:'text',
+          size:20,
+        },
+        {
+          title:'分片1',
+          moban:'moban1',
+          type:'text',
+          size:20,
+        },{
+          title:'分片1',
+          moban:'moban1',
+          type:'text',
+          size:20,
+        },{
+          title:'分片1',
+          moban:'moban1',
+          type:'text',
+          size:20,
+        },
+      ]
+    }
+  },
+  mounted () {
+    var self = this
+    var task = JSON.parse(decodeURIComponent(this.$route.params.task))
+    this.task = task
+    // 根据任务id拉取分片信息
+    this.axios.get('/getPieces', {
+      params: {
+        id: task.id
+      }
+    }).then(res => {
+      var piecesMap = {}
+      var pieces = []
+      for (let piece of res.data.data) {
+        piecesMap[piece.id] = piece.fileNum
+        pieces.push(piece.id)
+      }
+      self.piecesMap = piecesMap
+      self.pieces = pieces
+    })
+  },
+  methods: {
+    handleCheckAllChange (val) {
+      this.checkedPieces = val ? this.pieces : []
+      this.isIndeterminate = false
+    },
+    handleCheckedPiecesChange (value) {
+      let checkedCount = value.length
+      this.checkAll = checkedCount === this.pieces.length
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.pieces.length
+      console.log(value)
+    },
+    begin () {
+      if (this.checkedPieces.length === 0) {
+        alert('请选择分片')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/config.scss';
+@import '@/assets/scss/mixin.scss';
+.task-container{
+    @include container;
+    .task-panel{
+        @include whiteBoard;
+        text-align: left;
+        padding: 30px 20px 30px 20px;
+    }
+    .pieces{
+        margin-bottom: 30px;
+        .el-checkbox{
+            margin-left: 0;
+            margin-bottom: 15px;
+        }
+    }
+}
+</style>

DAPlatform/src/components/ongoingtask.vue

@@ -9,7 +9,7 @@
               <span v-if="item.type == 'text'">文本大小：{{item.size}}k</span>
               <span v-else>图片张数：{{item.size}}张</span>
             </div>
-            <el-button class="task-enter-btn1" type="primary" plain>查看任务详情</el-button>
+            <el-button class="task-enter-btn1" @click="detail()" type="primary" plain>查看任务详情</el-button>
           </div>
         </div>
         <div class="page-navigator">
@@ -49,6 +49,9 @@
       deleteRow(index, rows) {//删除改行
         rows.splice(index, 1);
       },
+      detail(){
+        this.$router.push('/ongoingdetail')
+      }
     }
   }
 </script>

DAPlatform/src/router/index.js

@@ -9,6 +9,7 @@ import check from '../components/CheckTask'
 import release from '../components/ReleaseTask'
 import publishtask from '../components/PublishTask'
 import ongoingtask from '../components/ongoingtask'
+import ongoingtaskdetail from '../components/OngoingTaskDetail'
 
 Vue.use(Router)
 
@@ -59,6 +60,11 @@ export default new Router({
           path: '/ongoing',
           name: ongoingtask,
           component: ongoingtask
+        },
+        {
+          path: '/ongoingdetail',
+          name: ongoingtaskdetail,
+          component: ongoingtaskdetail
         }
       ]
     },