Merge branch 'feixian' of http://123.132.248.154:10000/xujingliang/Fei_Xian_Lin_Ye_Fang_Huo into feixian
commit
e38c02f60c
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -234,6 +234,9 @@
|
||||||
user-select: none;
|
user-select: none;
|
||||||
width: 55px;
|
width: 55px;
|
||||||
height: 55px;
|
height: 55px;
|
||||||
|
border-radius: 50%;
|
||||||
|
/* background:url(./img//pointer.png);
|
||||||
|
background-size:100% 100%; */
|
||||||
}
|
}
|
||||||
.mars3d-compass .mars3d-compass-outer {
|
.mars3d-compass .mars3d-compass-outer {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
@ -244,11 +247,15 @@
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
fill: #3f4854;
|
fill: #3f4854;
|
||||||
border-radius: 50%;
|
/* border-radius: 50%; */
|
||||||
|
line-height:55px;
|
||||||
|
/* background:red; */
|
||||||
}
|
}
|
||||||
.mars3d-compass .mars3d-compass-outer svg {
|
.mars3d-compass .mars3d-compass-outer svg {
|
||||||
height: 55px;
|
height: 55px;
|
||||||
width: 55px;
|
width: 55px;
|
||||||
|
position:absolute;
|
||||||
|
top:0px;
|
||||||
}
|
}
|
||||||
.mars3d-compass .mars3d-compass-inner {
|
.mars3d-compass .mars3d-compass-inner {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
@ -263,6 +270,7 @@
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
fill: #68adfe;
|
fill: #68adfe;
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
.mars3d-compass .mars3d-compass-rotation-arc {
|
.mars3d-compass .mars3d-compass-rotation-arc {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -111,9 +111,21 @@ export default {
|
||||||
"clampToGround": true
|
"clampToGround": true
|
||||||
}
|
}
|
||||||
attribute.zIndex = 10000000000;
|
attribute.zIndex = 10000000000;
|
||||||
}
|
}
|
||||||
if(attribute.symbol && attribute.symbol.styleOptions && attribute.symbol.styleOptions.label){
|
if(attribute.symbol && attribute.symbol.styleOptions && attribute.symbol.styleOptions.label){
|
||||||
attribute.symbol.styleOptions.label.pixelOffsetY = -40
|
attribute.symbol.styleOptions.label.pixelOffsetY = -40
|
||||||
|
attribute.symbol.styleOptions.label = {
|
||||||
|
text: "{name}",
|
||||||
|
font_size: 14,
|
||||||
|
color: Cesium.Color.AZURE,
|
||||||
|
outline: true,
|
||||||
|
outlineColor: Cesium.Color.BLACK,
|
||||||
|
outlineWidth: 2,
|
||||||
|
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
||||||
|
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
||||||
|
// pixelOffset: new Cesium.Cartesian2(10, -25) // 偏移量
|
||||||
|
pixelOffsetY:-40
|
||||||
|
}
|
||||||
}
|
}
|
||||||
attribute.pid = group.id;
|
attribute.pid = group.id;
|
||||||
// 替换所有图层地址路径 历史遗留数据库保存的是223服务器地址
|
// 替换所有图层地址路径 历史遗留数据库保存的是223服务器地址
|
||||||
|
|
@ -146,7 +158,7 @@ export default {
|
||||||
const mapOptions = {
|
const mapOptions = {
|
||||||
...options,
|
...options,
|
||||||
...this.options,
|
...this.options,
|
||||||
};
|
};
|
||||||
|
|
||||||
// 创建三维地球场景
|
// 创建三维地球场景
|
||||||
var map = new mars3d.Map(`mars3d-container${this.mapKey}`, mapOptions);
|
var map = new mars3d.Map(`mars3d-container${this.mapKey}`, mapOptions);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue