bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-08-04 13:37:39 +08:00
parent eb3a0172d4 8758cff5ea
commit 3a9ed058c4
3 changed files with 97 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/resources/static/css/synthesisQuery/digitalSignage.css
View File

@ -188,7 +188,7 @@ body {
.map-container h4 {
margin: 0 0 8px 0;
font-size: 16px;
font-size: 20px;
border-bottom: 1px solid rgba(255, 255, 255, 0.2);
padding-bottom: 5px;
}
@ -198,11 +198,12 @@ body {
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
font-size: 18px;
}
.map-container-item-ropeway {
display: flex;
font-size: 18px;
}
.map-container-item span:first-child {
width: 160px;
@ -217,7 +218,7 @@ body {
position: absolute;
bottom: 35px;
left: 15px;
width: 40%;
width: 30%;
padding: 10px;
background: rgba(0, 0, 0, 0.6);
border-radius: 10px;
@ -230,7 +231,7 @@ body {
}
.project-overview-preview-box {
width: 260px;
width: 180px;
background: rgba(0, 0, 0, 0.6);
position: absolute;
/* 定位使预览盒子在工程概况的右边 */
@ -238,7 +239,7 @@ body {
right: -105%;
z-index: 1000;
display: none;
font-size: 14px;
font-size: 16px;
color: #fff;
border-radius: 10px;
padding: 10px;
@ -268,7 +269,7 @@ body {
text-indent: 2em;
/* max-height: 220px; */
color: #fff;
font-size: 16px;
font-size: 17px;
letter-spacing: 1px;
/* padding-bottom: 10px; */
/* 设置溢出隐藏显示... */

2
src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js
View File

@ -121,7 +121,7 @@ function initTable(dataList, limit, page) {
// align: "center",
// },
{
field: "name",
field: "towerName",
title: "名称",
unresize: true,
align: "center",

177
src/main/resources/static/js/synthesisQuery/digitalSignage-new.js
View File

@ -759,74 +759,76 @@ async function addAllMapPoints() {
// console.log("点击了标点", event.graphic.attr);
console.log(event, "pointData点击了----");
// <div class="map-container-1 map-container">
// <h4>
// ${pointData.towerInfoVo.towerName}
// </h4>
// <div class="map-container-item">
// <span>协调完成</span>
// <span>${
// pointData.towerInfoVo.time1 || "/"
// }</span>
// </div>
// <div class="map-container-item">
// <span>基础开挖</span>
// <span>
// ${pointData.towerInfoVo.time2 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>基础开挖完成</span>
// <span>
// ${pointData.towerInfoVo.time3 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>基础浇筑</span>
// <span>
// ${pointData.towerInfoVo.time4 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>基础浇筑完成</span>
// <span>
// ${pointData.towerInfoVo.time5 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>铁塔组立</span>
// <span>
// ${pointData.towerInfoVo.time6 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>铁塔组立完成</span>
// <span>
// ${pointData.towerInfoVo.time7 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>架线施工</span>
// <span>
// ${pointData.towerInfoVo.time8 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>架线施工完成</span>
// <span>
// ${pointData.towerInfoVo.time9 || "/"}
// </span>
// </div>
// <div class="map-container-item">
// <span>附件安装完成</span>
// <span>
// ${pointData.towerInfoVo.time10 || "/"}
// </span>
// </div>
// </div>
const graphic = event.graphic;
const infoContent = `
<div class="map-container-cross">
<div class="map-container-1 map-container">
<h4>
${pointData.towerInfoVo.towerName}
</h4>
<div class="map-container-item">
<span>协调完成</span>
<span>${
pointData.towerInfoVo.time1 || "/"
}</span>
</div>
<div class="map-container-item">
<span>基础开挖</span>
<span>
${pointData.towerInfoVo.time2 || "/"}
</span>
</div>
<div class="map-container-item">
<span>基础开挖完成</span>
<span>
${pointData.towerInfoVo.time3 || "/"}
</span>
</div>
<div class="map-container-item">
<span>基础浇筑</span>
<span>
${pointData.towerInfoVo.time4 || "/"}
</span>
</div>
<div class="map-container-item">
<span>基础浇筑完成</span>
<span>
${pointData.towerInfoVo.time5 || "/"}
</span>
</div>
<div class="map-container-item">
<span>铁塔组立</span>
<span>
${pointData.towerInfoVo.time6 || "/"}
</span>
</div>
<div class="map-container-item">
<span>铁塔组立完成</span>
<span>
${pointData.towerInfoVo.time7 || "/"}
</span>
</div>
<div class="map-container-item">
<span>架线施工</span>
<span>
${pointData.towerInfoVo.time8 || "/"}
</span>
</div>
<div class="map-container-item">
<span>架线施工完成</span>
<span>
${pointData.towerInfoVo.time9 || "/"}
</span>
</div>
<div class="map-container-item">
<span>附件安装完成</span>
<span>
${pointData.towerInfoVo.time10 || "/"}
</span>
</div>
</div>
<div class="map-container-2 map-container">
<h4>
交叉跨越信息 ( ${pointData.spanTowerName} )
@ -912,29 +914,28 @@ async function addMapLine() {
startPoint.towerProgress != 10 &&
endPoint.towerProgress != 10
) {
lineColor = "#d81e06";
lineMaterial = new Cesium.PolylineDashMaterialProperty({
// 虚线
color: Cesium.Color.fromCssColorString(lineColor),
dashLength: 16.0, // 可调整虚线长度
});
// 创建线段点数组
const positions = [
[startPoint.baiduLon, startPoint.baiduLat, 500],
[endPoint.baiduLon, endPoint.baiduLat, 500],
];
const polyline = new mars3d.graphic.PolylineEntity({
positions: positions,
eventParent: false,
style: {
width: 2, // 线宽（像素）
material: lineMaterial, // 使用动态设置的材质
clampToGround: true, // 是否贴地（山区建议设为true）
},
});
graphicLayer.addGraphic(polyline);
graphicLayerList.push(polyline);
// lineColor = "#d81e06";
// lineMaterial = new Cesium.PolylineDashMaterialProperty({
// // 虚线
// color: Cesium.Color.fromCssColorString(lineColor),
// dashLength: 16.0, // 可调整虚线长度
// });
// // 创建线段点数组
// const positions = [
// [startPoint.baiduLon, startPoint.baiduLat, 500],
// [endPoint.baiduLon, endPoint.baiduLat, 500],
// ];
// const polyline = new mars3d.graphic.PolylineEntity({
// positions: positions,
// eventParent: false,
// style: {
// width: 2, // 线宽（像素）
// material: lineMaterial, // 使用动态设置的材质
// clampToGround: true, // 是否贴地（山区建议设为true）
// },
// });
// graphicLayer.addGraphic(polyline);
// graphicLayerList.push(polyline);
} else if (
(startPoint.towerProgress === 9 &&
endPoint.towerProgress === 9) ||