diff --git a/src/pages/modules/errormanage/ErrorInfo.vue b/src/pages/modules/errormanage/ErrorInfo.vue
index 59259d3..5275c98 100644
--- a/src/pages/modules/errormanage/ErrorInfo.vue
+++ b/src/pages/modules/errormanage/ErrorInfo.vue
@@ -120,7 +120,8 @@ export default {
     padding-top 53px
 .con1
   width 1787px
-  height 819px
+  // height 819px
+  height 800px
   background center / 100% 100% url(../../../images/new/bg-con-l.png) no-repeat
   float left
   box-sizing border-box
diff --git a/src/pages/modules/home/home.vue b/src/pages/modules/home/home.vue
index 3313705..74cbbe4 100644
--- a/src/pages/modules/home/home.vue
+++ b/src/pages/modules/home/home.vue
@@ -13,9 +13,9 @@
           <span class="txt01">{{dataInfo.device_info}}</span>
           <div class="line"></div>
         </div>
-        <div class="infoli">
+        <div class="infoli01">
           <span class="title">当前任务</span>
-          <span class="txt">{{dataInfo.task_name}}</span>
+          <span class="txt01">{{dataInfo.task_name}}</span>
           <div class="line"></div>
         </div>
         <div class="infoli">
@@ -57,13 +57,22 @@ export default {
       interTime: this.$store.getters.setTime,
       timer: null,
       // dataInfo: {}
+      // dataInfo: {
+      //   device_info: 'NobleLiftPS10LMT_HuaHai',
+      //   task_name: '无',
+      //   task_status: '有任务未执行',
+      //   task_num: '待执行',
+      //   speed: '0.0m/s',
+      //   error_name: '障碍物告警',
+      //   button_name: '继续搬运'
+      // }
       dataInfo: {
         device_info: 'NobleLiftPS10LMT_HuaHai',
-        task_name: '无',
-        task_status: '有任务未执行',
-        task_num: '待执行',
+        task_name: '任务号：11287-目标点：18-一线起升电机',
+        task_status: '执行中',
+        task_num: '待执行0/2',
         speed: '0.0m/s',
-        error_name: '障碍物告警',
+        error_name: '正常运行',
         button_name: '继续搬运'
       }
     }
@@ -198,10 +207,11 @@ export default {
     float left
     display inline-block
     color #3CC1FF
-    margin-left 54px
+    margin-left 34px
     width 330px
     line-height 36px
     word-wrap break-word
+    font-size 30px
 .infoli
   width 542px
   line-height 94px
@@ -215,7 +225,8 @@ export default {
     float left
     display inline-block
     color #3CC1FF
-    margin-left 54px
+    margin-left 34px
+    font-size 30px
 .infoli3
   line-height 94px
   height 124px
@@ -227,7 +238,8 @@ export default {
     float left
     display inline-block
     color #3CC1FF
-    margin-left 54px
+    margin-left 34px
+    font-size 30px
 .speed-bg
   width 513px
   height 12px
diff --git a/src/pages/modules/taskmanage/CarryPoint.vue b/src/pages/modules/taskmanage/CarryPoint.vue
index 1e205e8..ea3063b 100644
--- a/src/pages/modules/taskmanage/CarryPoint.vue
+++ b/src/pages/modules/taskmanage/CarryPoint.vue
@@ -1,5 +1,22 @@
 <template>
 <div class="main-container">
+  <div class="right_side">
+    <div class="content_wrap">
+      <div class="title_wrap">
+        <h2>搬运起点</h2>
+      </div>
+      <div class="box1">
+        <div class="point-box">
+          <div class="point fl" :class="{'statusbg': pkId === e.point_code}" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">{{e.code_name}}</div>
+        </div>
+      </div>
+      <div class="box2">
+        <div class="btn" @click="toSure">定为目标站点</div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- <div class="main-container">
   <div class="movepoint">
     <div class="con">
       <div class="box0">
@@ -9,14 +26,13 @@
         <div class="point-box">
           <div class="point fl" :class="{'statusbg': pkId === e.point_code}" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">{{e.code_name}}</div>
         </div>
-        <!-- <div class="point fl" :class="{'statusbg': pkId === e.point_code}" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">{{e.code_name}}</div> -->
       </div>
       <div class="box2">
         <div class="btn" @click="toSure">定为目标站点</div>
       </div>
     </div>
   </div>
-</div>
+</div> -->
 </template>
 
 <script>
@@ -28,73 +44,73 @@ export default {
       statusbg: false,
       pkId: '',
       selectObj: {},
-      // dataList: []
-      dataList: [
-        {
-          point_code: '1',
-          code_name: '18-一线起升电机'
-        },
-        {
-          point_code: '2',
-          code_name: 'A-ZD102'
-        },
-        {
-          point_code: '3',
-          code_name: 'A-ZD103'
-        },
-        {
-          point_code: '4',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '5',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '6',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '7',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '8',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '9',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '10',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '11',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '12',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '13',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '14',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '15',
-          code_name: 'A-ZD101'
-        },
-        {
-          point_code: '16',
-          code_name: 'A-ZD101'
-        }
-      ]
+      dataList: []
+      // dataList: [
+      //   {
+      //     point_code: '1',
+      //     code_name: '18-一线起升电机'
+      //   },
+      //   {
+      //     point_code: '2',
+      //     code_name: 'A-ZD102'
+      //   },
+      //   {
+      //     point_code: '3',
+      //     code_name: 'A-ZD103'
+      //   },
+      //   {
+      //     point_code: '4',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '5',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '6',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '7',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '8',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '9',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '10',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '11',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '12',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '13',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '14',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '15',
+      //     code_name: 'A-ZD101'
+      //   },
+      //   {
+      //     point_code: '16',
+      //     code_name: 'A-ZD101'
+      //   }
+      // ]
     }
   },
   created () {
@@ -148,8 +164,9 @@ export default {
     padding-left 39px
     padding-top 48px
 .box1
-  width 1592px
-  height 819px
+  // width 1592px
+  // height 819px
+  height 800px
   background center / 100% 100% url(../../../images/new/bg-task-r2.png) no-repeat
   padding-top 28px
   padding-left 44px
diff --git a/src/pages/modules/taskmanage/TaskLists.vue b/src/pages/modules/taskmanage/TaskLists.vue
index 8732f92..5d5b51e 100644
--- a/src/pages/modules/taskmanage/TaskLists.vue
+++ b/src/pages/modules/taskmanage/TaskLists.vue
@@ -1,5 +1,38 @@
 <template>
 <div class="main-container">
+  <div class="right_side">
+    <div class="content_wrap">
+      <div class="title_wrap">
+        <h2>任务管理</h2>
+      </div>
+      <div class="con1 grid_wrapper">
+        <table>
+          <tr class="t-head">
+            <th><div class="selbox"></div></th>
+            <th>序号</th>
+            <th>任务号</th>
+            <th>目标站点</th>
+            <th>任务状态</th>
+            <th>生成时间</th>
+          </tr>
+          <tr v-for="(e,index) in dataList" :key="e.task_uuid"  @click="toRadio(e, index)">
+            <td><div class="selbox radio_uncheck" :class="{'radio_checked': pkId === e.task_uuid}"></div></td>
+            <td>{{index+1}}</td>
+            <td>{{e.task_num}}</td>
+            <td>{{e.target_point}}</td>
+            <td><span class="icon" :class="{bgred: e.task_status_name ==='生成未执行', bgyellow: (e.task_status_name ==='执行中' || e.task_status_name ==='完成')}"></span>{{e.task_status_name}}</td>
+            <td>{{e.create_time}}</td>
+          </tr>
+        </table>
+        <div class="subbar">
+          <button class="btn btn1" @click="toDel(selectIndex)">任务取消</button>
+          <button class="btn btn2" @click="updateTask">任务提交</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- <div class="main-container">
   <div class="box0">
     <div class="title">任务管理</div>
   </div>
@@ -29,7 +62,7 @@
       </div>
     </div>
   </div>
-</div>
+</div> -->
 </template>
 
 <script>
@@ -103,7 +136,7 @@ export default {
   line-height 80px
   background center / 1499px 100% url(../../../images/new/bg-head-tb-in.png) no-repeat
 .main-container
-  padding-left 41px
+  // padding-left 41px
 .box0
   width 1580px
   height 102px
@@ -114,9 +147,11 @@ export default {
     padding-left 40px
     padding-top 53px
 .con1
-  width 1580px
-  height 819px
-  background center / 100% 100% url(../../../images/new/bg-con-l.png) no-repeat
+  // width 1580px
+  // height 819px
+  height 800px
+  // background center / 100% 100% url(../../../images/new/bg-con-l.png) no-repeat
+  background center / 100% 100% url(../../../images/new/bg-task-r2.png) no-repeat
   float left
   box-sizing border-box
   padding 40px