diff --git a/src/views/Home/MapCtrl/Map3D/Map3D.js b/src/views/Home/MapCtrl/Map3D/Map3D.js index 7598300f7..bb5b0248a 100644 --- a/src/views/Home/MapCtrl/Map3D/Map3D.js +++ b/src/views/Home/MapCtrl/Map3D/Map3D.js @@ -370,10 +370,9 @@ export default class Map3D extends BaseMap { async getDemo(viewer) { const demo = new Demo3D() this.demo = demo + await demo.getGltf(viewer) //模型 demo.getDem(viewer) //地形图 demo.getWxyx(viewer) //卫星影像 - - await demo.getGltf(viewer) //模型 demo.getQxsy(viewer) //倾斜摄影 先加载模型 // demo.getDem(viewer) //地形图 // this.demo.getCzml2(viewer) //demo diff --git a/src/views/Home/MapCtrl/Map3D/demo.js b/src/views/Home/MapCtrl/Map3D/demo.js index 27c1b0421..359e81f52 100644 --- a/src/views/Home/MapCtrl/Map3D/demo.js +++ b/src/views/Home/MapCtrl/Map3D/demo.js @@ -26,6 +26,7 @@ export default class LayerMgr { // 将模型添加到场景的图元集合中 viewer.scene.primitives.add(model); + await this.sleep(500) } getWater(viewer) { const positions = [ diff --git a/src/views/Home/MapCtrl/Markers/AdcdAllMarker.js b/src/views/Home/MapCtrl/Markers/AdcdAllMarker.js index f2a298468..2edb17e64 100644 --- a/src/views/Home/MapCtrl/Markers/AdcdAllMarker.js +++ b/src/views/Home/MapCtrl/Markers/AdcdAllMarker.js @@ -143,7 +143,7 @@ function AdcdAllMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) >:null }
-
`; @@ -31,7 +31,7 @@ function renderMarker({ level }, { width, highlight }) {
-
`; @@ -177,7 +177,7 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) { // onClick={showPop} >
8 || distSq < dist2 || highlight)?'block':'none', @@ -202,9 +202,9 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
12 || distSq < dist2 || highlight)?'block':'none', + display:(zoom > 12 || distSq < dist2*10 || highlight)?'block':'none', position: 'absolute', - bottom: 0, + bottom: -10, left: 0, transformOrigin: 'bottom center', transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`, @@ -214,19 +214,19 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) { // onClick={showPop} >
12 || distSq < dist2 || highlight)?'block':'none', + display:(zoom > 12 || distSq < dist2*10 || highlight)?'block':'none', // backgroundColor: '#0008', padding: 4, borderRadius: 4, - fontSize: 10, + fontSize: 12, lineHeight: 1, top: 0, left: 0, transform: 'translateX(-50%)', zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), - color: !layerVisible.SatelliteImage?'#0008':'#fff' + // color: !layerVisible.SatelliteImage?'#0008':'#fff' }}> {data?.NAME}
diff --git a/src/views/Home/MapCtrl/Markers/GongShuiMarker.js b/src/views/Home/MapCtrl/Markers/GongShuiMarker.js index ab93a48be..e0007b7f3 100644 --- a/src/views/Home/MapCtrl/Markers/GongShuiMarker.js +++ b/src/views/Home/MapCtrl/Markers/GongShuiMarker.js @@ -150,7 +150,7 @@ function GongShuiMarker({ data, dispatch, setting, zoom, distSq }) { { (zoom > 14 || distSq < dist1 || highlight) && (
10 || distSq < dist2 || highlight) && (
{data.name}
diff --git a/src/views/Home/MapCtrl/Markers/PicStMarker.js b/src/views/Home/MapCtrl/Markers/PicStMarker.js index d24d28bba..5bcc5f350 100644 --- a/src/views/Home/MapCtrl/Markers/PicStMarker.js +++ b/src/views/Home/MapCtrl/Markers/PicStMarker.js @@ -174,20 +174,20 @@ const getLayerVisible = useSelector((s) => s.map.layerVisible) } { - (zoom > 12 || distSq < dist2 || highlight) && ( + (zoom > 15 || distSq < dist2 || highlight) && (
=0.1 && drp<10){ - color1 = 'rgb(167, 240, 143)'; + color1 = 'rgb(189, 239, 154)'; }else if(drp>=10 && drp<25){ - color1 = 'rgb(64, 215, 255)'; + color1 = 'rgb(89, 182, 101)'; }else if(drp>=25 && drp<50){ - color1 = 'rgb(32, 143, 238)'; + color1 = 'rgb(110, 193, 251)'; }else if(drp>=50 && drp<100){ - color1 = 'rgb(85, 86, 255)'; + color1 = 'rgb(29, 27, 199)'; }else if(drp>=100 && drp<250){ - color1 = 'rgb(191, 90, 252)'; + color1 = 'rgb(235, 32, 245)'; }else{ - color1 = 'rgb(246, 66, 66)'; + color1 = 'rgb(118, 30, 80)'; } // color1 = "#1E1ACA"; @@ -184,19 +184,20 @@ function RealDrpMarker({ data, dispatch, setting, zoom, distSq }) { { (zoom > 14 || distSq < dist2 || highlight) && (
-
{data.name}
+
{data.name}
{/*
{data.h24 || '-'}m
*/}
) diff --git a/src/views/Home/MapCtrl/Markers/ShuikuMarker.js b/src/views/Home/MapCtrl/Markers/ShuikuMarker.js index d0537765b..905509539 100644 --- a/src/views/Home/MapCtrl/Markers/ShuikuMarker.js +++ b/src/views/Home/MapCtrl/Markers/ShuikuMarker.js @@ -252,18 +252,18 @@ function ShuikuMarker({ data, dispatch, setting, zoom, distSq }) { { (zoom > 10 || distSq < dist2 || highlight) && (
{data.name}
diff --git a/src/views/Home/MapCtrl/Markers/TuRangMarker.js b/src/views/Home/MapCtrl/Markers/TuRangMarker.js index 6437c294c..114114d60 100644 --- a/src/views/Home/MapCtrl/Markers/TuRangMarker.js +++ b/src/views/Home/MapCtrl/Markers/TuRangMarker.js @@ -144,18 +144,18 @@ function TuRangMarker({ data, dispatch, setting, zoom, distSq }) { { (zoom > 10 || distSq < dist2 || highlight) && (
{data.stnm}
diff --git a/src/views/Home/MapCtrl/Markers/YHJMHMarker.js b/src/views/Home/MapCtrl/Markers/YHJMHMarker.js index c80f4616f..a9b186f4f 100644 --- a/src/views/Home/MapCtrl/Markers/YHJMHMarker.js +++ b/src/views/Home/MapCtrl/Markers/YHJMHMarker.js @@ -174,20 +174,20 @@ function YHJMHMarker({ data, dispatch, setting, zoom, distSq }) { ) } */} { - (zoom > 16 || distSq < dist2 || highlight) && ( + (zoom > 17 || distSq < dist2*0.2 || highlight) && (
{data.name}
diff --git a/src/views/Home/MapCtrl/index.less b/src/views/Home/MapCtrl/index.less index d5cb733c9..ef3aa6c1d 100644 --- a/src/views/Home/MapCtrl/index.less +++ b/src/views/Home/MapCtrl/index.less @@ -77,6 +77,27 @@ // 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 { position: absolute; top: 0;