From 322a4fa8a7facb4e13bac5ea5ef2c5df65c39ba5 Mon Sep 17 00:00:00 2001 From: xudan Date: Mon, 8 Dec 2025 13:57:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(context-menu):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=B9=B6=E6=94=B9=E7=94=A8Ant=20Design=20Menu?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=90=8C=E6=97=B6=E4=B8=BA=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E4=BA=BA=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=92=8C=E8=A7=86?= =?UTF-8?q?=E8=A7=89=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/components/context-menu/point-menu.vue | 136 +++++++----- src/components/modal/robot-selector-modal.vue | 196 +++++++++++------- 3 files changed, 207 insertions(+), 127 deletions(-) diff --git a/.env.development b/.env.development index 41af242..32a2c09 100644 --- a/.env.development +++ b/.env.development @@ -4,5 +4,5 @@ ENV_WEBSOCKET_BASE=/ws ENV_STORAGE_WEBSOCKET_BASE=/vwedWs # 开发环境token配置 - 可以手动设置或从另一个项目获取后填入 -ENV_DEV_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NjQ3MDExNDcsInVzZXJuYW1lIjoiYWRtaW4ifQ.NHLOjXm9JblCXXaDmc8PRvqB-uIpjwltrFh2EH4usIc +ENV_DEV_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NjUzMDIxMjcsInVzZXJuYW1lIjoiYWRtaW4ifQ.Bu5YpD-lg4YG2_H6kkbauZK7WpjqOxoBtwD4AiZXAWI ENV_DEV_TENANT_ID=1000 diff --git a/src/components/context-menu/point-menu.vue b/src/components/context-menu/point-menu.vue index 2cf8416..55e6494 100644 --- a/src/components/context-menu/point-menu.vue +++ b/src/components/context-menu/point-menu.vue @@ -3,7 +3,6 @@
-
📍
{{ pointInfo?.name || '未知站点' }}
ID: {{ pointInfo?.id }}
@@ -12,25 +11,21 @@
- + -
- -
+ -
- 🧭 - 导航至此站点 -
-
- 选择机器人并下发移动任务到当前站点 -
-
-
+ 导航至此站点 + + { \ No newline at end of file diff --git a/src/components/modal/robot-selector-modal.vue b/src/components/modal/robot-selector-modal.vue index d5e740a..561298b 100644 --- a/src/components/modal/robot-selector-modal.vue +++ b/src/components/modal/robot-selector-modal.vue @@ -7,30 +7,37 @@ @cancel="handleCancel" >
+ +
+ + + +
+
- -
- -
-
{{ robot.label }}
-
- - {{ getRobotStatusText(robot.state) }} - - ID: {{ robot.id }} - - 目标位置: {{ robot.targetPoint }} - -
-
- +
+
+ {{ robot.label }} + - {{ getRobotStatusText(robot.state) }}
- +
+ + + +
+
@@ -55,7 +62,7 @@ import { computed, onMounted, ref, watch } from 'vue'; import type { RobotInfo } from '../../apis/robot'; import { RobotState } from '../../apis/robot'; -import { getAllRobots } from '../../apis/robot'; +import { editorStore } from '../../stores/editor.store'; interface Props { open?: boolean; @@ -80,18 +87,32 @@ const visible = ref(false); const robotList = ref([]); const selectedRobotId = ref(''); const loading = ref(false); +const searchKeyword = ref(''); // 计算属性 const selectedRobot = computed(() => robotList.value.find(robot => robot.id === selectedRobotId.value) ); +const filteredRobotList = computed(() => { + if (!searchKeyword.value.trim()) { + return robotList.value; + } + + const keyword = searchKeyword.value.toLowerCase().trim(); + return robotList.value.filter(robot => + robot.label.toLowerCase().includes(keyword) || + robot.id.toLowerCase().includes(keyword) + ); +}); + // 监听 props.open 变化 watch(() => props.open, (newVal) => { visible.value = newVal; if (newVal) { loadRobotList(); selectedRobotId.value = ''; + searchKeyword.value = ''; } }); @@ -101,14 +122,17 @@ watch(visible, (newVal) => { }); // 加载机器人列表 -const loadRobotList = async () => { +const loadRobotList = () => { try { - const robots = await getAllRobots(); - robotList.value = robots || []; + const editor = editorStore.getEditorValue(); + if (editor) { + robotList.value = editor.robots || []; + } else { + robotList.value = []; + } } catch (error) { console.error('加载机器人列表失败:', error); robotList.value = []; - message.error('加载机器人列表失败'); } }; @@ -129,17 +153,7 @@ const getRobotStatusText = (state?: RobotState): string => { return stateMap[state || RobotState.空闲中] || '未知'; }; -// 获取机器人状态颜色 -const getRobotStatusColor = (state?: RobotState): string => { - const colorMap: Record = { - [RobotState.未知]: '#d9d9d9', // 灰色 - 未知 - [RobotState.任务执行中]: '#1890ff', // 蓝色 - 忙碌 - [RobotState.充电中]: '#faad14', // 橙色 - 充电 - [RobotState.停靠中]: '#52c41a', // 绿色 - 正常 - [RobotState.空闲中]: '#52c41a', // 绿色 - 正常 - }; - return colorMap[state || RobotState.空闲中] || '#d9d9d9'; -}; + // 处理确定按钮点击 const handleConfirm = async () => { @@ -172,6 +186,11 @@ const handleConfirm = async () => { } }; +// 处理选择机器人 +const handleSelectRobot = (robotId: string) => { + selectedRobotId.value = robotId; +}; + // 处理取消按钮点击 const handleCancel = () => { visible.value = false; @@ -188,76 +207,95 @@ onMounted(() => { \ No newline at end of file