FaulknerWu/smart-inspection
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
ywb
2026-05-27 11:09:06 +08:00
parent 9b8e2e233a
commit c1601c0a85
6 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agv_app/config.py
+7 -3
View File
@@ -6,6 +6,10 @@ import os
# 基础路径（部署后对应 ~/work/agv_app） # 基础路径（部署后对应 ~/work/agv_app）
BASE_DIR = os.path.dirname(os.path.abspath(__file__)) BASE_DIR = os.path.dirname(os.path.abspath(__file__))
# ========== 网络配置（集中管理所有 IP 地址 — 修改此处即可全局生效）==========
AGV_HOST = "192.168.50.93"
ARM_HOST = "192.168.50.90"
# ========== AGV 参数 ========== # ========== AGV 参数 ==========
AGV_CONFIG = { AGV_CONFIG = {
"device": "/dev/agvpro_controller", "device": "/dev/agvpro_controller",
@@ -16,7 +20,7 @@ AGV_CONFIG = {
# ========== 机械臂 TCP 客户端 ========== # ========== 机械臂 TCP 客户端 ==========
ARM_CONFIG = { ARM_CONFIG = {
"host": "192.168.50.89", "host": ARM_HOST,
"port": 5002, "port": 5002,
"timeout": 8, "timeout": 8,
"retry_times": 3, "retry_times": 3,
@@ -39,8 +43,8 @@ CAMERA_CONFIG = {
# ========== 机械臂摄像头流 ========== # ========== 机械臂摄像头流 ==========
ARM_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": "http://192.168.50.89:5003/api/camera/snapshot", "snapshot_url": f"http://{ARM_HOST}:5003/api/camera/snapshot",
} }
# ========== HTTP 上传 ========== # ========== HTTP 上传 ==========
agv_app/static/js/running.js
+5 -1
View File
@@ -111,7 +111,11 @@ createApp({
this.progress = 0 this.progress = 0
this.report = null this.report = null
this.showQrModal = false 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' this.missionState = 'running'
}, },
async startSingleStep() { async startSingleStep() {
agv_app/templates/running.html
+2 -2
View File
@@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>运行监控 - AGV 拍摄系统</title> <title>运行监控 - AGV 拍摄系统</title>
<link rel="stylesheet" href="/static/css/style.css"> <link rel="stylesheet" href="/static/css/style.css?v=20260527a">
</head> </head>
<body> <body>
<div id="app"> <div id="app">
@@ -149,6 +149,6 @@
</div> </div>
<script src="/static/js/vue3.global.prod.js"></script> <script src="/static/js/vue3.global.prod.js"></script>
<script src="/static/js/running.js"></script> <script src="/static/js/running.js?v=20260527a"></script>
</body> </body>
</html> </html>
agv_app/templates/setting.html
+3 -3
View File
@@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>设置 - AGV 拍摄系统</title> <title>设置 - AGV 拍摄系统</title>
<link rel="stylesheet" href="/static/css/style.css?v=20260526a"> <link rel="stylesheet" href="/static/css/style.css?v=20260527a">
</head> </head>
<body> <body>
<div id="app"> <div id="app">
@@ -583,7 +583,7 @@
</main> </main>
</div> </div>
<script src="/static/js/vue3.global.prod.js?v=20260526a"></script> <script src="/static/js/vue3.global.prod.js?v=20260527a"></script>
<script src="/static/js/setting.js?v=20260526f"></script> <script src="/static/js/setting.js?v=20260527a"></script>
</body> </body>
</html> </html>
agv_app/utils/config.py
+7 -2
View File
@@ -6,6 +6,10 @@ import os
# 基础路径（部署后对应 ~/work/agv_app） # 基础路径（部署后对应 ~/work/agv_app）
BASE_DIR = os.path.dirname(os.path.abspath(__file__)) BASE_DIR = os.path.dirname(os.path.abspath(__file__))
# ========== 网络配置（集中管理所有 IP 地址 — 修改此处即可全局生效）==========
AGV_HOST = "192.168.50.93"
ARM_HOST = "192.168.50.90"
# ========== AGV 参数 ========== # ========== AGV 参数 ==========
AGV_CONFIG = { AGV_CONFIG = {
"device": "/dev/agvpro_controller", "device": "/dev/agvpro_controller",
@@ -16,7 +20,7 @@ AGV_CONFIG = {
# ========== 机械臂 TCP 客户端 ========== # ========== 机械臂 TCP 客户端 ==========
ARM_CONFIG = { ARM_CONFIG = {
"host": "192.168.50.89", "host": ARM_HOST,
"port": 5002, "port": 5002,
"timeout": 8, "timeout": 8,
"retry_times": 3, "retry_times": 3,
@@ -39,7 +43,8 @@ CAMERA_CONFIG = {
# ========== 机械臂摄像头流 ========== # ========== 机械臂摄像头流 ==========
ARM_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 上传 ========== # ========== HTTP 上传 ==========
agv_app/utils/mission_executor.py
+2 -1
View File
@@ -26,7 +26,8 @@ import numpy as np
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
ROS2_SETUP_CMD = "source /opt/ros/humble/setup.bash && source ~/agv_pro_ros2/install/setup.bash" 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" PHOTOS_DIR = "/home/elephant/photos"
# 二维码扫描重试参数 # 二维码扫描重试参数