From 91698a92285a666b51dc37de806983b87c91d249 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 21 May 2025 15:22:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../css/synthesisQuery/digitalSignage.css | 12 ++++-
.../js/synthesisQuery/digitalSignage.js | 54 ++++++++++++++-----
2 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/static/css/synthesisQuery/digitalSignage.css b/src/main/resources/static/css/synthesisQuery/digitalSignage.css
index 985cfeb..79b558b 100644
--- a/src/main/resources/static/css/synthesisQuery/digitalSignage.css
+++ b/src/main/resources/static/css/synthesisQuery/digitalSignage.css
@@ -153,8 +153,18 @@ body {
}
.legend-box .legend-item img {
- width: 14px;
+ width: 20px;
+ height: 20px;
+}
+
+.legend-box .legend-item:nth-child(1) img,
+.legend-box .legend-item:nth-child(2) img,
+.legend-box .legend-item:nth-child(3) img,
+.legend-box .legend-item:nth-child(5) img,
+.legend-box .legend-item:nth-child(6) img {
+ width: 10px;
height: 18px;
+ margin-left: 5px;
}
.map-container {
diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage.js b/src/main/resources/static/js/synthesisQuery/digitalSignage.js
index 44e4b8a..33261b6 100644
--- a/src/main/resources/static/js/synthesisQuery/digitalSignage.js
+++ b/src/main/resources/static/js/synthesisQuery/digitalSignage.js
@@ -626,29 +626,41 @@ function addAllMapPoints() {
${pointData.towerName}
- 基础开挖
+ 协调完成
${pointData.time1 || "/"}
- 基础开挖完成
+ 基础开挖
${pointData.time2 || "/"}
- 基础浇筑完成
+ 基础开挖完成
${pointData.time3 || "/"}
- 铁塔组立
+ 基础浇筑
${pointData.time4 || "/"}
- 铁塔组立完成
+ 基础浇筑完成
${pointData.time5 || "/"}
- 架线施工完成
+ 铁塔组立
${pointData.time6 || "/"}
+
+ 铁塔组立完成
+ ${pointData.time7 || "/"}
+
+
+ 架线施工完成
+ ${pointData.time8 || "/"}
+
+
+ 附件安装完成
+ ${pointData.time9 || "/"}
+
`;
const infoWindow = new BMapGL.InfoWindow(infoContent, {
@@ -740,45 +752,59 @@ function addAllMapPoints() {
${pointData.towerInfoVo.towerName}
- 基础开挖
- ${pointData.towerInfoVo.time1 || "/"}
+ 协调完成
+ ${
+ pointData.towerInfoVo.time1 || "/"
+ }
- 开挖完成
+ 基础开挖
${pointData.towerInfoVo.time2 || "/"}
- 浇筑完成
+ 基础开挖完成
${pointData.towerInfoVo.time3 || "/"}
- 铁塔组立
+ 基础浇筑
${pointData.towerInfoVo.time4 || "/"}
- 组塔完成
+ 基础浇筑完成
${pointData.towerInfoVo.time5 || "/"}
- 架线完成
+ 铁塔组立
${pointData.towerInfoVo.time6 || "/"}
- 附件安装
+ 铁塔组立完成
${pointData.towerInfoVo.time7 || "/"}
+
+ 架线施工完成
+
+ ${pointData.towerInfoVo.time8 || "/"}
+
+
+
+ 附件安装完成
+
+ ${pointData.towerInfoVo.time9 || "/"}
+
+