From c56417d3dcf3cd93240f6ab5c770490c2acff380 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 9 May 2023 15:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TestThree.vue                  |   1 +
 src/pages/modules/home/home.vue               |  20 +-
 src/pages/modules/taskmanage/CarryPoint.vue   | 139 ++++++++++++++
 src/pages/modules/taskmanage/TaskLists.vue    |  90 +++++++++
 src/pages/modules/taskmanage/TaskOperates.vue | 175 ++++++++++++++++++
 src/pages/modules/taskmanage/index.vue        |  36 ++++
 src/pages/shells/index/index.vue              |   2 +-
 src/router/index.js                           |  27 ++-
 8 files changed, 467 insertions(+), 23 deletions(-)
 create mode 100644 src/pages/modules/taskmanage/CarryPoint.vue
 create mode 100644 src/pages/modules/taskmanage/TaskLists.vue
 create mode 100644 src/pages/modules/taskmanage/TaskOperates.vue
 create mode 100644 src/pages/modules/taskmanage/index.vue

diff --git a/src/components/TestThree.vue b/src/components/TestThree.vue
index e266320..95fe439 100644
--- a/src/components/TestThree.vue
+++ b/src/components/TestThree.vue
@@ -423,4 +423,5 @@ export default {
     border-radius 10px
 .setup_no
   _font(.32rem, 1rem,#FD6A35,,)
+  margin-left .1rem
 </style>
diff --git a/src/pages/modules/home/home.vue b/src/pages/modules/home/home.vue
index 3b3c5dc..575ed9a 100644
--- a/src/pages/modules/home/home.vue
+++ b/src/pages/modules/home/home.vue
@@ -1,24 +1,6 @@
 <template>
   <section>
-    <!-- <div class="con0">
-      <div class="site_nav active fl">
-        <router-link  class="site_nav_a" to="/home">首页</router-link>
-      </div>
-      <div class="site_nav fl">
-        <router-link  class="site_nav_a white" to="/taskmanage">任务管理</router-link>
-      </div>
-      <div class="site_nav fl">
-        <router-link  class="site_nav_a white" to="/errormanage">故障管理</router-link>
-      </div>
-      <div class="site_nav site_nav4 fl">
-        <router-link  class="site_nav_a white" to="/carrysite">车辆信息</router-link>
-      </div>
-      <div class="site_nav fl">
-        <router-link  class="site_nav_a white" to="/ifconfigindex/ifconfiginfo">开发者选项</router-link>
-      </div>
-    </div> -->
     <div class="con1">
-      <!-- <img src="../../../images/aio/elec5.png"> -->
       <button v-if="dataInfo.button_name" @click="clickSave">{{dataInfo.button_name}}</button>
     </div>
     <div class="con2">
@@ -38,7 +20,7 @@
         <span class="txt">{{dataInfo.task_status}}</span>
       </div>
       <div class="infoli">
-        <img src="../../../images/aio/icon6.png">
+        <img src="../../../images/aio/icon5.png">
         <span class="title">任务数量：</span>
         <span class="txt">{{dataInfo.task_num}}</span>
       </div>
diff --git a/src/pages/modules/taskmanage/CarryPoint.vue b/src/pages/modules/taskmanage/CarryPoint.vue
new file mode 100644
index 0000000..83e1132
--- /dev/null
+++ b/src/pages/modules/taskmanage/CarryPoint.vue
@@ -0,0 +1,139 @@
+<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>
+        <div class="box2">
+          <span>目标站点：</span>
+          <button class="btn btn1">确定</button>
+          <button class="btn btn2">清除</button>
+        </div>
+      </div>
+    </div>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import SiteNav from '@components/SiteNav.vue'
+export default {
+  name: 'MovePoint',
+  components: {
+    NavBar,
+    SiteNav
+  },
+  data () {
+    return {
+      dataList: [
+        {
+          id: '1',
+          code: 'A-ZD101'
+        },
+        {
+          id: '2',
+          code: 'A-ZD102'
+        },
+        {
+          id: '3',
+          code: 'A-ZD103'
+        },
+        {
+          id: '4',
+          code: 'A-ZD101'
+        },
+        {
+          id: '5',
+          code: 'A-ZD101'
+        },
+        {
+          id: '6',
+          code: 'A-ZD101'
+        },
+        {
+          id: '7',
+          code: 'A-ZD101'
+        },
+        {
+          id: '8',
+          code: 'A-ZD101'
+        },
+        {
+          id: '9',
+          code: 'A-ZD101'
+        },
+        {
+          id: '10',
+          code: 'A-ZD101'
+        },
+        {
+          id: '11',
+          code: 'A-ZD101'
+        }
+      ]
+    }
+  },
+  mounted () {
+    // init
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.con
+  float left
+  margin-left .4rem
+  margin-top .1rem
+.box1
+  width 10.4rem
+  height 4.2rem
+  .point
+    width 2rem
+    line-height .9rem
+    color #FA6400
+    font-size .36rem
+    text-align center
+    border .16rem solid #DFE1E6
+    border-radius .08rem
+    background #ffffff
+    margin-right .4rem
+    margin-bottom .2rem
+.box2
+  position relative
+  width 9.81rem
+  height 1.2rem
+  border .16rem solid #DFE1E6
+  border-radius .08rem
+  background #ffffff
+  span
+    position absolute
+    left .3rem
+    top .3rem
+    display inline-block
+    font-size .28rem
+    border-right 2px solid #FA6400
+    width 1.8rem
+    color #464646
+  .btn
+    width 1.8rem
+    line-height .65rem
+    font-size .32rem
+    border-radius .28rem
+    color #ffffff
+  .btn1
+    position absolute
+    left 5.3rem
+    top .15rem
+    background #FD6A35
+  .btn2
+    position absolute
+    left 7.5rem
+    top .15rem
+    background #989EBB
+</style>
diff --git a/src/pages/modules/taskmanage/TaskLists.vue b/src/pages/modules/taskmanage/TaskLists.vue
new file mode 100644
index 0000000..a44c6b2
--- /dev/null
+++ b/src/pages/modules/taskmanage/TaskLists.vue
@@ -0,0 +1,90 @@
+<template>
+  <section>
+    <div class="clear site_container">
+      <!-- <div class="fl left_side">
+        <site-nav default_active="1" active="1-2"></site-nav>
+      </div> -->
+      <div class="con1">
+        <table class="filter-table">
+          <tr>
+            <th>任务号</th>
+            <th>目标站点</th>
+            <th>任务状态</th>
+            <th>生成时间</th>
+          </tr>
+          <tr v-for="e in dataList" :key="e.task_id">
+            <td>{{e.task_no}}</td>
+            <td>{{e.next_point}}</td>
+            <td>{{e.status}}</td>
+            <td class="last-td">{{e.time}}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import SiteNav from '@components/SiteNav.vue'
+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'
+        }
+      ]
+    }
+  },
+  mounted () {
+    // init
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.con1
+  float left
+  margin-top .39rem
+  margin-left .1rem
+  width 10.4rem
+.last-td
+  width 4.4rem
+  text-align left
+  padding-left 0.5rem
+  box-sizing border-box
+</style>
diff --git a/src/pages/modules/taskmanage/TaskOperates.vue b/src/pages/modules/taskmanage/TaskOperates.vue
new file mode 100644
index 0000000..d22ff16
--- /dev/null
+++ b/src/pages/modules/taskmanage/TaskOperates.vue
@@ -0,0 +1,175 @@
+<template>
+  <section>
+    <div class="clear site_container">
+      <!-- <div class="fl left_side">
+        <test-nav :array="testData" @change="handleChange"></test-nav>
+      </div> -->
+      <div>
+        <test-one v-if="currentIndex === 0"></test-one>
+        <test-two v-if="currentIndex === 1"></test-two>
+        <test-three v-if="currentIndex === 2"></test-three>
+      </div>
+    </div>
+    <!-- <div class="pop_wrapper">
+      <div class="pop_box">
+        <h2>验证信息</h2>
+        <div class="info-box">
+          <div class="cinfo"><span>用户名</span><input type="text"></div>
+          <div class="cinfo"><span>密码</span><input type="password"></div>
+        </div>
+        <div class="pop_btns_box">
+          <div class="pop_btn pop_btn_primary">确定</div>
+          <div class="pop_btn">退出</div>
+        </div>
+      </div>
+    </div>
+    <div class="modal"></div> -->
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import SiteNav from '@components/SiteNav.vue'
+import TestNav from '@components/TestNav.vue'
+import TestOne from '@components/TestOne.vue'
+import TestTwo from '@components/TestTwo.vue'
+import TestThree from '@components/TestThree.vue'
+
+export default {
+  name: 'TaskManage',
+  components: {
+    NavBar,
+    SiteNav,
+    TestNav,
+    TestOne,
+    TestTwo,
+    TestThree
+  },
+  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'
+      //   }
+      // ],
+      testData: [
+        {
+          label: '搬运站点',
+          index: 0
+        },
+        {
+          label: '任务列表',
+          index: 1
+        },
+        {
+          label: '任务管理',
+          index: 2
+        }
+      ],
+      currentIndex: 2
+    }
+  },
+  mounted () {
+    // init
+  },
+  methods: {
+    // toRadio (e) {
+    //   this.pkId = this.pkId === e.task_id ? '' : e.task_id
+    // },
+    handleChange (i) {
+      this.currentIndex = i
+    }
+  }
+}
+</script>
+
+// <style lang="stylus" scoped>
+// @import '~@style/mixin'
+// .pop_btns_box
+//   _wh(100%,.88rem)
+//   _fj(center)
+//   margin-top .2rem
+// .pop_btn
+//   _wh(1.8rem,.88rem)
+//   background #989EBB
+//   border 2px solid #8B90A6
+//   border-radius: .28rem
+//   _font(.32rem,.88rem,#fff,500,center)
+//   margin 0 .12rem
+// .pop_btn_primary
+//   background #FD6A35
+//   border 2px solid #E74F19
+// .pop_wrapper
+//   position fixed
+//   top 0
+//   bottom 0
+//   left 0
+//   right 0
+//   text-align center
+//   z-index 10000
+//   &::after
+//     content ""
+//     display inline-block
+//     height 100%
+//     width 0
+//     vertical-align middle
+// .modal
+//   position fixed
+//   left 0
+//   top 0
+//   _wh(100%,100%)
+//   opacity .5
+//   background #000
+//   z-index 999
+// .pop_box
+//   display inline-block
+//   vertical-align middle
+//   _wh(9rem,4.8rem)
+//   padding .2rem
+//   background-color #fff
+//   border-radius .16rem
+//   overflow hidden
+//   h2
+//     _font(.4rem,.56rem,#464646,600,center)
+// .info-box
+//   font-size .3rem
+//   span
+//     display inline-block
+//     width 1.8rem
+//     margin-right .2rem
+//   input
+//     border 1px solid #464646
+//     border-radius 8px
+//     height .9rem
+//     line-height .9rem
+//     width 4.6rem
+//     margin-top .22rem
+//     margin-bottom .2rem
+//     text-indent .14rem
+// </style>
diff --git a/src/pages/modules/taskmanage/index.vue b/src/pages/modules/taskmanage/index.vue
new file mode 100644
index 0000000..7e24ac0
--- /dev/null
+++ b/src/pages/modules/taskmanage/index.vue
@@ -0,0 +1,36 @@
+<template>
+<div class="body-conatiner">
+  <div class="side-bar-container">
+    <jxSidebar :menus="menus"></jxSidebar>
+  </div>
+  <div class="main-container">
+    <router-view></router-view>
+  </div>
+</div>
+</template>
+
+<script>
+import jxSidebar from '../../shells/sidebar/sidebar.vue'
+export default {
+  components: {
+    jxSidebar
+  },
+  data () {
+    return {
+      menus: [{
+        label: '搬运站点',
+        index: '1',
+        router: '/CarryPoint'
+      }, {
+        label: '任务列表',
+        index: '2',
+        router: '/TaskLists'
+      }, {
+        label: '任务操作',
+        index: '3',
+        router: '/TaskOperates'
+      }]
+    }
+  }
+}
+</script>
diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue
index 18ff481..78b2d12 100644
--- a/src/pages/shells/index/index.vue
+++ b/src/pages/shells/index/index.vue
@@ -48,7 +48,7 @@ export default {
       }, {
         label: '任务管理',
         index: '2',
-        router: ''
+        router: '/CarryPoint'
       }, {
         label: '故障管理',
         index: '3',
diff --git a/src/router/index.js b/src/router/index.js
index d1cad66..669e542 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,6 +9,11 @@ const IndexComponent = r => require.ensure([], () => r(require('@page/shells/ind
 const IndexHome = r => require.ensure([], () => r(require('@page/modules/home/index.vue')), 'modules')
 const HomeHome = r => require.ensure([], () => r(require('@page/modules/home/home.vue')), 'modules')
 
+const TaskManageTab = r => require.ensure([], () => r(require('@page/modules/taskmanage/index.vue')), 'modules')
+const CarryPoint = r => require.ensure([], () => r(require('@page/modules/taskmanage/CarryPoint.vue')), 'modules')
+const TaskLists = r => require.ensure([], () => r(require('@page/modules/taskmanage/TaskLists.vue')), 'modules')
+const TaskOperates = r => require.ensure([], () => r(require('@page/modules/taskmanage/TaskOperates.vue')), 'modules')
+
 const VehicleInformation = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/index.vue')), 'modules')
 const VehicleStatus = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/vehiclestatus.vue')), 'modules')
 const SensorStatus = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/sensorstatus.vue')), 'modules')
@@ -17,7 +22,7 @@ const AgvStatus = r => require.ensure([], () => r(require('@page/modules/vehicle
 const Teach = r => require.ensure([], () => r(require('@page/modules/teach/teach.vue')), 'modules')
 
 // carry
-const Home = r => require.ensure([], () => r(require('@page/Home2')), 'Home')
+const Home = r => require.ensure([], () => r(require('@page/Home')), 'Home')
 const MovePoint = r => require.ensure([], () => r(require('@page/MovePoint')), 'MovePoint')
 const TaskList = r => require.ensure([], () => r(require('@page/TaskList')), 'TaskList')
 const TaskManage = r => require.ensure([], () => r(require('@page/TaskManage')), 'TaskManage')
@@ -60,7 +65,22 @@ export default new Router({
           path: '/homehome',
           component: HomeHome
         }]
-      }, {
+      },
+      {
+        path: '/TaskManageTab',
+        component: TaskManageTab,
+        children: [{
+          path: '/CarryPoint',
+          component: CarryPoint
+        }, {
+          path: '/TaskLists',
+          component: TaskLists
+        }, {
+          path: '/TaskOperates',
+          component: TaskOperates
+        }]
+      }, 
+      {
         path: '/vehicleinformation',
         component: VehicleInformation,
         children: [{
@@ -73,7 +93,8 @@ export default new Router({
           path: '/agvstatus',
           component: AgvStatus
         }]
-      }, {
+      }, 
+      {
         path: '/teach',
         component: Teach
       }]