Merge branch 'common' of ssh://gitlab.redhtc.com:1422/Berlincen/DA-Platform into common

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;任务状态：{{'已完成'}}&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/ongoingtask.vue

@@ -5,11 +5,11 @@
         <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.date}}&emsp;&emsp;分片数量:{{item.number}}&emsp;&emsp;发布者：{{item.creater}}&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" @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
         }
       ]
     },