From 318e69cfaf72cae57692e53d17855dd1d056412d Mon Sep 17 00:00:00 2001 From: xudan Date: Tue, 2 Sep 2025 17:39:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E9=81=BF=E8=AE=A9=E7=82=B9=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AF=B9=E5=BA=94=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/map/constant.ts | 2 ++ src/assets/themes/editor-dark.json | 3 ++- src/assets/themes/editor-light.json | 3 ++- src/services/editor.service.ts | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/apis/map/constant.ts b/src/apis/map/constant.ts index afcdf87..ac177d9 100644 --- a/src/apis/map/constant.ts +++ b/src/apis/map/constant.ts @@ -18,6 +18,8 @@ export enum MapPointType { 临时避让点, /** 库区点 - 仓储作业区域 */ 库区点, + /** 不可避让点 - 机器人不可避让的点位 */ + 不可避让点, /** 密集库区点 - 密集库区点位 */ // 密集库区点, diff --git a/src/assets/themes/editor-dark.json b/src/assets/themes/editor-dark.json index c806666..cddd99e 100644 --- a/src/assets/themes/editor-dark.json +++ b/src/assets/themes/editor-dark.json @@ -8,7 +8,8 @@ "fill-2": "#69C6F5", "fill-3": "#E48B1D", "fill-4": "#E48B1D", - "fill-5": "#a72b69" + "fill-5": "#a72b69", + "fill-6": "#E63A3A" }, "point-l": { "stroke": "#595959", diff --git a/src/assets/themes/editor-light.json b/src/assets/themes/editor-light.json index a3624af..3ef4343 100644 --- a/src/assets/themes/editor-light.json +++ b/src/assets/themes/editor-light.json @@ -8,7 +8,8 @@ "fill-2": "#69C6F5", "fill-3": "#E48B1D", "fill-4": "#E48B1D", - "fill-5": "#a72b69" + "fill-5": "#a72b69", + "fill-6": "#E63A3A" }, "point-l": { "stroke": "#595959", diff --git a/src/services/editor.service.ts b/src/services/editor.service.ts index 236b739..23f4442 100644 --- a/src/services/editor.service.ts +++ b/src/services/editor.service.ts @@ -1493,6 +1493,7 @@ function drawPoint(ctx: CanvasRenderingContext2D, pen: MapPen): void { case MapPointType.避让点: case MapPointType.临时避让点: case MapPointType.库区点: + case MapPointType.不可避让点: ctx.beginPath(); ctx.moveTo(x + w / 2 - r, y + r); ctx.arcTo(x + w / 2, y, x + w - r, y + h / 2 - r, r); From 5f75ca2fa2aeff46302867907a73a0080e6cd795 Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 3 Sep 2025 17:17:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E9=81=BF=E8=AE=A9=E7=82=B9=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/map/constant.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apis/map/constant.ts b/src/apis/map/constant.ts index ac177d9..f6874b3 100644 --- a/src/apis/map/constant.ts +++ b/src/apis/map/constant.ts @@ -19,7 +19,7 @@ export enum MapPointType { /** 库区点 - 仓储作业区域 */ 库区点, /** 不可避让点 - 机器人不可避让的点位 */ - 不可避让点, + 不可避让点 = 7, /** 密集库区点 - 密集库区点位 */ // 密集库区点, From 4405702381599996575609bb167ccfc8f6277057 Mon Sep 17 00:00:00 2001 From: xudan Date: Fri, 5 Sep 2025 16:31:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=9D=90=E6=A0=87=E8=BD=AC=E6=8D=A2=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=9A=84HTML=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 地图互转工具.html | 1672 --------------------------------------------- 1 file changed, 1672 deletions(-) delete mode 100644 地图互转工具.html diff --git a/地图互转工具.html b/地图互转工具.html deleted file mode 100644 index 7f9fc0c..0000000 --- a/地图互转工具.html +++ /dev/null @@ -1,1672 +0,0 @@ - - - - - - 地图坐标转换工具 - - - - -
-
-

🗺️ 地图坐标转换工具

-

支持仙工地图、标准地图与Scene格式的互相转换，并提供坐标缩放功能

-
- -
- -
-
-
📁
-

选择地图文件

-

支持JSON、SMAP格式，最大100MB

-

💡 可以直接拖拽文件到此区域

- - -
-
🚀 释放文件开始处理
- -
- - -
-

🔄 选择转换方向

-
-
-
🎯 仙工 → 标准
-
将仙工地图转换为标准地图格式
-
-
-
📐 标准 → 仙工
-
将标准地图转换为仙工地图格式
-
-
-
🎨 转换为 Scene
-
转换为可导入编辑器的Scene文件格式
-
-
- - -
-

📏 坐标缩放设置

-
- - -
- - - - - -
-
-
💡 输入缩放倍数或点击快捷按钮。例如：100表示放大100倍，0.01表示缩小100倍
-
- - -
-
-
-
- - -
-

✅ 转换完成

-

地图已成功转换，点击下载转换后的文件。

- -
-
- - -
-
-
-
- - - - From e2753c65a3d42bbda3dfc859122b7bd4435b8699 Mon Sep 17 00:00:00 2001 From: xudan Date: Fri, 19 Sep 2025 09:47:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=9D=90=E6=A0=87=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=8E=A7=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/movement-supervision.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/movement-supervision.vue b/src/pages/movement-supervision.vue index db06920..3321f95 100644 --- a/src/pages/movement-supervision.vue +++ b/src/pages/movement-supervision.vue @@ -92,7 +92,7 @@ const monitorScene = async () => { // 处理路径坐标转换，参考refreshRobot方法的逻辑 let processedPath: Array<{ x: number; y: number }> | undefined; - if (points?.length) { + if (points?.length && !isMonitorMode.value) { // 新路径：相对于机器人中心的坐标 const cx = x || 37; // 机器人中心X坐标，默认37 const cy = y || 37; // 机器人中心Y坐标，默认37