diff --git a/eslint.config.js b/eslint.config.js index a492420..bb4ec22 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -44,7 +44,7 @@ export default [ quotes: ['error', 'single'], semi: ['error', 'always'], 'max-len': ['warn', { code: 120, ignoreComments: true, ignoreUrls: true, ignoreTemplateLiterals: true }], - 'max-lines': ['warn', { max: 1000, skipBlankLines: true, skipComments: true }], + 'max-lines': ['warn', { max: 2000, skipBlankLines: true, skipComments: true }], }, }, ]; diff --git a/src/apis/map/constant.ts b/src/apis/map/constant.ts index 238bc53..09b4314 100644 --- a/src/apis/map/constant.ts +++ b/src/apis/map/constant.ts @@ -118,6 +118,8 @@ export enum MapAreaType { 非互斥区, /** 约束区 - 机器人运动受到特定约束的区域 */ 约束区, + /** 描述区 - 用于显示描述信息的特殊区域 */ + 描述区, } /** diff --git a/src/assets/icons/_icon.scss b/src/assets/icons/_icon.scss index 0ef79b5..b9ed579 100644 --- a/src/assets/icons/_icon.scss +++ b/src/assets/icons/_icon.scss @@ -11,6 +11,9 @@ $icons: ( area13-active, area13-detail, area13, + area14-active, + area14-detail, + area14, battery_charge, battery, connect_off, diff --git a/src/assets/icons/dark/area14-active.png b/src/assets/icons/dark/area14-active.png new file mode 100644 index 0000000..a06b747 Binary files /dev/null and b/src/assets/icons/dark/area14-active.png differ diff --git a/src/assets/icons/dark/area14-detail.png b/src/assets/icons/dark/area14-detail.png new file mode 100644 index 0000000..a06b747 Binary files /dev/null and b/src/assets/icons/dark/area14-detail.png differ diff --git a/src/assets/icons/dark/area14.png b/src/assets/icons/dark/area14.png new file mode 100644 index 0000000..a06b747 Binary files /dev/null and b/src/assets/icons/dark/area14.png differ diff --git a/src/assets/icons/light/area14-active.png b/src/assets/icons/light/area14-active.png new file mode 100644 index 0000000..a06b747 Binary files /dev/null and b/src/assets/icons/light/area14-active.png differ diff --git a/src/assets/icons/light/area14-detail.png b/src/assets/icons/light/area14-detail.png new file mode 100644 index 0000000..a06b747 Binary files /dev/null and b/src/assets/icons/light/area14-detail.png differ diff --git a/src/assets/icons/light/area14.png b/src/assets/icons/light/area14.png new file mode 100644 index 0000000..a06b747 Binary files /dev/null and b/src/assets/icons/light/area14.png differ diff --git a/src/assets/themes/editor-dark.json b/src/assets/themes/editor-dark.json index 4660f63..e8bf4f1 100644 --- a/src/assets/themes/editor-dark.json +++ b/src/assets/themes/editor-dark.json @@ -37,6 +37,8 @@ "fill-12": "#0DBB8A33", "stroke-13": "#e61e4aad", "fill-13": "#e61e4a33", + "stroke-14": "#FFD70099", + "fill-14": "#FFD70033", "strokeActive": "#FCC947" }, "robot": { diff --git a/src/assets/themes/editor-light.json b/src/assets/themes/editor-light.json index 4676a68..68a5417 100644 --- a/src/assets/themes/editor-light.json +++ b/src/assets/themes/editor-light.json @@ -37,6 +37,8 @@ "fill-12": "#0DBB8A33", "stroke-13": "#e61e4aad", "fill-13": "#e61e4a33", + "stroke-14": "#FFD70099", + "fill-14": "#FFD70033", "strokeActive": "#EBB214" }, "robot": { diff --git a/src/components/card/area-edit-card.vue b/src/components/card/area-edit-card.vue index 595ad51..3e3d2c3 100644 --- a/src/components/card/area-edit-card.vue +++ b/src/components/card/area-edit-card.vue @@ -87,6 +87,7 @@ const routes = computed( @@ -103,9 +104,12 @@ const routes = computed( @@ -138,7 +142,10 @@ const routes = computed(