lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改地图点样式可以在卫星地图上清晰显示

qzc-dev
秦子超 2025-10-21 16:00:02 +08:00
parent d986b18ba7
commit 710df1cc6b
11 changed files with 62 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/Home/MapCtrl/Map3D/Map3D.js
View File

@ -370,10 +370,9 @@ export default class Map3D extends BaseMap {
async getDemo(viewer) { async getDemo(viewer) {
const demo = new Demo3D() const demo = new Demo3D()
this.demo = demo this.demo = demo
await demo.getGltf(viewer) //模型
demo.getDem(viewer) //地形图 demo.getDem(viewer) //地形图
demo.getWxyx(viewer) //卫星影像 demo.getWxyx(viewer) //卫星影像
await demo.getGltf(viewer) //模型
demo.getQxsy(viewer) //倾斜摄影 先加载模型 demo.getQxsy(viewer) //倾斜摄影 先加载模型
// demo.getDem(viewer) //地形图 // demo.getDem(viewer) //地形图
// this.demo.getCzml2(viewer) //demo // this.demo.getCzml2(viewer) //demo

1
src/views/Home/MapCtrl/Map3D/demo.js
View File

@ -26,6 +26,7 @@ export default class LayerMgr {
// 将模型添加到场景的图元集合中 // 将模型添加到场景的图元集合中
viewer.scene.primitives.add(model); viewer.scene.primitives.add(model);
await this.sleep(500)
} }
getWater(viewer) { getWater(viewer) {
const positions = [ const positions = [

2
src/views/Home/MapCtrl/Markers/AdcdAllMarker.js
View File

@ -143,7 +143,7 @@ function AdcdAllMarker({ data, dispatch, setting, zoom, distSq, layerVisible })
></div>:null ></div>:null
} }
<div <div
className="markerLabel" className="markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
color: data.CODE==='422826'?'rgba(230,0,0)':!getLayerVisible.SatelliteImage?'#595959':'#fff', color: data.CODE==='422826'?'rgba(230,0,0)':!getLayerVisible.SatelliteImage?'#595959':'#fff',

18
src/views/Home/MapCtrl/Markers/AdcdMarker.js
View File

@ -22,7 +22,7 @@ function renderMarker({ level }, { width, highlight }) {
<div style="position:relative"> <div style="position:relative">
<svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}"> <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
</svg> </svg>
<img width="${width}" style="position:absolute;top:0;left:2px" src="data:image/png;base64,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" <img width="${width}" style="position:absolute;top:-1px;left:-1px" src="data:image/png;base64,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"
alt="" className="panel-icon" /> alt="" className="panel-icon" />
</div> </div>
`; `;
@ -31,7 +31,7 @@ function renderMarker({ level }, { width, highlight }) {
<div style="position:relative"> <div style="position:relative">
<svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}"> <svg t="1616148185046" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4230" width="${width}">
</svg> </svg>
<img width="16" style="position:absolute;top:0;left:2px" src="data:image/png;base64,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" <img width="16" style="position:absolute;top:-1px;left:-1px" src="data:image/png;base64,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"
alt="" className="panel-icon" /> alt="" className="panel-icon" />
</div> </div>
`; `;
@ -177,7 +177,7 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
// onClick={showPop} // onClick={showPop}
></div> ></div>
<div <div
className="markerLabel" className="markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none', display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
@ -202,9 +202,9 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
<div <div
id={`marker_tuxiang_${data.id}`} id={`marker_tuxiang_${data.id}`}
style={{ style={{
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none', display:(zoom > 12 || distSq < dist2*10 || highlight)?'block':'none',
position: 'absolute', position: 'absolute',
bottom: 0, bottom: -10,
left: 0, left: 0,
transformOrigin: 'bottom center', transformOrigin: 'bottom center',
transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`, transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
@ -214,19 +214,19 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
// onClick={showPop} // onClick={showPop}
></div> ></div>
<div <div
className="markerLabel" className="markerLabelNew"
style={{ style={{
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none', display:(zoom > 12 || distSq < dist2*10 || highlight)?'block':'none',
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
fontSize: 10, fontSize: 12,
lineHeight: 1, lineHeight: 1,
top: 0, top: 0,
left: 0, left: 0,
transform: 'translateX(-50%)', transform: 'translateX(-50%)',
zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: !layerVisible.SatelliteImage?'#0008':'#fff' // color: !layerVisible.SatelliteImage?'#0008':'#fff'
}}> }}>
{data?.NAME} {data?.NAME}
</div> </div>

8
src/views/Home/MapCtrl/Markers/GongShuiMarker.js
View File

@ -150,7 +150,7 @@ function GongShuiMarker({ data, dispatch, setting, zoom, distSq }) {
{ {
(zoom > 14 || distSq < dist1 || highlight) && ( (zoom > 14 || distSq < dist1 || highlight) && (
<div <div
className="markerLabel2" className="markerLabel2 markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
width:"100px", width:"100px",
@ -172,18 +172,18 @@ function GongShuiMarker({ data, dispatch, setting, zoom, distSq }) {
{ {
(zoom > 10 || distSq < dist2 || highlight) && ( (zoom > 10 || distSq < dist2 || highlight) && (
<div <div
className="markerLabel2" className="markerLabel2 markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: "2px 0", padding: "2px 0",
borderRadius: 4, borderRadius: 4,
fontSize: 10, // fontSize: 10,
lineHeight: 1, lineHeight: 1,
top: 0, top: 0,
left: 0, left: 0,
transform: 'translateX(-50%)', transform: 'translateX(-50%)',
zIndex: zindexmarker.gongshuiLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), zIndex: zindexmarker.gongshuiLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: !getLayerVisible.SatelliteImage?'#0008':'#fff' // color: !getLayerVisible.SatelliteImage?'#0008':'#fff'
}}> }}>
{data.name} {data.name}
</div> </div>

8
src/views/Home/MapCtrl/Markers/PicStMarker.js
View File

@ -174,20 +174,20 @@ const getLayerVisible = useSelector((s) => s.map.layerVisible)
} }
{ {
(zoom > 12 || distSq < dist2 || highlight) && ( (zoom > 15 || distSq < dist2 || highlight) && (
<div <div
className="markerLabel" className="markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
fontSize: 10, // fontSize: 10,
lineHeight: 1, lineHeight: 1,
bottom: -14 * markerZoom, bottom: -14 * markerZoom,
left: 0, left: 0,
transform: 'translateX(-50%)', transform: 'translateX(-50%)',
zIndex: zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), zIndex: zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: !getLayerVisible.SatelliteImage?'#0008':'#fff', // color: !getLayerVisible.SatelliteImage?'#0008':'#fff',
// textShadow: '2px 2px 4px #000000', // textShadow: '2px 2px 4px #000000',
minWidth: "20px", minWidth: "20px",
textAlign: "center" textAlign: "center"

21
src/views/Home/MapCtrl/Markers/RealDrpMarker.js
View File

@ -16,17 +16,17 @@ function renderMarker({ drp }, { width, highlight }) {
}else if(drp<0.1){ }else if(drp<0.1){
color1 = '#ffffff' color1 = '#ffffff'
}else if(drp>=0.1 && drp<10){ }else if(drp>=0.1 && drp<10){
color1 = 'rgb(167, 240, 143)'; color1 = 'rgb(189, 239, 154)';
}else if(drp>=10 && drp<25){ }else if(drp>=10 && drp<25){
color1 = 'rgb(64, 215, 255)'; color1 = 'rgb(89, 182, 101)';
}else if(drp>=25 && drp<50){ }else if(drp>=25 && drp<50){
color1 = 'rgb(32, 143, 238)'; color1 = 'rgb(110, 193, 251)';
}else if(drp>=50 && drp<100){ }else if(drp>=50 && drp<100){
color1 = 'rgb(85, 86, 255)'; color1 = 'rgb(29, 27, 199)';
}else if(drp>=100 && drp<250){ }else if(drp>=100 && drp<250){
color1 = 'rgb(191, 90, 252)'; color1 = 'rgb(235, 32, 245)';
}else{ }else{
color1 = 'rgb(246, 66, 66)'; color1 = 'rgb(118, 30, 80)';
} }
// color1 = "#1E1ACA"; // color1 = "#1E1ACA";
@ -184,19 +184,20 @@ function RealDrpMarker({ data, dispatch, setting, zoom, distSq }) {
{ {
(zoom > 14 || distSq < dist2 || highlight) && ( (zoom > 14 || distSq < dist2 || highlight) && (
<div <div
className="markerLabel" className="markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
fontSize: 10, // fontSize: 10,
lineHeight: 1, lineHeight: 1,
top: 0, top: 0,
left: 0, left: 0,
transform: 'translateX(-50%)', transform: 'translateX(-50%)',
zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), color: '#fff' zIndex: zindexmarker.drpLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
// color: '#fff'
}}> }}>
<div style={{textAlign:"center",color:'rgba(0,0,0,0.5)'}}>{data.name}</div> <div style={{textAlign:"center"}}>{data.name}</div>
{/* <div style={{textAlign:"center"}}>{data.h24 || '-'}m</div> */} {/* <div style={{textAlign:"center"}}>{data.h24 || '-'}m</div> */}
</div> </div>
) )

6
src/views/Home/MapCtrl/Markers/ShuikuMarker.js
View File

@ -252,18 +252,18 @@ function ShuikuMarker({ data, dispatch, setting, zoom, distSq }) {
{ {
(zoom > 10 || distSq < dist2 || highlight) && ( (zoom > 10 || distSq < dist2 || highlight) && (
<div <div
className="markerLabel2" className="markerLabel2 markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
fontSize: 10, // fontSize: 10,
lineHeight: 1, lineHeight: 1,
top: 0, top: 0,
left: 0, left: 0,
transform: 'translateX(-50%)', transform: 'translateX(-50%)',
zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: !getLayerVisible.SatelliteImage?'#0008':'#fff' // color: !getLayerVisible.SatelliteImage?'#0008':'#fff'
}}> }}>
{data.name} {data.name}
</div> </div>

6
src/views/Home/MapCtrl/Markers/TuRangMarker.js
View File

@ -144,18 +144,18 @@ function TuRangMarker({ data, dispatch, setting, zoom, distSq }) {
{ {
(zoom > 10 || distSq < dist2 || highlight) && ( (zoom > 10 || distSq < dist2 || highlight) && (
<div <div
className="markerLabel2" className="markerLabel2 markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
fontSize: 10, // fontSize: 10,
lineHeight: 1, lineHeight: 1,
top: -10, top: -10,
left: 0, left: 0,
transform: 'translateX(-50%)', transform: 'translateX(-50%)',
zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), zIndex: zindexmarker.shuikuLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: '#0008',//!getLayerVisible.SatelliteImage?'#0008':'#fff' // color: '#0008',//!getLayerVisible.SatelliteImage?'#0008':'#fff'
}}> }}>
{data.stnm} {data.stnm}
</div> </div>

8
src/views/Home/MapCtrl/Markers/YHJMHMarker.js
View File

@ -174,20 +174,20 @@ function YHJMHMarker({ data, dispatch, setting, zoom, distSq }) {
) )
} */} } */}
{ {
(zoom > 16 || distSq < dist2 || highlight) && ( (zoom > 17 || distSq < dist2*0.2 || highlight) && (
<div <div
className="markerLabel2" className="markerLabel2 markerLabelNew"
style={{ style={{
// backgroundColor: '#0008', // backgroundColor: '#0008',
padding: 4, padding: 4,
borderRadius: 4, borderRadius: 4,
fontSize: 10, // fontSize: 10,
lineHeight: 1, lineHeight: 1,
top: 0, top: 0,
left: 0, left: 0,
transform: 'translateX(-50%)', transform: 'translateX(-50%)',
zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), zIndex: zindexmarker.zLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: !getLayerVisible.SatelliteImage?'#0008':'#fff' // color: !getLayerVisible.SatelliteImage?'#0008':'#fff'
}}> }}>
{data.name} {data.name}
</div> </div>

21
src/views/Home/MapCtrl/index.less
View File

@ -77,6 +77,27 @@
// white-space: nowrap; // white-space: nowrap;
} }
.markerLabelNew {
color: rgba(0, 0, 0, 0.8);
padding: 0 4px;
font-size: 12px;
font-weight: 450;
border-radius: 4px;
position: absolute;
pointer-events: none;
//background-color: rgba(255, 255, 255, 0.3);
word-break: keep-all;
text-shadow:
-0.8px -0.8px 0.3px white,
0 -0.8px 0.3px white,
0.8px -0.8px 0.3px white,
0.8px 0 0.3px white,
0.8px 0.8px 0.3px white,
0 0.8px 0.3px white,
-0.8px 0.8px 0.3px white,
-0.8px 0 0.3px white;
}
.dp-popup { .dp-popup {
position: absolute; position: absolute;
top: 0; top: 0;