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

DAPlatform/src/components/CompletedTask.vue

 <template>
-
+  <div class="taskhall">
   <el-container>
-  <el-main>
+  <el-main style="background-color: #FFFFFF">
       <el-table
     :data="tableData"
+    :header-cell-style="{color:'#409EFF'}"
     height="570"
     border
     style="width: 100%">
@@ -55,7 +56,7 @@
   </el-main>
 
 </el-container>
-
+</div>
 </template>
 <script>
   export default {
@@ -152,6 +153,14 @@
 </script>
 
 <style>
+  .taskhall{
+    width: 90vw;
+    min-width: 800px;
+    /* border: solid; */
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 0px;
+  }
   .el-header, .el-footer {
     background-color: #B3C0D1;
     color: #333;

DAPlatform/src/components/NavHeader.vue

@@ -13,7 +13,7 @@
       <el-menu-item index="/releasetask">发布任务</el-menu-item>
       <el-menu-item index="/completed">已完成任务</el-menu-item>
       <el-menu-item index="/check">待审核任务</el-menu-item>
-      <el-menu-item index="6">我的发布</el-menu-item>
+      <el-menu-item index="/publishtask">我的发布</el-menu-item>
       <el-menu-item index="/userhome">个人中心</el-menu-item>
       <el-menu-item class="logout-btn" index="/">退出登录</el-menu-item>
     </el-menu>

DAPlatform/src/components/PublishTask.vue

+<template>
+<div class="taskhall">
+  <el-container>
+    <el-main style="background-color: #FFFFFF">
+      <el-table
+        :data="tableData"
+        :header-cell-style="{color:'#409EFF'}"
+        height="570"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop="taskId"
+          label="任务ID"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="splitNum"
+          label="分片数量"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          label="发布时间"
+          width="180">
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span style="margin-left: 10px">{{ scope.row.date }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="任务名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="status"
+          label="任务状态"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="180">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text" size="small">修改</el-button>
+            <el-button @click.native.prevent="deleteRow(scope.$index, tableData)" type="text" size="small"> 删除 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-main>
+
+  </el-container>
+</div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        tableData: [{
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '单物体语义分割',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '人脸质量判断',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status:'已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status:'已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status:'已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status: '已发布'
+        }, {
+          taskId:'1',
+          author:'小明',
+          splitNum:'3',
+          date: '2016-05-03',
+          name: '图片属性标注',
+          status:'已发布'
+        }]
+      }
+    },
+    methods: {
+      deleteRow(index, rows) {//删除改行
+        rows.splice(index, 1);
+      },
+    }
+
+  }
+</script>
+
+<style>
+  .el-header, .el-footer {
+    background-color: #B3C0D1;
+    color: #333;
+    text-align: center;
+    line-height: 60px;
+  }
+
+  .el-aside {
+    background-color: #D3DCE6;
+    color: #333;
+    text-align: center;
+    line-height: 200px;
+  }
+
+  .el-main {
+    background-color: #E9EEF3;
+    color: #333;
+    text-align: center;
+    line-height: 36px;
+  }
+
+  body > .el-container {
+    margin-bottom: 40px;
+  }
+
+  .el-container:nth-child(5) .el-aside,
+  .el-container:nth-child(6) .el-aside {
+    line-height: 260px;
+  }
+
+  .el-container:nth-child(7) .el-aside {
+    line-height: 320px;
+  }
+</style>

DAPlatform/src/router/index.js

@@ -7,6 +7,7 @@ import Index from '../components/Index'
 import completed from '../components/CompletedTask'
 import check from '../components/CheckTask'
 import release from '../components/ReleaseTask'
+import publishtask from '../components/PublishTask'
 
 Vue.use(Router)
 
@@ -47,6 +48,11 @@ export default new Router({
           path: '/releasetask',
           name: 'release',
           component: release
+        },
+        {
+          path: '/publishtask',
+          name: publishtask,
+          component: publishtask
         }
       ]
     },