From c0351508c52c11806cf92941c4d2c980e9f86d93 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 14 Jul 2025 09:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData.js             |  42 +++
 src/config/getData2.js            | 413 ------------------------------
 src/config/http.js                |   8 +-
 src/config/mork.js                |  20 ++
 src/main.js                       |   6 +
 src/pages/modules/building.vue    | 168 +++++++++++-
 src/pages/modules/device.vue      | 333 +++++++++++++++++++-----
 src/pages/modules/login/login.vue |   2 +-
 src/style/common.styl             |   3 +
 9 files changed, 515 insertions(+), 480 deletions(-)
 create mode 100644 src/config/getData.js
 delete mode 100644 src/config/getData2.js
 create mode 100644 src/config/mork.js

diff --git a/src/config/getData.js b/src/config/getData.js
new file mode 100644
index 0000000..d31a79b
--- /dev/null
+++ b/src/config/getData.js
@@ -0,0 +1,42 @@
+import {post} from '@config/http.js'
+
+// 登录
+export const authlogin = (username, password) => post('auth/login', {
+  username: username,
+  password: password
+})
+// 建图
+export const startMapping = (na) => post('teaching/startMapping', {
+  mapName: na
+})
+export const setStation = (sn) => post('teaching/setStation', {
+  stationName: sn
+})
+export const stopMapping = () => post('teaching/stopMapping', {})
+export const getLocalMaps = () => post('teaching/getLocalMaps', {})
+export const synchronzieMap = (map) => post('teaching/synchronzieMap', {
+  mapName: map
+})
+export const restart = () => post('teaching/restart', {})
+export const relocate = (x, y, angle) => post('teaching/relocate', {
+  x: x,
+  y: x,
+  angle: angle
+})
+// 操作
+export const queryStation = () => post('api/operate/queryStation', {})
+export const queryTaskChain = () => post('api/operate/queryTaskChain', {})
+export const sendTask = (data) => post('api/operate/sendTask', {
+  data: data
+})
+export const saveTask = (data) => post('api/operate/saveTask', {
+  data: data
+})
+export const cancelTask = () => post('api/operate/cancelTask', {})
+export const deleteTaskChain = (id) => post('api/operate/deleteTaskChain', {
+  chain_id: id
+})
+export const updateStation = (code, st) => post('api/operate/updateStation', {
+  station_code: code,
+  station_name: st
+})
diff --git a/src/config/getData2.js b/src/config/getData2.js
deleted file mode 100644
index 82bf0ff..0000000
--- a/src/config/getData2.js
+++ /dev/null
@@ -1,413 +0,0 @@
-/* eslint-disable */
-import {post} from '@config/http.js'
-// import store from '../vuex/store'
-
-// 开发者选项
-export const getIP = () => post('api/developer/getIP', {})
-export const getLogList = () => post('api/developer/getLogList', {})
-export const getROSNodeList = () => post('api/developer/getROSNodeList', {})
-export const temperature = () => post('api/developer/temperature', {})
-export const debugInfo = () => post('api/developer/debugInfo', {})
-export const softwareVersion = () => post('api/developer/softwareVersion', {})
-export const parameterSetting = (num, word) => post('api/developer/parameterSetting', {
-  maxTaskNun: num,
-  password: word
-})
-
-// new
-// 登录
-export const authlogin = (username, password) => post('auth/login', {
-  username: username,
-  password: password
-})
-
-export const queryHead = () => post('api/home/queryHead', {
-})
-// 车辆状态
-// 1.1查询车辆状态
-export const queryVehicleStatus = (username, password) => post('api/vehicle/queryVehicleStatus', {
-})
-// 1.2查询传感器状态
-export const querrySensor = () => post('api/vehicle/querrySensor', {})
-// 1.3软启动
-export const softStart = () => post('api/vehicle/softStart', {})
-// 1.4跳过起点
-export const skipStartPoint = () => post('api/vehicle/skipStartPoint', {})
-// 1.5关机，显示屏控制、TCS控制、RC控制、Joy控制
-export const ShutDown = (type, bool) => post('api/vehicle/Shut_down', {
-  type: type,
-  bool: bool
-})
-// 1.6查询初始化坐标
-export const queryRestPoint = () => post('api/vehicle/queryRestPoint', {})
-// 1.7初始化坐标确定
-export const restCoordinate = (code, name, x, y, t) => post('api/vehicle/restCoordinate', {
-  point_code: code,
-  point_name: name,
-  x: x,
-  y: y,
-  t: t
-})
-// 1.8查询agv的状态
-export const queryAgvStatus = () => post('api/vehicle/queryAgv_Status', {})
-// 1.9退出
-export const quitNow = () => post('api/vehicle/quitNow', {})
-
-// 系统管理
-// 1.1 用户列表
-export const usersQuery = (page, size) => post('api/users/query', {
-  page: page,
-  size: size
-})
-// 1.2 添加用户
-export const usersAdd = (username, personName, gender, phone, rolesIds, password) => post('api/users/add', {
-  username: username,
-  personName: personName,
-  gender: gender,
-  phone: phone,
-  rolesIds: rolesIds,
-  password: password
-})
-// 1.3 修改用户、重置密码
-export const usersEdit = (obj) => post('api/users/edit', obj)
-// 1.4 删除用户
-export const usersDelete = (userId) => post('api/users/delete', userId)
-
-// 角色管理
-// 1.1 角色列表
-export const sysRoleQuery = (page, size) => post('api/sysRole/query', {
-  page: page,
-  size: size
-})
-// 1.2 添加角色
-export const sysRoleAdd = (name, remark) => post('api/sysRole/add', {
-  name: name,
-  remark: remark
-})
-// 1.3 修改角色
-export const sysRoleEdit = (roleId, name, remark) => post('api/sysRole/edit', {
-  roleId: roleId,
-  name: name,
-  remark: remark
-})
-// 1.4 删除角色
-export const sysRoleDelete = (roleId) => post('api/sysRole/delete', roleId)
-// 1.5 保存菜单
-export const sysRoleMenu = (roleId, menus, menus1) => post('api/sysRole/menu', {
-  roleId: roleId,
-  menus: menus,
-  menus1: menus1
-})
-// 1.6 查询菜单树
-export const menuQuery = (roleId, menus) => post('api/sysRole/menuQuery', {
-})
-
-// 系统参数
-// 1.1 参数列表
-export const paramQuery = (page, size) => post('api/param/query', {
-  page: page,
-  size: size
-})
-// 1.2 添加参数
-export const paramAdd = (code, name, value, remark) => post('api/param/add', {
-  code: code,
-  name: name,
-  value: value,
-  remark: remark
-})
-// 1.3 修改参数
-export const paramEdit = (id, code, name, value, remark) => post('api/param/edit', {
-  id: id,
-  code: code,
-  name: name,
-  value: value,
-  remark: remark
-})
-// 1.4 删除参数
-export const paramDelete = (paramsIds) => post('api/param/delete', paramsIds)
-
-// 修改密码
-export const updatePass = (newPass, oldPass) => post('api/users/updatePass', {
-  newPass: newPass,
-  oldPass: oldPass
-})
-
-// 用户登录获取菜单
-export const sysMenuBuild = () => post('api/sysMenu/build', {
-})
-// export const sysMenuBuild = () => {
-//   let res = [
-//       {
-//           "menuId": "1654807438270009344",
-//           "pid": "1324783485328",
-//           "label": "首页",
-//           "router": "",
-//           "index": "1",
-//           "children": [
-//               {
-//                   "menuId": "1654807784312672256",
-//                   "pid": "1654807438270009344",
-//                   "label": "首页",
-//                   "router": "/index/home",
-//                   "index": "1",
-//                   "children": null,
-//                   "title": "首页",
-//                   "zhTitle": "首页",
-//                   "enTitle": "Index",
-//                   "inTitle": null,
-//                   "zh_title": "首页",
-//                   "en_title": "Index",
-//                   "in_title": null
-//               }
-//           ],
-//           "title": "首页",
-//           "zhTitle": "首页",
-//           "enTitle": "Index",
-//           "inTitle": null,
-//           "zh_title": "首页",
-//           "en_title": "Index",
-//           "in_title": null
-//       },
-//       {
-//           "menuId": "1654808014131171328",
-//           "pid": "1324783485328",
-//           "label": "任务",
-//           "router": "",
-//           "index": "2",
-//           "children": [
-//               {
-//                   "menuId": "1654808296076480512",
-//                   "pid": "1654808014131171328",
-//                   "label": "搬运起点",
-//                   "router": "/index/carrypoint",
-//                   "index": "1",
-//                   "children": null,
-//                   "title": "搬运起点",
-//                   "zhTitle": "搬运起点",
-//                   "enTitle": "Carry Point",
-//                   "inTitle": null,
-//                   "zh_title": "搬运起点",
-//                   "en_title": "Carry\nPoint",
-//                   "in_title": null
-//               }
-//           ],
-//           "title": "任务",
-//           "zhTitle": "任务",
-//           "enTitle": "Task",
-//           "inTitle": null,
-//           "zh_title": "任务",
-//           "en_title": "Task",
-//           "in_title": null
-//       },
-//       {
-//           "menuId": "1654808791742550016",
-//           "pid": "1324783485328",
-//           "label": "车辆",
-//           "router": "",
-//           "index": "4",
-//           "children": [
-//               {
-//                   "menuId": "1654808864970903552",
-//                   "pid": "1654808791742550016",
-//                   "label": "车辆状态",
-//                   "router": "/index/vehiclestatus",
-//                   "index": "1",
-//                   "children": null,
-//                   "title": "车辆状态",
-//                   "zhTitle": "车辆状态",
-//                   "enTitle": "Vehicle State ",
-//                   "inTitle": null,
-//                   "zh_title": "车辆状态",
-//                   "en_title": "Vehicle\nState",
-//                   "in_title": null
-//               },
-//               {
-//                   "menuId": "1654808966481448960",
-//                   "pid": "1654808791742550016",
-//                   "label": "车辆控制",
-//                   "router": "/index/vehiclecontrol",
-//                   "index": "2",
-//                   "children": null,
-//                   "title": "车辆控制",
-//                   "zhTitle": "车辆控制",
-//                   "enTitle": "Vehicle Control",
-//                   "inTitle": null,
-//                   "zh_title": "车辆控制",
-//                   "en_title": "Vehicle\nControl",
-//                   "in_title": null
-//               },
-//               {
-//                   "menuId": "1654808966481448961",
-//                   "pid": "1654808791742550016",
-//                   "label": "恢复定位",
-//                   "router": "/index/slam",
-//                   "index": "3",
-//                   "children": null,
-//                   "title": "恢复定位",
-//                   "zhTitle": "恢复定位",
-//                   "enTitle": "Vehicle Control",
-//                   "inTitle": null,
-//                   "zh_title": "恢复定位",
-//                   "en_title": "Vehicle\nControl",
-//                   "in_title": null
-//               }
-//           ],
-//           "title": "车辆",
-//           "zhTitle": "车辆",
-//           "enTitle": "Vehicle",
-//           "inTitle": null,
-//           "zh_title": "车辆",
-//           "en_title": "Vehicle",
-//           "in_title": null
-//       },
-//       {
-//           "menuId": "1654808657013116928",
-//           "pid": "1324783485328",
-//           "label": "故障",
-//           "router": "",
-//           "index": "3",
-//           "children": [
-//               {
-//                   "menuId": "1654808721102082048",
-//                   "pid": "1654808657013116928",
-//                   "label": "故障信息",
-//                   "router": "/index/errorinfo",
-//                   "index": "1",
-//                   "children": null,
-//                   "title": "故障信息",
-//                   "zhTitle": "故障信息",
-//                   "enTitle": "Fault Information",
-//                   "inTitle": null,
-//                   "zh_title": "故障信息",
-//                   "en_title": "Fault\nInformation",
-//                   "in_title": null
-//               }
-//           ],
-//           "title": "故障",
-//           "zhTitle": "故障",
-//           "enTitle": "Fault ",
-//           "inTitle": null,
-//           "zh_title": "故障",
-//           "en_title": "Fault",
-//           "in_title": null
-//       },
-//       {
-//           "menuId": "1654809097821884416",
-//           "pid": "1324783485328",
-//           "label": "示教",
-//           "router": "/index/teach",
-//           "index": "5",
-//           "children": null,
-//           "title": "示教",
-//           "zhTitle": "示教",
-//           "enTitle": "Teach",
-//           "inTitle": null,
-//           "zh_title": "示教",
-//           "en_title": "Teach",
-//           "in_title": null
-//       },
-//       {
-//           "menuId": "1664808014131171329",
-//           "pid": "1324783485328",
-//           "label": "系统",
-//           "router": "",
-//           "index": "6",
-//           "children": [
-//               {
-//                   "menuId": "1664808014131171330",
-//                   "pid": "1664808014131171329",
-//                   "label": "用户管理",
-//                   "router": "/index/user",
-//                   "index": "1",
-//                   "children": null,
-//                   "title": "用户管理",
-//                   "zhTitle": "用户管理",
-//                   "enTitle": "User Management",
-//                   "inTitle": null,
-//                   "zh_title": "用户管理",
-//                   "en_title": "User\nManagement",
-//                   "in_title": null
-//               },
-//               {
-//                   "menuId": "1664808014131171331",
-//                   "pid": "1664808014131171329",
-//                   "label": "角色管理",
-//                   "router": "/index/role",
-//                   "index": "2",
-//                   "children": null,
-//                   "title": "角色管理",
-//                   "zhTitle": "角色管理",
-//                   "enTitle": "Role Management",
-//                   "inTitle": null,
-//                   "zh_title": "角色管理",
-//                   "en_title": "Role\nManagement",
-//                   "in_title": null
-//               },
-//               {
-//                   "menuId": "1664808014131171335",
-//                   "pid": "1664808014131171329",
-//                   "label": "系统管理",
-//                   "router": "/index/system",
-//                   "index": "3",
-//                   "children": null,
-//                   "title": "系统管理",
-//                   "zhTitle": "系统管理",
-//                   "enTitle": "System Param",
-//                   "inTitle": null,
-//                   "zh_title": "系统管理",
-//                   "en_title": "System\nParam",
-//                   "in_title": null
-//               },
-//               {
-//                   "menuId": "1664808014131171334",
-//                   "pid": "1664808014131171329",
-//                   "label": "开发者选项",
-//                   "router": "/index/developer",
-//                   "index": "4",
-//                   "children": null,
-//                   "title": "开发者选项",
-//                   "zhTitle": "开发者选项",
-//                   "enTitle": "Developer Param",
-//                   "inTitle": null,
-//                   "zh_title": "开发者选项",
-//                   "en_title": "Developer\nParam",
-//                   "in_title": null
-//               },
-//               {
-//                   "menuId": "1664808014131171336",
-//                   "pid": "1664808014131171329",
-//                   "label": "远程支持",
-//                   "router": "/index/remote",
-//                   "index": "5",
-//                   "children": null,
-//                   "title": "远程支持",
-//                   "zhTitle": "远程支持",
-//                   "enTitle": "Remote Support",
-//                   "inTitle": null,
-//                   "zh_title": "远程支持",
-//                   "en_title": "Remote\nSupport",
-//                   "in_title": null
-//               }
-//           ],
-//           "title": "系统",
-//           "zhTitle": "系统",
-//           "enTitle": "System",
-//           "inTitle": null,
-//           "zh_title": "系统",
-//           "en_title": "System",
-//           "in_title": null
-//       }
-//   ]
-//   return res
-// }
-
-// 用户退出
-export const authLogout = () => post('auth/logout', {
-})
-
-/**
- * 远程支持
- */
-// 获取远程码接口
-export const queryRemotelnfo = () => post('api/developer/queryRemoteInfo', {
-})
diff --git a/src/config/http.js b/src/config/http.js
index b807f20..6038160 100644
--- a/src/config/http.js
+++ b/src/config/http.js
@@ -1,7 +1,5 @@
 import axios from 'axios'
-// import { Dialog } from './utils.js'
 import store from '../vuex/store'
-import router from '@/router'
 import i18n from '../i18n/i18n'
 
 axios.defaults.timeout = 50000
@@ -37,11 +35,8 @@ axios.interceptors.response.use(
     if (error && error.response) {
       switch (error.response.status) {
         case 400:
-          // Dialog(error.message)
           break
         case 401:
-          store.dispatch('setSignOut')
-          router.push('/login')
           break
       }
       return Promise.reject(error.response.data)
@@ -57,8 +52,7 @@ export const post = (sevmethod, params) => {
       .then(response => {
         resolve(response.data)
       }, error => {
-        // Dialog(error.message)
-        reject(error)
+        reject(error.message)
       })
       .catch((error) => {
         reject(error)
diff --git a/src/config/mork.js b/src/config/mork.js
new file mode 100644
index 0000000..6d3bab4
--- /dev/null
+++ b/src/config/mork.js
@@ -0,0 +1,20 @@
+export const queryStation = () => {
+  let res = {
+    message: 'ok',
+    data: [{station_code: 'B1', station_name: 'B1', x: '10', Y: '10', angle: '90'}, {station_code: 'B2', station_name: 'B2', x: '10', Y: '10', angle: '90'}, {station_code: 'B3', station_name: 'B3', x: '10', Y: '10', angle: '90'}]
+  }
+  return res
+}
+export const queryTaskChain = () => {
+  let res = {
+    message: 'ok',
+    data: [{chain_id: '1', chain_point: 'A-B-C', chain_name: 'A-B-C', action_type: 'Ascend-Descend-Move'}]
+  }
+  return res
+}
+export const updateStation = () => {
+  let res = {
+    message: 'ok'
+  }
+  return res
+}
diff --git a/src/main.js b/src/main.js
index 7db6a6f..3c5a43d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -68,6 +68,12 @@ export function decrypt (txt) {
   return encryptor.decrypt(txt)
 }
 
+Vue.filter('findByValue', (array, value) => {
+  if (!Array.isArray(array)) return ''
+  const item = array.find(item => item.value === value)
+  return item ? item.text : ''
+})
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
diff --git a/src/pages/modules/building.vue b/src/pages/modules/building.vue
index 073c61f..6f1bcfc 100644
--- a/src/pages/modules/building.vue
+++ b/src/pages/modules/building.vue
@@ -12,18 +12,51 @@
     <div class="canvas-container">
       <canvas id="canvas" ref="canvas" width="1920" height="1080"></canvas>
     </div>
-    <el-row type="flex" justify="end"><button class="button_control" @click="connectPoints"><p>建图</p></button></el-row>
+    <el-row type="flex" justify="end"><button class="button_control" @click="_stopMapping"><p>建图</p></button></el-row>
+    <el-dialog
+      title="设置站点"
+      :visible.sync="dialogVisible"
+      width="50%">
+      <el-form :model="dataForm" ref="dataForm" :label-width="$i18n.locale === 'en-us' ? '' : '1.1rem'" size="mini">
+        <el-form-item label="站点名称" prop="point">
+          <el-input v-model="dataForm.point" id="point" @focus="show" data-layout="normal"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-row type="flex" justify="space-around" style="margin-top: .3rem">
+        <el-col :span="7"><button class="button_control button_control_disabled" @click="dialogVisible = false"><p>{{$t('Cancel')}}</p></button></el-col>
+        <el-col :span="7"><button class="button_control" @click="_setStation"><p>{{$t('Save')}}</p></button></el-col>
+      </el-row>
+      <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { startMapping, setStation, stopMapping } from '@config/getData.js'
 export default {
   data () {
     return {
+      dialogVisible: false,
+      dataForm: {
+        point: ''
+      },
+      keyPoints: [],
+      visible: false,
+      layout: 'normal',
+      input: null,
+      options: {
+        useKbEvents: false,
+        preventClickEvent: false
+      },
       points: [], // 存储所有点位坐标
       intervalId: null, // 用于存储定时器的 ID
       drawingPoints: true, // 是否继续绘制点位
-      scale: 1 // 缩放比例
+      scale: 1, // 缩放比例
+      gridColor: '#FFFFFF', // 线条颜色
+      gridLineWidth: 1, // 线条宽度
+      gridCellSize: 200, // 格子大小
+      dotColor: '#000000', // 圆点颜色
+      dotRadius: 5 // 圆点半径（直径为5px，半径为2.5px）
     }
   },
   beforeDestroy () {
@@ -31,8 +64,139 @@ export default {
       clearInterval(this.intervalId)
     }
   },
+  mounted () {
+    // this.drawGrid()
+    this._startMapping()
+  },
   methods: {
+    show (e) {
+      // 关闭中文keyboard
+      let arr = document.querySelectorAll('.hg-theme-default')
+      arr.forEach((ele) => {
+        ele.style.visibility = 'hidden'
+      })
+      this.input = e.target
+      this.layout = e.target.dataset.layout
+      if (!this.visible) {
+        this.visible = true
+      }
+    },
+    hide () {
+      this.visible = false
+    },
+    accept () {
+      this.hide()
+    },
+    next () {
+      let inputs = document.querySelectorAll('input')
+      let found = false;
+      [].forEach.call(inputs, (item, i) => {
+        if (!found && item === this.input && i < inputs.length - 1 && this.input.dataset.next === '1') {
+          found = true
+          this.$nextTick(() => {
+            inputs[i + 1].focus()
+          })
+        }
+      })
+      if (!found) {
+        this.input.blur()
+        this.hide()
+      }
+    },
+    async _startMapping () {
+      try {
+        let res = await startMapping('apt_map_' + new Date().getTime())
+        if (res) {
+          if (res.code !== 200) {
+            this.$message.error(res.message)
+          }
+        }
+      } catch (e) {
+        this.$message.error(e)
+      }
+    },
     addPoint () {
+      this.dialogVisible = true
+      this.dataForm.point = 'B' + (this.keyPoints.length + 1)
+    },
+    async _setStation () {
+      try {
+        let res = await setStation(this.dataForm.point)
+        if (res) {
+          if (res.code === 200) {
+            this.$message({
+              type: 'success',
+              message: res.message
+            })
+            this.keyPoints.push(this.dataForm.point)
+          } else {
+            this.$message.error(res.message)
+          }
+        }
+        this.visible = false
+      } catch (e) {
+        this.$message.error(e)
+        this.visible = false
+      }
+    },
+    async _stopMapping () {
+      try {
+        let res = await stopMapping()
+        if (res) {
+          if (res.code === 200) {
+            this.$message({
+              type: 'success',
+              message: res.message
+            })
+          } else {
+            this.$message.error(res.message)
+          }
+        }
+      } catch (e) {
+        this.$message.error(e)
+      }
+    },
+    drawGrid () {
+      const canvas = this.$refs.canvas
+      const ctx = canvas.getContext('2d')
+      const width = canvas.width
+      const height = canvas.height
+
+      // 清空画布
+      ctx.clearRect(0, 0, width, height)
+
+      // 绘制格子
+      for (let x = 0; x <= width; x += this.gridCellSize * this.scale) {
+        ctx.beginPath()
+        ctx.moveTo(x, 0)
+        ctx.lineTo(x, height)
+        ctx.strokeStyle = this.gridColor
+        ctx.lineWidth = this.gridLineWidth
+        ctx.stroke()
+      }
+
+      for (let y = 0; y <= height; y += this.gridCellSize * this.scale) {
+        ctx.beginPath()
+        ctx.moveTo(0, y)
+        ctx.lineTo(width, y)
+        ctx.strokeStyle = this.gridColor
+        ctx.lineWidth = this.gridLineWidth
+        ctx.stroke()
+      }
+
+      // 绘制圆点
+      for (let x = 0; x < width; x += this.gridCellSize * this.scale) {
+        for (let y = 0; y < height; y += this.gridCellSize * this.scale) {
+          if (x > 0 && y > 0) {
+            ctx.beginPath()
+            ctx.arc(x, y, this.dotRadius, 0, Math.PI * 2)
+            ctx.fillStyle = this.dotColor
+            ctx.fill()
+          }
+        }
+      }
+    },
+    addPoint2 () {
       this.points = [] // 清空白色点位数组
       this.drawingPoints = true // 重新开始绘制点位
       this.drawPoints() // 重新绘制画布
diff --git a/src/pages/modules/device.vue b/src/pages/modules/device.vue
index 92f4cd7..f70dc0e 100644
--- a/src/pages/modules/device.vue
+++ b/src/pages/modules/device.vue
@@ -1,35 +1,30 @@
 <template>
   <div class="page_container">
     <div class="t_box">
-      <el-tabs tab-position="left" @tab-click="tabClick">
-        <el-tab-pane label="自定义">
+      <el-tabs tab-position="left" v-model="activeName" @tab-click="tabClick">
+        <el-tab-pane label="自定义" name="zdy">
           <el-row type="flex" class="r_box">
-            <el-col class="point_item" v-for="e in dataList" :key="e.point_code">
+            <el-col class="point_item" v-for="(e, i) in dataList" :key="'zdy' + i">
               <el-popover
                 placement="bottom"
-                trigger="click"
-                :value="popId === e.point_code"
-                @show="popId = e.point_code"
-                @hide="popId = null">
-                <el-row type="flex">
-                  <el-button class="task_button" v-for="e in radioOption" :key="e.value" @click="radioInput(e.value)">{{ e.label }}</el-button>
+                trigger="manual"
+                :ref="`popover-${i}`">
+                <el-row type="flex" justify="space-between" align="middle" style="margin-bottom: .1rem">
+                  <el-col :span="18"><el-input placeholder="修改名称" v-model="stationName" @focus="show" data-layout="normal"></el-input></el-col>
+                  <el-button type="success" icon="el-icon-check" size="mini" style="height: .3rem" :disabled="disabled" @click="_updateStation(e, i)"></el-button>
                 </el-row>
-                <div slot="reference" class="zbox point_item_i"><p>{{ e.point_code }}</p></div>
+                <el-row type="flex" justify="space-between">
+                  <el-button class="task_button" :class="{'task_checked': e.action_type === el.value}" v-for="el in radioOption" :key="el.value" @click="radioInput(e, i, el.value)">{{ el.label }}</el-button>
+                </el-row>
+                <div slot="reference" class="zbox point_item_i" @click="openPopover(i)"><p>{{ e.station_name }}</p></div>
               </el-popover>
             </el-col>
           </el-row>
         </el-tab-pane>
-        <el-tab-pane label="任务链">
+        <el-tab-pane label="任务链" name="rwl">
           <el-row type="flex" class="r_box">
-            <el-col class="point_item" v-for="e in linkData" :key="e.point_code">
-              <div class="zbox point_item_i" @click="handleLinkCheck(e)"><p>{{ e.point_code }}</p></div>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-        <el-tab-pane label="标准任务">
-          <el-row type="flex" class="r_box">
-            <el-col class="point_item" v-for="(e, i) in dataList" :key="i">
-              <div class="zbox point_item_i" @click="handleCheck(e)"><p>{{ e.point_code }}</p></div>
+            <el-col class="point_item" v-for="(e, i) in linkData" :key="'rwl' + i">
+              <div class="zbox point_item_i" @click="handleLinkCheck(e)"><p>{{ e.chain_name }}</p></div>
             </el-col>
           </el-row>
         </el-tab-pane>
@@ -38,14 +33,14 @@
     <el-row type="flex" class="result_w" justify="space-between" align="middle">
       <el-col :span="15" class="result_items_w">
         <el-row type="flex" class="result_items" justify="start" align="top">
-          <el-col class="pp_item" v-for="(e, i) in newData" :key="e.point_code">
+          <el-col class="pp_item" v-for="(e, i) in newData" :key="'new' + i">
             <el-row type="flex" align="middle">
               <div class="point_item point_checked">
                 <el-row type="flex" align="middle" class="zbox">
                   <el-col :span="18">
-                    <p style="padding-left: 0.02rem;">{{ e.point_code }}</p>
+                    <p style="padding-left: 0.02rem;">{{ e.station_name }}</p>
                   </el-col>
-                  <el-col :span="6" style="border-left: 1px solid #fff;"><p style="font-size: .12rem;font-weight: 700;text-align: center;padding-right: 0.02rem;">{{ e.radio }}</p></el-col>
+                  <el-col :span="6" style="border-left: 1px solid #fff;"><p style="font-size: .12rem;font-weight: 700;text-align: center;padding-right: 0.02rem;">{{ radioOption | findByValue(e.action_type) }}</p></el-col>
                 </el-row>
               </div>
               <i class="el-icon-caret-right icon-caret-right" :style="i === newData.length - 1 ? 'visibility: hidden' : ''"></i>
@@ -55,66 +50,288 @@
       </el-col>
       <el-col :span="8">
         <el-row type="flex" justify="space-between" style="flex-wrap: wrap" >
-          <el-col :span="11" style="margin-bottom: .08rem"><button class="button_control button_control_disabled" @click="newData = []"><p>删除任务链</p></button></el-col>
-          <el-col :span="11" style="margin-bottom: .08rem"><button class="button_control button_control_disabled"><p>取消任务</p></button></el-col>
-          <el-col :span="11"><button class="button_control"><p>保存任务</p></button></el-col>
-          <el-col :span="11"><button class="button_control"><p>发送任务</p></button></el-col>
+          <el-col v-if="activeName === 'rwl'" :span="11" style="margin-bottom: .08rem"><button class="button_control" :class="{'button_control_disabled': !chainId}" :disabled="disabled" @click="_deleteTaskChain"><p>删除任务链</p></button></el-col>
+          <el-col v-if="activeName === 'zdy'" :span="11" style="margin-bottom: .08rem"><button class="button_control" :class="{'button_control_disabled': !newData.length}" @click="newData = []"><p>清空</p></button></el-col>
+          <el-col :span="11" style="margin-bottom: .08rem"><button class="button_control" :disabled="disabled" @click="_cancelTask"><p>取消任务</p></button></el-col>
+          <el-col v-if="activeName === 'zdy'" :span="11"><button class="button_control" :class="{'button_control_disabled': !newData.length}" :disabled="disabled" @click="_saveTask"><p>保存任务</p></button></el-col>
+          <el-col :span="11"><button class="button_control" :class="{'button_control_disabled': !newData.length}" :disabled="disabled" @click="_sendTask"><p>发送任务</p></button></el-col>
         </el-row>
-        <!-- <button class="button_control button_control_disabled" style="margin-bottom: .08rem" @click="newData = []"><p>{{$t('Empty')}}</p></button>
-        <button class="button_control"><p :style="$i18n.locale === 'en-us' ? 'font-size: 0.19rem;' : 'font-size: 0.22rem;'">{{$t('SendTask')}}</p></button> -->
       </el-col>
     </el-row>
+    <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
   </div>
 </template>
 
 <script>
+import { queryStation, queryTaskChain, sendTask, saveTask, cancelTask, deleteTaskChain, updateStation } from '@config/getData.js'
 export default {
   data () {
     return {
-      popId: null,
-      radioOption: [{label: '取货', value: '取'}, {label: '放货', value: '放'}, {label: '移动', value: '移'}, {label: '返回点', value: '返'}],
-      dataList: [{point_code: 'A', radio: ''}, {point_code: 'B', radio: ''}, {point_code: 'C', radio: ''}, {point_code: 'D', radio: ''}, {point_code: 'E', radio: ''}, {point_code: 'F', radio: ''}],
+      activeName: 'zdy',
+      stationName: '',
+      radioOption: [{label: '取货', text: '取', value: 'Ascend'}, {label: '放货', text: '放', value: 'Descend'}, {label: '移动', text: '移', value: 'Move'}, {label: '返回点', text: '返', value: 'Customize'}],
+      dataList: [],
       newData: [],
-      linkData: [{point_code: 'A-B-C', radio: '取-放-移'}]
+      linkData: [],
+      chainId: null,
+      disabled: false,
+      loading: null,
+      visible: false,
+      layout: 'normal',
+      input: null,
+      options: {
+        useKbEvents: false,
+        preventClickEvent: false
+      }
     }
   },
+  mounted () {
+    this._queryStation()
+  },
   methods: {
+    // 站点查询
+    async _queryStation () {
+      try {
+        let res = await queryStation()
+        if (res && res.data) {
+          this.dataList = [...res.data]
+        }
+      } catch (e) {
+        this.$message.error(e)
+      }
+    },
+    // 任务链查询
+    async _queryTaskChain () {
+      this.chainId = null
+      try {
+        let res = await queryTaskChain()
+        if (res && res.data) {
+          this.linkData = [...res.data]
+        }
+      } catch (e) {
+        this.$message.error(e)
+      }
+    },
+    // 点击自定义站点
+    openPopover (index) {
+      const popover = this.$refs[`popover-${index}`]
+      if (popover && popover[0]) {
+        popover[0].doShow()
+        this.stationName = ''
+      }
+    },
+    // 关闭弹窗
+    closePopover (index) {
+      const popover = this.$refs[`popover-${index}`]
+      if (popover && popover[0]) {
+        popover[0].doClose()
+      }
+    },
+    // 修改站点名称
+    async _updateStation (e, i) {
+      this.disabled = true
+      if (this.stationName === '') {
+        this.disabled = false
+        this.closePopover(i)
+        this.visible = false
+        return
+      }
+      try {
+        this.loading = this.$loading({
+          lock: true,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.6)'
+        })
+        let res = await updateStation(e.station_code, this.stationName)
+        if (res) {
+          this.$message(res.message)
+          this._queryStation()
+        }
+        this.loading.close()
+        this.disabled = false
+        this.closePopover(i)
+        this.visible = false
+      } catch (e) {
+        this.$message.error(e)
+        this.loading.close()
+        this.disabled = false
+        this.closePopover(i)
+        this.visible = false
+      }
+    },
+    // 切换标签
     tabClick () {
       this.newData = []
+      this.chainId = null
+      if (this.activeName === 'zdy') {
+        this._queryStation()
+      } else if (this.activeName === 'rwl') {
+        this._queryTaskChain()
+      }
     },
-    radioInput (e) {
-      const lastItem = this.newData.length > 0 ? this.newData[this.newData.length - 1].point_code : null
-      if (lastItem === this.popId) {
+    // 选取动作类型
+    radioInput (e, i, value) {
+      const lastItem = this.newData.length > 0 ? this.newData[this.newData.length - 1].station_code : null
+      if (lastItem === e.station_code) {
         this.$message('相邻的两个站点不能相同')
-        this.popId = ''
+        this.closePopover(i)
         return
       }
       if (this.newData.length > 4) {
         this.$message('最多选取5个站点')
-        this.popId = ''
+        this.closePopover(i)
         return
       }
-      this.newData.push({point_code: this.popId, radio: e})
-      this.popId = ''
-    },
-    handleCheck (e) {
-      if (this.newData.length > 3) {
-        return
-      }
-      if (this.newData.length === 0) {
-        this.newData.push({point_code: e.point_code, radio: '起'})
-      } else if (this.newData.length === 1) {
-        this.newData.push({point_code: e.point_code, radio: '终'})
-      } else if (this.newData.length === 2) {
-        this.newData.push({point_code: e.point_code, radio: '停'})
-      }
+      e.action_type = value
+      this.newData.push({station_code: e.station_code, station_name: e.station_name, action_type: e.action_type})
+      this.closePopover(i)
     },
+    // 点击任务链点位
     handleLinkCheck (e) {
-      const data = e.point_code.split('-')
-      const radio = e.radio.split('-')
-      data.map((e, i) => {
-        this.newData.push({point_code: e, radio: radio[i]})
+      const code = e.chain_point.split('-')
+      const cname = e.chain_name.split('-')
+      const type = e.action_type.split('-')
+      code.map((e, i) => {
+        this.newData.push({station_code: e, station_name: cname[i], action_type: type[i]})
       })
+      this.chainId = e.chain_id
+    },
+    // 发送任务
+    async _sendTask () {
+      this.disabled = true
+      if (!this.newData.length) {
+        this.disabled = false
+        return
+      }
+      try {
+        this.loading = this.$loading({
+          lock: true,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.6)'
+        })
+        let res = await sendTask(this.newData)
+        if (res) {
+          this.$message(res.message)
+          this._queryStation()
+          this.newData = []
+        }
+        this.loading.close()
+        this.disabled = false
+      } catch (e) {
+        this.$message.error(e)
+        this.loading.close()
+        this.disabled = false
+      }
+    },
+    // 保存任务
+    async _saveTask () {
+      this.disabled = true
+      if (!this.newData.length) {
+        this.disabled = false
+        return
+      }
+      try {
+        this.loading = this.$loading({
+          lock: true,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.6)'
+        })
+        let res = await saveTask(this.newData)
+        if (res) {
+          this.$message(res.message)
+          this._queryStation()
+          this.newData = []
+        }
+        this.loading.close()
+        this.disabled = false
+      } catch (e) {
+        this.$message.error(e)
+        this.loading.close()
+        this.disabled = false
+      }
+    },
+    // 取消任务
+    async _cancelTask () {
+      this.disabled = true
+      try {
+        this.loading = this.$loading({
+          lock: true,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.6)'
+        })
+        let res = await cancelTask()
+        if (res) {
+          this.$message(res.message)
+          this._queryStation()
+          this.newData = []
+        }
+        this.loading.close()
+        this.disabled = false
+      } catch (e) {
+        this.$message.error(e)
+        this.loading.close()
+        this.disabled = false
+      }
+    },
+    // 删除任务链
+    async _deleteTaskChain () {
+      this.disabled = true
+      if (!this.chainId) {
+        this.disabled = false
+        return
+      }
+      try {
+        this.loading = this.$loading({
+          lock: true,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.6)'
+        })
+        let res = await deleteTaskChain(this.chainId)
+        if (res) {
+          this.$message(res.message)
+          this._queryTaskChain()
+        }
+        this.loading.close()
+        this.disabled = false
+      } catch (e) {
+        this.$message.error(e)
+        this.loading.close()
+        this.disabled = false
+      }
+    },
+    show (e) {
+      // 关闭中文keyboard
+      let arr = document.querySelectorAll('.hg-theme-default')
+      arr.forEach((ele) => {
+        ele.style.visibility = 'hidden'
+      })
+      this.input = e.target
+      this.layout = e.target.dataset.layout
+      if (!this.visible) {
+        this.visible = true
+      }
+    },
+    hide () {
+      this.visible = false
+    },
+    accept () {
+      this.hide()
+    },
+    next () {
+      let inputs = document.querySelectorAll('input')
+      let found = false;
+      [].forEach.call(inputs, (item, i) => {
+        if (!found && item === this.input && i < inputs.length - 1 && this.input.dataset.next === '1') {
+          found = true
+          this.$nextTick(() => {
+            inputs[i + 1].focus()
+          })
+        }
+      })
+      if (!found) {
+        this.input.blur()
+        this.hide()
+      }
     }
   }
 }
@@ -147,7 +364,6 @@ export default {
     line-height .2rem
     color #B4C1D8
     text-align center
-    display: -webkit-box;
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 3; /* 定义显示的行数 */
     overflow: hidden;
@@ -201,6 +417,9 @@ export default {
   &:active, &:hover
     border-color #146fd0
     border-left 1px solid #146fd0
+.task_button_checked
+  border-color #146fd0
+  border-left 1px solid #146fd0
 .task_checked
   color #FFF
   background-color #409EFF
diff --git a/src/pages/modules/login/login.vue b/src/pages/modules/login/login.vue
index ea03225..01d3739 100644
--- a/src/pages/modules/login/login.vue
+++ b/src/pages/modules/login/login.vue
@@ -64,7 +64,7 @@
 
 <script>
 import KeyboardInput from '@components/keyboard-input'
-import {authlogin} from '@config/getData2.js'
+import {authlogin} from '@config/getData.js'
 import {encrypt} from '../../../main.js'
 export default {
   components: {
diff --git a/src/style/common.styl b/src/style/common.styl
index 1089ff8..ad02fee 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -77,6 +77,9 @@
 }
 
 // element css
+.el-loading-spinner i
+  font-size .24rem
+  color #fff
 .el-button
   font-size .16rem
 .el-dialog