From cdf9462a709fd72d3404d2a0811de394fa402b55 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 14 Jul 2025 16:46:51 +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/config/getData.js | 13 ++-- src/config/websocket.js | 7 +-- src/pages/modules/device.vue | 19 ++++-- src/pages/modules/save-chain.vue | 100 +++++++++++++++++++++++++++++++ src/pages/shells/index.vue | 39 ++++++++++-- src/vuex/modules/com.js | 4 +- 6 files changed, 160 insertions(+), 22 deletions(-) create mode 100644 src/pages/modules/save-chain.vue diff --git a/src/config/getData.js b/src/config/getData.js index d31a79b..38701ce 100644 --- a/src/config/getData.js +++ b/src/config/getData.js @@ -6,12 +6,8 @@ export const authlogin = (username, password) => post('auth/login', { password: password }) // 建图 -export const startMapping = (na) => post('teaching/startMapping', { - mapName: na -}) -export const setStation = (sn) => post('teaching/setStation', { - stationName: sn -}) +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', { @@ -29,8 +25,9 @@ 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 saveTask = (data, chain) => post('api/operate/saveTask', { + data: data, + chain_name: chain }) export const cancelTask = () => post('api/operate/cancelTask', {}) export const deleteTaskChain = (id) => post('api/operate/deleteTaskChain', { diff --git a/src/config/websocket.js b/src/config/websocket.js index ae5f0e0..7f363b5 100644 --- a/src/config/websocket.js +++ b/src/config/websocket.js @@ -1,5 +1,4 @@ -// import { Message } from 'element-ui' -import { toast } from './utils.js' + // import { getToken } from '@/utils/authToken' // 与后端的协商,websocket请求需要带上token参数 let websock = null let messageCallback = null @@ -37,7 +36,7 @@ function websocketclose (e) { // e.code === 1000 表示正常关闭。 无论为何目的而创建, 该链接都已成功完成任务。 // e.code !== 1000 表示非正常关闭。 if (e && e.code !== 1000) { - toast('server error') + this.$message.error('server error') errorCallback() // // 如果需要设置异常重连则可替换为下面的代码,自行进行测试 // if (tryTime < 10) { @@ -60,7 +59,7 @@ function websocketOpen (e) { // 初始化weosocket function initWebSocket () { if (typeof (WebSocket) === 'undefined') { - toast('您的浏览器不支持WebSocket,无法获取数据') + this.$message.error('您的浏览器不支持WebSocket,无法获取数据') return false } // ws请求完整地址 diff --git a/src/pages/modules/device.vue b/src/pages/modules/device.vue index f70dc0e..28dd2db 100644 --- a/src/pages/modules/device.vue +++ b/src/pages/modules/device.vue @@ -58,13 +58,18 @@ + diff --git a/src/pages/shells/index.vue b/src/pages/shells/index.vue index 4381bee..d69d65d 100644 --- a/src/pages/shells/index.vue +++ b/src/pages/shells/index.vue @@ -7,11 +7,16 @@
自动模式
-
执行中
-
-
+
{{ topInfo.state }}
+
+
-
50%
+
{{topInfo.batteryPower !== -1 ? `${topInfo.batteryPower}%` : ''}}
+
+
+
+
+
@@ -40,6 +45,7 @@