diff --git a/src/apis/map/constant.ts b/src/apis/map/constant.ts index ebe87ad..d1c83a8 100644 --- a/src/apis/map/constant.ts +++ b/src/apis/map/constant.ts @@ -102,6 +102,8 @@ export enum MapAreaType { 互斥区 = 11, /** 非互斥区 - 可以同时有多个机器人进入的区域 */ 非互斥区, + /** 约束区 - 机器人运动受到特定约束的区域 */ + 约束区, } /** diff --git a/src/apis/map/type.ts b/src/apis/map/type.ts index f251b67..ea507f2 100644 --- a/src/apis/map/type.ts +++ b/src/apis/map/type.ts @@ -43,6 +43,7 @@ export interface MapAreaInfo { type: MapAreaType; // 区域类型 points?: Array; // 绑定点位id集合 routes?: Array; // 绑定线路id集合 + maxAmr?: number; // 最大可容纳AMR数 } //#endregion diff --git a/src/apis/scene/type.ts b/src/apis/scene/type.ts index 687f710..eb5bebd 100644 --- a/src/apis/scene/type.ts +++ b/src/apis/scene/type.ts @@ -64,6 +64,7 @@ export interface StandardSceneArea { type: number; // 区域类型 points?: Array; // 绑定点位id集合 routes?: Array; // 绑定线路id集合 + maxAmr?: number; // 最大可容纳AMR数 config?: object; // 其它属性配置(可按需增加) properties?: unknown; // 附加数据(前端不做任何处理) } diff --git a/src/assets/icons/_icon.scss b/src/assets/icons/_icon.scss index ecb71af..0ef79b5 100644 --- a/src/assets/icons/_icon.scss +++ b/src/assets/icons/_icon.scss @@ -8,6 +8,9 @@ $icons: ( area12-active, area12-detail, area12, + area13-active, + area13-detail, + area13, battery_charge, battery, connect_off, diff --git a/src/assets/icons/dark/area13-active.png b/src/assets/icons/dark/area13-active.png new file mode 100644 index 0000000..c6dbdfd Binary files /dev/null and b/src/assets/icons/dark/area13-active.png differ diff --git a/src/assets/icons/dark/area13-detail.png b/src/assets/icons/dark/area13-detail.png new file mode 100644 index 0000000..ecb5c79 Binary files /dev/null and b/src/assets/icons/dark/area13-detail.png differ diff --git a/src/assets/icons/dark/area13.png b/src/assets/icons/dark/area13.png new file mode 100644 index 0000000..7e28911 Binary files /dev/null and b/src/assets/icons/dark/area13.png differ diff --git a/src/assets/themes/editor-dark.json b/src/assets/themes/editor-dark.json index b775110..edfdc90 100644 --- a/src/assets/themes/editor-dark.json +++ b/src/assets/themes/editor-dark.json @@ -28,6 +28,8 @@ "fill-11": "#FF9A9A33", "stroke-12": "#0DBB8A99", "fill-12": "#0DBB8A33", + "stroke-13": "#e61e4aad", + "fill-13": "#e61e4a33", "strokeActive": "#FCC947" }, "robot": { diff --git a/src/components/card/area-edit-card.vue b/src/components/card/area-edit-card.vue index effc01e..b5e68a2 100644 --- a/src/components/card/area-edit-card.vue +++ b/src/components/card/area-edit-card.vue @@ -65,6 +65,21 @@ const routes = computed( + + + {{ $t('最大可容纳AMR数') }}: + + + + + @@ -108,7 +123,7 @@ const routes = computed(