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) { for (const layer of this.layers) {
layer.destroy(); layer.destroy();
} }
this.viewer.dataSources.removeAll();
this.viewer.entities.removeAll(); this.viewer.entities.removeAll();
this.viewer.imageryLayers.removeAll() this.viewer.imageryLayers.removeAll()
this.viewer.destroy();
} }
frameUpdate() { frameUpdate() {

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

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