From 8a6f9f8b5951a5bfc9cda28e0c53871a1e64ef88 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 25 May 2023 18:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TestThree.vue                  |  4 +-
 src/pages/modules/errormanage/index.vue       |  6 +-
 src/pages/modules/taskmanage/CarryPoint.vue   | 99 +++++++++----------
 src/pages/modules/taskmanage/TaskLists.vue    | 73 +++++++-------
 src/pages/modules/taskmanage/TaskOperates.vue |  2 +-
 src/pages/shells/index/index.vue              |  2 +-
 6 files changed, 90 insertions(+), 96 deletions(-)

diff --git a/src/components/TestThree.vue b/src/components/TestThree.vue
index 48e0a88..31633bb 100644
--- a/src/components/TestThree.vue
+++ b/src/components/TestThree.vue
@@ -314,7 +314,7 @@ export default {
   // width 10.4rem
   margin-left 2.8rem
   position fixed
-  bottom 0
+  bottom 0.5rem
   img
     width 1.1rem
     height 1.1rem
@@ -424,6 +424,6 @@ export default {
     box-shadow 0px -3px 10px rgba(black, 0.3)
     border-radius 10px
 .setup_no
-  _font(.32rem, 1rem,#FD6A35,,)
+  _font(.3rem, 1rem,#FD6A35,,)
   margin-left .4rem
 </style>
diff --git a/src/pages/modules/errormanage/index.vue b/src/pages/modules/errormanage/index.vue
index 812546a..f2c2f5f 100644
--- a/src/pages/modules/errormanage/index.vue
+++ b/src/pages/modules/errormanage/index.vue
@@ -21,11 +21,13 @@ export default {
         label: '故障信息',
         index: '1',
         router: '/ErrorInfo'
-      }, {
+      },
+      {
         label: '故障处理',
         index: '2',
         router: '/ErrorDeal'
-      }]
+      }
+      ]
     }
   }
 }
diff --git a/src/pages/modules/taskmanage/CarryPoint.vue b/src/pages/modules/taskmanage/CarryPoint.vue
index 96ee0e1..7b50980 100644
--- a/src/pages/modules/taskmanage/CarryPoint.vue
+++ b/src/pages/modules/taskmanage/CarryPoint.vue
@@ -1,89 +1,77 @@
 <template>
-  <section>
-    <div class="clear site_container">
-      <!-- <div class="fl left_side">
-        <site-nav default_active="1" active="1-1"></site-nav>
-      </div> -->
-      <div class="con">
-        <div class="box1">
-          <!-- <div class="point fl" v-for="e in dataList" :key="e.id">{{e.code}}</div> -->
-          <div class="point fl" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">{{e.code_name}}</div>
-        </div>
-        <div class="box2">
-          <span class="span1">目标站点：</span>
-          <span class="span2">{{selectObj.code_name}}</span>
-          <button class="btn btn1">确定</button>
-          <button class="btn btn2">清除</button>
-        </div>
+  <div class="movepoint">
+    <div class="con">
+      <div class="box1">
+        <div class="point fl" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">{{e.code_name}}</div>
+      </div>
+      <div class="box2">
+        <span class="span1">目标站点：</span>
+        <span class="span2">{{selectObj.code_name}}</span>
+        <button class="btn btn1" @click="toSure">确定</button>
+        <button class="btn btn2" @click="toClear">清除</button>
       </div>
     </div>
-  </section>
+  </div>
 </template>
 
 <script>
-import NavBar from '@components/NavBar.vue'
-import SiteNav from '@components/SiteNav.vue'
 import {queryPoint, confirmPoint} from '@/config/getData.js'
 export default {
   name: 'MovePoint',
-  components: {
-    NavBar,
-    SiteNav
-  },
   data () {
     return {
       selectObj: {},
-      // dataList: []
+      // dataList: [],
       dataList: [
         {
           id: '1',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '2',
-          code: 'A-ZD102'
+          code_name: 'A-ZD102'
         },
         {
           id: '3',
-          code: 'A-ZD103'
+          code_name: 'A-ZD103'
         },
         {
           id: '4',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '5',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '6',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '7',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '8',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '9',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '10',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         },
         {
           id: '11',
-          code: 'A-ZD101'
+          code_name: 'A-ZD101'
         }
       ]
     }
   },
   created () {
-    this.initData()
+    // this.initData()
   },
   methods: {
     async initData () {
@@ -117,54 +105,59 @@ export default {
   }
 }
 </script>
-
 <style lang="stylus" scoped>
 .con
   float left
   margin-left .4rem
-  margin-top .1rem
+  margin-top .39rem
 .box1
   width 10.4rem
-  height 4.2rem
-  margin-top .5rem
+  // height 6.1rem
   .point
     width 2rem
-    height 1.22rem
     line-height .9rem
     color #FA6400
     font-size .36rem
     text-align center
     border .16rem solid #DFE1E6
-    border-radius .08rem
+    border-radius .2rem
     background #ffffff
     margin-right .4rem
-    margin-bottom .2rem
+    margin-bottom .35rem
 .box2
-  position relative
+  position fixed
+  bottom .5rem
   width 9.81rem
-  height 1.2rem
+  height 1.5rem
   border .16rem solid #DFE1E6
-  border-radius .08rem
+  border-radius .2rem
   background #ffffff
-  margin-top .8rem
-  span
+  .span1
     position absolute
     left .3rem
-    top .3rem
+    top .34rem
     display inline-block
+    line-height .5rem
     font-size .28rem
-    border-right 2px solid #FA6400
-    width 1.8rem
+    border-right 3px solid #FA6400
+    width 1.6rem
     color #464646
+  .span2
+    position absolute
+    left 2.5rem
+    top .4rem
+    display inline-block
+    font-size .34rem
+    color #fa6400
   .btn
     width 1.8rem
-    line-height .65rem
+    line-height .88rem
     font-size .32rem
     border-radius .28rem
     color #ffffff
   .btn1
     position absolute
-    left 5.3rem
+    left 5.5rem
     top .15rem
     background #FD6A35
   .btn2
diff --git a/src/pages/modules/taskmanage/TaskLists.vue b/src/pages/modules/taskmanage/TaskLists.vue
index 1016149..040088c 100644
--- a/src/pages/modules/taskmanage/TaskLists.vue
+++ b/src/pages/modules/taskmanage/TaskLists.vue
@@ -1,6 +1,6 @@
 <template>
   <section>
-    <div class="clear site_container">
+    <div class="clear">
       <!-- <div class="fl left_side">
         <site-nav default_active="1" active="1-2"></site-nav>
       </div> -->
@@ -16,11 +16,11 @@
           </tr>
           <tr v-for="(e, index) in dataList" :key="e.task_id">
             <td>{{index+1}}</td>
-            <td>{{e.task_no}}</td>
+            <td>{{e.task_num}}</td>
             <td>{{e.next_point}}</td>
-            <td>{{e.next_point}}</td>
-            <td>{{e.status}}</td>
-            <td class="last-td">{{e.time}}</td>
+            <td>{{e.target_point}}</td>
+            <td>{{e.task_status_name}}</td>
+            <td class="last-td">{{e.create_time}}</td>
           </tr>
         </table>
       </div>
@@ -29,48 +29,47 @@
 </template>
 
 <script>
-import NavBar from '@components/NavBar.vue'
 import SiteNav from '@components/SiteNav.vue'
 import {queryTaskList} from '@/config/getData.js'
 export default {
   name: 'TaskList',
   components: {
-    NavBar,
     SiteNav
   },
   data () {
     return {
       pkId: '',
-      dataList: [
-        {
-          task_id: '1',
-          task_no: '1001',
-          next_point: '1001',
-          status: '正在执行',
-          time: '2021-07-14  12:00:00'
-        },
-        {
-          task_id: '2',
-          task_no: '1002',
-          next_point: '1001',
-          status: '未执行',
-          time: '2021-07-15  12:00:00'
-        },
-        {
-          task_id: '3',
-          task_no: '1003',
-          next_point: '1001',
-          status: '未执行',
-          time: '2021-07-18  12:00:00'
-        },
-        {
-          task_id: '4',
-          task_no: '1004',
-          next_point: '1001',
-          status: '未执行',
-          time: '2021-09-10  12:00:00'
-        }
-      ]
+      dataList: []
+      // dataList: [
+      //   {
+      //     task_id: '1',
+      //     task_no: '1001',
+      //     next_point: '1001',
+      //     status: '正在执行',
+      //     time: '2021-07-14  12:00:00'
+      //   },
+      //   {
+      //     task_id: '2',
+      //     task_no: '1002',
+      //     next_point: '1001',
+      //     status: '未执行',
+      //     time: '2021-07-15  12:00:00'
+      //   },
+      //   {
+      //     task_id: '3',
+      //     task_no: '1003',
+      //     next_point: '1001',
+      //     status: '未执行',
+      //     time: '2021-07-18  12:00:00'
+      //   },
+      //   {
+      //     task_id: '4',
+      //     task_no: '1004',
+      //     next_point: '1001',
+      //     status: '未执行',
+      //     time: '2021-09-10  12:00:00'
+      //   }
+      // ]
     }
   },
   created () {
diff --git a/src/pages/modules/taskmanage/TaskOperates.vue b/src/pages/modules/taskmanage/TaskOperates.vue
index 7ff9145..bc4f615 100644
--- a/src/pages/modules/taskmanage/TaskOperates.vue
+++ b/src/pages/modules/taskmanage/TaskOperates.vue
@@ -1,6 +1,6 @@
 <template>
   <section>
-    <div class="clear site_container">
+    <div class="clear">
       <!-- <div class="fl left_side">
         <test-nav :array="testData" @change="handleChange"></test-nav>
       </div> -->
diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue
index 2887496..7b0267d 100644
--- a/src/pages/shells/index/index.vue
+++ b/src/pages/shells/index/index.vue
@@ -100,7 +100,7 @@ export default {
       }, {
         label: '故障管理',
         index: '3',
-        router: '/ErrorDeal'
+        router: '/ErrorInfo'
       }, {
         label: '车辆信息',
         index: '4',