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

合并qzc-dev

qzc-dev
秦子超 2025-10-21 13:54:32 +08:00
parent 18b171a03a e8427b9127
commit d986b18ba7
2 changed files with 70 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,10 @@ export default class LayerMgr3D extends LayerMgr {
for (const layer of this.layers) {
layer.destroy();
}
this.viewer.dataSources.removeAll();
this.viewer.entities.removeAll();
this.viewer.imageryLayers.removeAll()
this.viewer.destroy();
}
frameUpdate() {

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

@ -160,81 +160,77 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
return (
<>
{
( (zoom > 8 || distSq < dist2 || highlight) && (data.level === 5 || data.level === 4) &&
// isShow
true
) && (
<>
<div
id={`marker_tuxiang_${data.id}`}
style={{
position: 'absolute',
bottom: 0,
left: 0,
transformOrigin: 'bottom center',
transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
lineHeight: 1,
zIndex: data.level === 4?6:4,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
}}
// onClick={showPop}
></div>
<div
className="markerLabel"
style={{
// backgroundColor: '#0008',
padding: 4,
borderRadius: 4,
fontSize: 10,
lineHeight: 1,
top: 0,
left: 0,
transform: 'translateX(-50%)',
zIndex: 3,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: data.level === 4? 'red':'#0008'
}}>
{data?.NAME}
</div>
</>
)
(data.level === 5 || data.level === 4) &&
<>
<div
id={`marker_tuxiang_${data.id}`}
style={{
display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
position: 'absolute',
bottom: 0,
left: 0,
transformOrigin: 'bottom center',
transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
lineHeight: 1,
zIndex: data.level === 4?6:4,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
}}
// onClick={showPop}
></div>
<div
className="markerLabel"
style={{
// backgroundColor: '#0008',
display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
padding: 4,
borderRadius: 4,
fontSize: 10,
lineHeight: 1,
top: 0,
left: 0,
transform: 'translateX(-50%)',
zIndex: 3,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: data.level === 4? 'red':'#0008'
}}>
{data?.NAME}
</div>
</>
}
{
( (zoom > 12 || distSq < dist2 || highlight) && data.level === 6 &&
// isShow
true
) && (
<>
<div
id={`marker_tuxiang_${data.id}`}
style={{
position: 'absolute',
bottom: 0,
left: 0,
transformOrigin: 'bottom center',
transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
lineHeight: 1,
zIndex: 2,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
}}
// onClick={showPop}
></div>
<div
className="markerLabel"
style={{
// backgroundColor: '#0008',
padding: 4,
borderRadius: 4,
fontSize: 10,
lineHeight: 1,
top: 0,
left: 0,
transform: 'translateX(-50%)',
zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: !layerVisible.SatelliteImage?'#0008':'#fff'
}}>
{data?.NAME}
</div>
</>
)
data.level === 6 &&
<>
<div
id={`marker_tuxiang_${data.id}`}
style={{
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
position: 'absolute',
bottom: 0,
left: 0,
transformOrigin: 'bottom center',
transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
lineHeight: 1,
zIndex: 2,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
}}
// onClick={showPop}
></div>
<div
className="markerLabel"
style={{
display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
// backgroundColor: '#0008',
padding: 4,
borderRadius: 4,
fontSize: 10,
lineHeight: 1,
top: 0,
left: 0,
transform: 'translateX(-50%)',
zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
color: !layerVisible.SatelliteImage?'#0008':'#fff'
}}>
{data?.NAME}
</div>
</>
}
</>
)