From c1601c0a85533c36097f57b704d6e71f4a7257c0 Mon Sep 17 00:00:00 2001 From: ywb <347742090@qq.com> Date: Wed, 27 May 2026 11:09:06 +0800 Subject: [PATCH] - --- agv_app/config.py | 10 +++++++--- agv_app/static/js/running.js | 6 +++++- agv_app/templates/running.html | 4 ++-- agv_app/templates/setting.html | 6 +++--- agv_app/utils/config.py | 9 +++++++-- agv_app/utils/mission_executor.py | 3 ++- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/agv_app/config.py b/agv_app/config.py index 67a1c71..0e9966f 100644 --- a/agv_app/config.py +++ b/agv_app/config.py @@ -6,6 +6,10 @@ import os # 基础路径（部署后对应 ~/work/agv_app） BASE_DIR = os.path.dirname(os.path.abspath(__file__)) +# ========== 网络配置（集中管理所有 IP 地址 — 修改此处即可全局生效）========== +AGV_HOST = "192.168.50.93" +ARM_HOST = "192.168.50.90" + # ========== AGV 参数 ========== AGV_CONFIG = { "device": "/dev/agvpro_controller", @@ -16,7 +20,7 @@ AGV_CONFIG = { # ========== 机械臂 TCP 客户端 ========== ARM_CONFIG = { - "host": "192.168.50.89", + "host": ARM_HOST, "port": 5002, "timeout": 8, "retry_times": 3, @@ -39,8 +43,8 @@ CAMERA_CONFIG = { # ========== 机械臂摄像头流 ========== ARM_CAMERA_CONFIG = { - "url": "http://192.168.50.89:5003/api/camera/preview", - "snapshot_url": "http://192.168.50.89:5003/api/camera/snapshot", + "url": f"http://{ARM_HOST}:5003/api/camera/preview", + "snapshot_url": f"http://{ARM_HOST}:5003/api/camera/snapshot", } # ========== HTTP 上传 ========== diff --git a/agv_app/static/js/running.js b/agv_app/static/js/running.js index 6ed3363..bf00c54 100644 --- a/agv_app/static/js/running.js +++ b/agv_app/static/js/running.js @@ -111,7 +111,11 @@ createApp({ this.progress = 0 this.report = null this.showQrModal = false - await fetch(API + '/api/mission/start', { method: 'POST' }) + await fetch(API + '/api/mission/start', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({}) + }) this.missionState = 'running' }, async startSingleStep() { diff --git a/agv_app/templates/running.html b/agv_app/templates/running.html index 23a14a4..80c86ef 100644 --- a/agv_app/templates/running.html +++ b/agv_app/templates/running.html @@ -4,7 +4,7 @@ 运行监控 - AGV 拍摄系统 - +
@@ -149,6 +149,6 @@
- + \ No newline at end of file diff --git a/agv_app/templates/setting.html b/agv_app/templates/setting.html index 58e1d21..00126d2 100644 --- a/agv_app/templates/setting.html +++ b/agv_app/templates/setting.html @@ -4,7 +4,7 @@ 设置 - AGV 拍摄系统 - +
@@ -583,7 +583,7 @@
- - + + diff --git a/agv_app/utils/config.py b/agv_app/utils/config.py index 505e1b7..ada87a7 100644 --- a/agv_app/utils/config.py +++ b/agv_app/utils/config.py @@ -6,6 +6,10 @@ import os # 基础路径（部署后对应 ~/work/agv_app） BASE_DIR = os.path.dirname(os.path.abspath(__file__)) +# ========== 网络配置（集中管理所有 IP 地址 — 修改此处即可全局生效）========== +AGV_HOST = "192.168.50.93" +ARM_HOST = "192.168.50.90" + # ========== AGV 参数 ========== AGV_CONFIG = { "device": "/dev/agvpro_controller", @@ -16,7 +20,7 @@ AGV_CONFIG = { # ========== 机械臂 TCP 客户端 ========== ARM_CONFIG = { - "host": "192.168.50.89", + "host": ARM_HOST, "port": 5002, "timeout": 8, "retry_times": 3, @@ -39,7 +43,8 @@ CAMERA_CONFIG = { # ========== 机械臂摄像头流 ========== ARM_CAMERA_CONFIG = { - "url": "http://192.168.50.89:5003/api/camera/preview", + "url": f"http://{ARM_HOST}:5003/api/camera/preview", + "snapshot_url": f"http://{ARM_HOST}:5003/api/camera/snapshot", } # ========== HTTP 上传 ========== diff --git a/agv_app/utils/mission_executor.py b/agv_app/utils/mission_executor.py index 6e3c99a..3f14fec 100644 --- a/agv_app/utils/mission_executor.py +++ b/agv_app/utils/mission_executor.py @@ -26,7 +26,8 @@ import numpy as np logger = logging.getLogger(__name__) ROS2_SETUP_CMD = "source /opt/ros/humble/setup.bash && source ~/agv_pro_ros2/install/setup.bash" -ARM_CAMERA_SNAPSHOT = "http://192.168.50.89:5003/api/camera/snapshot" +from config import ARM_CAMERA_CONFIG +ARM_CAMERA_SNAPSHOT = ARM_CAMERA_CONFIG["snapshot_url"] PHOTOS_DIR = "/home/elephant/photos" # 二维码扫描重试参数