From 988452c8211565601c3f8c9e5031ba62dddc0086 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 9 Jun 2026 16:20:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E7=9C=8B=E4=B8=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-ui/src/router/routers.js | 6 + .../src/views/layout/screen/fullscreen.vue | 1010 +++++++++++++++++ .../src/views/layout/screen/index.vue | 26 +- 3 files changed, 1038 insertions(+), 4 deletions(-) create mode 100644 acs/nladmin-ui/src/views/layout/screen/fullscreen.vue diff --git a/acs/nladmin-ui/src/router/routers.js b/acs/nladmin-ui/src/router/routers.js index 07be08d..61eba28 100644 --- a/acs/nladmin-ui/src/router/routers.js +++ b/acs/nladmin-ui/src/router/routers.js @@ -11,6 +11,12 @@ export const constantRouterMap = [ component: (resolve) => require(['@/views/login'], resolve), hidden: true }, + { + path: '/screen/fullscreen', + meta: { title: 'AGV监控看板', noCache: true }, + component: (resolve) => require(['@/views/layout/screen/fullscreen'], resolve), + hidden: true + }, { path: '/404', component: (resolve) => require(['@/views/features/404'], resolve), diff --git a/acs/nladmin-ui/src/views/layout/screen/fullscreen.vue b/acs/nladmin-ui/src/views/layout/screen/fullscreen.vue new file mode 100644 index 0000000..609cea1 --- /dev/null +++ b/acs/nladmin-ui/src/views/layout/screen/fullscreen.vue @@ -0,0 +1,1010 @@ + + + + + diff --git a/acs/nladmin-ui/src/views/layout/screen/index.vue b/acs/nladmin-ui/src/views/layout/screen/index.vue index 2534086..cd59543 100644 --- a/acs/nladmin-ui/src/views/layout/screen/index.vue +++ b/acs/nladmin-ui/src/views/layout/screen/index.vue @@ -22,6 +22,10 @@ {{ autoRefresh ? '自动刷新' : '已暂停' }} + + + 全屏展示 + @@ -148,7 +152,7 @@ class="agv-vehicle" :class="{ active: selectedAgv && selectedAgv.carId === agv.carId, - 'status-normal': agv.status === 2 && !isRequestAction(agv.action), + 'status-normal': agv.status === 2, 'status-rest': agv.status === 1, 'status-error': agv.status === 3, 'status-request': isRequestAction(agv.action) @@ -289,9 +293,9 @@ export default { const stats = { total: 0, normal: 0, rest: 0, error: 0 } this.agvList.forEach(agv => { stats.total++ - if (agv.status === 1) stats.rest++ - else if (agv.status === 2) stats.normal++ - else if (agv.status === 3) stats.error++ + if (agv.status == "1") stats.rest++ + else if (agv.status =="2") stats.normal++ + else if (agv.status == "3") stats.error++ }) return stats }, @@ -478,6 +482,20 @@ export default { }, handleMouseUp() { this.isDragging = false + }, + toggleFullscreen() { + // 构建全屏页面URL,传递当前选中的地图ID + const baseUrl = window.location.origin + window.location.pathname.replace(/\/[^/]*$/, '') + const fullscreenUrl = `${baseUrl}/#/screen/fullscreen?mapId=${this.selectedMapId || ''}` + + // 打开新窗口,设置为全屏 + const width = window.screen.width + const height = window.screen.height + window.open( + fullscreenUrl, + '_blank', + `width=${width},height=${height},left=0,top=0,toolbar=no,menubar=no,location=no,status=no` + ) } } }