From 453f8c76192b7b492751df8ad014688984d98872 Mon Sep 17 00:00:00 2001 From: douyage Date: Wed, 23 Sep 2026 16:35:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=87=E8=81=9A=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=8B=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.htjc6 | 2 +- .env.production | 2 +- .env.staging | 2 +- src/layout/components/Navbar.vue | 2 +- src/utils/stationTitle.js | 4 +- src/views/portal/index.vue | 90 ++++++++++++++++++++++++++------ 7 files changed, 81 insertions(+), 23 deletions(-) diff --git a/.env.development b/.env.development index 891c922..4f09481 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 消防动环管理平台 +VUE_APP_TITLE = 动环智能巡检系统 # 开发环境配置 ENV = 'development' diff --git a/.env.htjc6 b/.env.htjc6 index 202dabe..00fd2b5 100644 --- a/.env.htjc6 +++ b/.env.htjc6 @@ -1,7 +1,7 @@ NODE_ENV = 'production' ENV = 'production' -VUE_APP_TITLE = 消防动环管理平台 +VUE_APP_TITLE = 动环智能巡检系统 VUE_APP_BASE_API = '/app/htjc6/api' VUE_APP_NVR_API = '/nvr-api' diff --git a/.env.production b/.env.production index 35e4529..28b825a 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 消防动环管理平台 +VUE_APP_TITLE = 动环智能巡检系统 # 生产环境配置 ENV = 'production' diff --git a/.env.staging b/.env.staging index a5d5513..a8727d5 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 消防动环管理平台 +VUE_APP_TITLE = 动环智能巡检系统 BABEL_ENV = production diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 97dd201..ba8196c 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -3,7 +3,7 @@
- 消防动环管理平台 + 动环智能巡检系统
diff --git a/src/utils/stationTitle.js b/src/utils/stationTitle.js index 78f1d01..fdd1d74 100644 --- a/src/utils/stationTitle.js +++ b/src/utils/stationTitle.js @@ -2,7 +2,7 @@ // 后续接入新站点：把切图放到 src/assets/images/header/ 下， // 在 stationConfigMap 里加一行 "<该站IP或域名>: { titleImage, name }" 即可； // 同一 IP 不同端口是不同站点时，key 写成 "IP:端口"（如 "192.168.129.2:32799"）； -// 未匹配到的站点使用默认横幅和默认标题"消防动环管理平台"。 +// 未匹配到的站点使用默认横幅和默认标题"动环智能巡检系统"。 import defaultTitleImage from "@/assets/images/header/xfdh-title-navbar.png"; import baiyangpingTitleImage from "@/assets/images/header/baiyangping-title.png"; import baicaopoTitleImage from "@/assets/images/header/baicaopo-title.png"; @@ -29,7 +29,7 @@ const stationConfigMap = { const defaultStationConfig = { titleImage: defaultTitleImage, // 默认站名（环境变量 VUE_APP_TITLE 是"智能巡检"，与需求不符，故直接写死） - name: "消防动环管理平台", + name: "动环智能巡检系统", }; export function getStationConfig() { diff --git a/src/views/portal/index.vue b/src/views/portal/index.vue index 8b7fac5..010a25c 100644 --- a/src/views/portal/index.vue +++ b/src/views/portal/index.vue @@ -131,9 +131,9 @@ :class="{ selected: isMonitorStationSelected(station.id) }" @click="selectMonitorStation(station)" > -
- {{ station.name }} - +
+ {{ station.name }} + @@ -160,6 +160,8 @@
动环监控 +
+
String(id) === String(stationId)); @@ -858,8 +865,11 @@ export default { : `${month}月`; }, toggleDeviceTree() { - this.treeMounted = true; - this.treeVisible = !this.treeVisible; + if (this.treeVisible) { + this.treeVisible = false; + return; + } + this.openDeviceTree(); }, defectValue(card, slide) { const field = slide.fields.find(key => card[key] !== undefined && card[key] !== null); @@ -1407,11 +1417,6 @@ $panel-border: rgba(84, 130, 255, 0.22); align-items: center; gap: 7px; min-width: 0; - cursor: pointer; - - &:hover .station-name { - color: $accent; - } .station-name { min-width: 0; @@ -1421,7 +1426,12 @@ $panel-border: rgba(84, 130, 255, 0.22); font-size: 16px; font-weight: 600; color: #eef7ff; + cursor: pointer; transition: color 0.2s; + + &:hover { + color: $accent; + } } .enter-icon { @@ -1429,10 +1439,17 @@ $panel-border: rgba(84, 130, 255, 0.22); width: 15px; height: 14px; object-fit: contain; + cursor: pointer; } .head-spacer { flex: 1 1 auto; + cursor: default; + } + + .status-dot, + .station-status { + cursor: default; } .station-status { @@ -1512,6 +1529,24 @@ $panel-border: rgba(84, 130, 255, 0.22); flex: 1; } +/* 场站筛选与左侧「表计/外观/红外巡检」分类名同一行、同一高度 */ +.video-filter-row { + display: flex; + align-items: center; + justify-content: flex-end; + flex: none; + height: 16px; + margin: 6px 14px 4px; + padding: 0; + + .panel-select { + position: relative; + top: -6px; + width: 132px; + height: 16px; + } +} + .video-monitor-body { display: flex; flex: 1; @@ -1527,13 +1562,15 @@ $panel-border: rgba(84, 130, 255, 0.22); } .portal-device-tree { + align-self: flex-start; flex: 0 0 46%; width: 46%; + height: calc(100% + 1px); min-width: 280px; max-width: 360px; min-height: 0; padding: 0; - margin: 10px 0 14px; + margin: -1px 0 14px; overflow: hidden; background: transparent !important; @@ -1631,12 +1668,33 @@ $panel-border: rgba(84, 130, 255, 0.22); } } +:deep(.video-filter-row .panel-select.el-select) { + height: 16px; + + .el-input { + height: 16px; + line-height: 16px; + } + + .el-input.el-input--mini .el-input__inner, + .el-input .el-input__inner { + height: 16px !important; + line-height: 14px !important; + } + + .el-input__suffix, + .el-input__icon { + height: 16px; + line-height: 16px; + } +} + .camera-stats { display: grid; grid-template-columns: repeat(4, 1fr); gap: 12px; flex: none; - padding: 10px 14px 12px; + padding: 0 14px 12px; } .video-monitor-body.tree-visible { @@ -1913,7 +1971,7 @@ $panel-border: rgba(84, 130, 255, 0.22); } .el-input__inner { - height: 28px !important; + height: 25px !important; line-height: 26px !important; padding-top: 0; padding-bottom: 0;