From fdb88b21a1c29c1df058923296d320c5f21d0d1c Mon Sep 17 00:00:00 2001 From: ywb <347742090@qq.com> Date: Thu, 14 May 2026 22:22:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=BA=E5=9E=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agv_app/data/machines_config.json | 42 ++++++++ agv_app/templates/setting.html | 168 +++++++++++++++--------------- 2 files changed, 128 insertions(+), 82 deletions(-) diff --git a/agv_app/data/machines_config.json b/agv_app/data/machines_config.json index bdb5f16..bb03c17 100644 --- a/agv_app/data/machines_config.json +++ b/agv_app/data/machines_config.json @@ -292,5 +292,47 @@ ], "poses": [] } + }, + { + "id": "m_1_1", + "row": 1, + "col": 1, + "front": { + "coords": [ + 0, + 0, + 0 + ], + "poses": [] + }, + "back": { + "coords": [ + 0, + 0, + 0 + ], + "poses": [] + } + }, + { + "id": "m_1_0", + "row": 1, + "col": 0, + "front": { + "coords": [ + 0, + 0, + 0 + ], + "poses": [] + }, + "back": { + "coords": [ + 0, + 0, + 0 + ], + "poses": [] + } } ] \ No newline at end of file diff --git a/agv_app/templates/setting.html b/agv_app/templates/setting.html index a14e794..d6dfded 100644 --- a/agv_app/templates/setting.html +++ b/agv_app/templates/setting.html @@ -4,7 +4,7 @@ 设置 - AGV 拍摄系统 - +
@@ -20,8 +20,8 @@
- +
@@ -64,119 +64,122 @@
- + +

📦 机型配置

- + -
+

添加新机型

- +
- +
- +
- + -
+

暂无机型配置，请添加新机型

- +
-
+
-
+
- {{ m.name }} - ID: {{ m.id }} - {{ m.description }} - 【{{ m.notes }}】 + {% raw %}{ m.name }{% endraw %} + ID: {% raw %}{ m.id }{% endraw %} + {% raw %}{ m.description }{% endraw %} + 【{% raw %}{ m.notes }{% endraw %}】
- - -
- -
-

🔵 正面姿态

-
-
- {{ pose.name or '正面姿态' }} - -
-
-
- J{{j}} - - ° -
-
+ + +
+

🟢 正面姿态

+
+
+ {% raw %}{ pose.name or '正面姿态' }{% endraw %} +
- -
-
- - -
-
- 当前机械臂角度: - - J1={{ currentAngles[0]?.toFixed(1) }}° J2={{ currentAngles[1]?.toFixed(1) }}° J3={{ currentAngles[2]?.toFixed(1) }}° J4={{ currentAngles[3]?.toFixed(1) }}° J5={{ currentAngles[4]?.toFixed(1) }}° J6={{ currentAngles[5]?.toFixed(1) }}° - - （未连接机械臂） +
+
+ J{% raw %}{ j }{% endraw %} + + °
- - -
-

🔴 背面姿态

-
-
- {{ pose.name or '背面姿态' }} - -
-
-
- J{{j}} - - ° -
+ +
+
+ + +
+
+ 当前机械臂角度: + + J{% raw %}{ currentAngles[0] ? currentAngles[0].toFixed(1) : '—' }{% endraw %}° + J{% raw %}{ currentAngles[1] ? currentAngles[1].toFixed(1) : '—' }{% endraw %}° + J{% raw %}{ currentAngles[2] ? currentAngles[2].toFixed(1) : '—' }{% endraw %}° + J{% raw %}{ currentAngles[3] ? currentAngles[3].toFixed(1) : '—' }{% endraw %}° + J{% raw %}{ currentAngles[4] ? currentAngles[4].toFixed(1) : '—' }{% endraw %}° + J{% raw %}{ currentAngles[5] ? currentAngles[5].toFixed(1) : '—' }{% endraw %}° + + （未连接机械臂） +
+
+
+ + +
+

🔴 背面姿态

+
+
+ {% raw %}{ pose.name or '背面姿态' }{% endraw %} + +
+
+
+ J{% raw %}{ j }{% endraw %} + + °
- -
-
- - -
+
+ +
+
+ +
@@ -185,7 +188,8 @@
- + +
@@ -399,7 +403,7 @@
当前: ({% raw %}{{ pointEditor.x.toFixed(2) }}{% endraw %}, {% raw %}{{ pointEditor.y.toFixed(2) }}{% endraw %}, {% raw %}{{ pointEditor.yaw.toFixed(2) }}{% endraw %})
-
+
💡 此点位服务于: {% raw %}{{ getPointOwnerLabel(editingPoint.pointRow, editingPoint.col).split('·')[1] || '无' }}{% endraw %}
@@ -501,7 +505,7 @@
- - + +