zh/sdk4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zh:master
Branches Tags
zh:master zh:develop zh:project zh:zh
...
compare: zh:1d6b635f7a2574aa605bc37e2b272c6af72754fd
Branches Tags
zh:master zh:develop zh:project zh:zh

6 Commits
master ... 1d6b635f7a

Author SHA1 Message Date
zh
1d6b635f7a Merge branch 'master' of http://xny.yj-3d.com:3000/zh/sdk4.0 into project 2025-08-22 17:52:43 +08:00
zh
5b788a74d4 修改 2025-08-22 17:52:32 +08:00
zh
65ee6b70ba 解决立体模式下高度修改不生效的问题 2025-08-20 15:51:56 +08:00
zh
ed18fd776b 贴地svg编辑点，用billboard替代point，解决点大小异常的问题 2025-08-20 15:20:20 +08:00
zh
dd7af5aa4d 修改立体模式下文字偏移范围 2025-08-20 15:19:19 +08:00
zh
56ad8ae7a0 贴地svg增加立体模式和锚点设置 2025-08-20 11:05:26 +08:00
7 changed files with 1580 additions and 145 deletions
Expand all files Collapse all files

16
src/Global/mouseRightMenu/index.js
View File

@ -100,14 +100,14 @@ function MouseRightMenu(sdk, status, callBack) {
that = sdk.entityMap.get(entityId)
}
if (that && that.picking) {
addedMenu = `
<span class="divider" style="display: block;border-top: 1px solid #ddd;margin: 5px;"></span>
<ul class="added" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
<li style="padding: 3px 10px;cursor: pointer;">属性</li>
</ul>
`
}
// if (that && that.picking) {
// addedMenu = `
// <span class="divider" style="display: block;border-top: 1px solid #ddd;margin: 5px;"></span>
// <ul class="added" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
// <li style="padding: 3px 10px;cursor: pointer;">属性</li>
// </ul>
// `
// }
let position = tools.cartesian3Towgs84(cartesian, sdk.viewer)
menuElm = document.createElement('div')
menuElm.id = 'custom-menu'

44
src/Obj/Base/BillboardObject/index.js
View File

@ -433,31 +433,31 @@ class BillboardObject extends Base {
value: '链接',
key: 'link'
},
{
name: 'IP摄像头',
value: 'IP摄像头',
key: 'camera'
},
// {
// name: 'ISC摄像头',
// value: 'ISC摄像头',
// key: 'isc'
// name: 'IP摄像头',
// value: 'IP摄像头',
// key: 'camera'
// },
// // {
// // name: 'ISC摄像头',
// // value: 'ISC摄像头',
// // key: 'isc'
// // },
// // {
// // name: '传感器',
// // value: '传感器',
// // key: 'sensor'
// // },
// {
// name: '全景图',
// value: '全景图',
// key: 'vr'
// },
// {
// name: '传感器',
// value: '传感器',
// key: 'sensor'
// },
{
name: '全景图',
value: '全景图',
key: 'vr'
},
{
name: '物资',
value: '物资',
key: 'goods'
}
// name: '物资',
// value: '物资',
// key: 'goods'
// }
]
}

112
src/Obj/Base/GroundSvg/_element.js
View File

@ -17,6 +17,18 @@ function html(that) {
</div>
<span class="custom-divider"></span>
<div class="div-item">
<div class="row">
<div class="col" mode="0">
<button class="anchor btn">调整锚点</button>
</div>
<div class="col mode-box">
<span class="label" style="flex: unset;">军标模式</span>
<div class="mode"></div>
</div>
</div>
</div>
<span class="custom-divider" mode="0"></span>
<div class="div-item" mode="0">
<div class="row">
<div class="col">
<span class="label">旋转角度</span>
@ -50,11 +62,11 @@ function html(that) {
</div>
</div>
<span class="custom-divider"></span>
<div class="div-item">
<div class="div-item" mode="0">
<div class="row">
<div class="col" style="flex: 5;">
<span class="label">文字内容</span>
<input class="input" type="text" @model="textValue" maxlength="30">
<input class="input" type="text" @model="textValue">
</div>
<div class="col">
<button class="btn" @click="textPosPick">设置位置</span>
@ -70,9 +82,9 @@ function html(that) {
<div class="textColor"></div>
</div>
<div class="col">
<span class="label">字体大小</span>
<span class="label">文字大小</span>
<div class="input-number input-number-unit-2">
<input class="input" type="number" title="" min="1" max="99" @model="textFontSize">
<input class="input" type="number" title="" min="1" max="99" step="1" @model="textFontSize">
<span class="unit">px</span>
<span class="arrow"></span>
</div>
@ -101,6 +113,98 @@ function html(that) {
</div>
</div>
</div>
<div class="div-item" mode="1">
<div class="row">
<div class="col height-mode-box" style="flex: 0 0 155px;margin-right: 10px;">
<span class="label" style="flex: 0 0 56px;">高度模式</span>
<div class="height-mode"></div>
</div>
<div class="col" style="margin: 0 10px;">
<div class="height-box" style="display: flex; align-items: center;">
<span class="label" style="flex: 0 0 56px;">高度</span>
<div class="input-number input-number-unit-1">
<input class="input height" type="number" title="" min="-9999999" max="999999999">
<span class="unit">m</span>
<span class="arrow"></span>
</div>
</div>
</div>
<div class="col" style="margin-left: 10px;">
<span class="label">图标倍数</span>
<div class="input-number input-number-unit-1">
<input class="input" type="number" title="" data-min="0.1" max="99" @model="billboardScale">
<span class="unit">倍</span>
<span class="arrow"></span>
</div>
</div>
</div>
<div class="row">
<div class="col" style="flex: 0 0 155px;margin-right: 10px;">
<span class="label">视野缩放</span>
<input class="btn-switch" type="checkbox" @model="billboardScaleByDistance">
</div>
<div class="col" style="margin: 0 10px;">
<span class="label">最近距离</span>
<div class="input-number input-number-unit-1">
<input class="input" type="number" title="" min="1" max="99999999" @model="billboardNear">
<span class="unit">m</span>
<span class="arrow"></span>
</div>
</div>
<div class="col" style="margin-left: 10px;">
<span class="label">最远距离</span>
<div class="input-number input-number-unit-1">
<input class="input" type="number" title="" min="1" max="99999999" @model="billboardFar">
<span class="unit">m</span>
<span class="arrow"></span>
</div>
</div>
</div>
<h4>文字设置</h4>
<div class="row">
<div class="col" style="flex: 0 0 80px;margin: 0 10px 0 0;;">
<span class="label" style="flex: none;">显隐</span>
<input class="btn-switch" type="checkbox" @model="labelShow">
</div>
<div class="col font-select-box" style="margin: 0 0px;flex: 0 0 160px;">
<span class="label" style="flex: none;">字体选择</span>
<div class="input input-select font-select"></div>
</div>
<div class="col" style="margin: 0 10px;">
<span class="label">文字大小</span>
<div class="input-number input-number-unit-2">
<input class="input label-font-size" type="number" title="" min="1" max="99" step="1" style="width: 70px;">
<span class="unit">px</span>
<span class="arrow"></span>
</div>
</div>
<div class="col" style="margin-left: 10px;">
<span class="label">文字颜色</span>
<div class="labelColor"></div>
</div>
</div>
<div class="row" style="justify-content: flex-start;">
<div class="col font-select-box" style="margin: 0 0px;flex: 0 0 70px;">
<span class="label" style="flex: none;">文字偏移</span>
</div>
<div class="col" style="margin: 0 10px;flex: 0 0 100px;">
<span class="label">x</span>
<div class="input-number input-number-unit-2">
<input class="input label-offset-x" type="number" title="" min="-999" max="999" step="1">
<span class="unit">px</span>
<span class="arrow"></span>
</div>
</div>
<div class="col" style="margin: 0 10px;flex: 0 0 100px;">
<span class="label">y</span>
<div class="input-number input-number-unit-2">
<input class="input label-offset-y" type="number" title="" min="-999" max="999" step="1">
<span class="unit">px</span>
<span class="arrow"></span>
</div>
</div>
</div>
</div>
<span class="custom-divider"></span>
<div class="div-item attribute-info">
<div class="row">

1549
src/Obj/Base/GroundSvg/index.js
View File

File diff suppressed because it is too large Load Diff

1
src/Obj/Base/PolylineObject/index.js
View File

@ -893,6 +893,7 @@ class PolylineObject extends Base {
})
}
}
get labelBackgroundColorEnd() {
return this.options.label.backgroundColor[1]
}

1
src/Obj/Element/Dialog/index.js
View File

@ -78,6 +78,7 @@ class Dialog extends BaseDialog {
this.footAppChild(div)
if (this.options.updateHeightCallBack) {
let heightBtn = document.createElement('button');
heightBtn.className = 'update-height'
heightBtn.innerHTML = '<svg class="icon-updateheigh"><use xlink:href="#yj-icon-updateheight"></use></svg>更新高程'
heightBtn.style.width = 'auto'
heightBtn.addEventListener('click', () => {

2
static/custom/css/index.css
View File

@ -2718,7 +2718,7 @@
/* 贴地svg */
.YJ-custom-base-dialog.ground-svg>.content {
width: 535px;
width: 560px;
}
.YJ-custom-base-dialog.ground-svg>.content>div .div-item:nth-of-type(2) .row .col .label {