Compare commits

...

23 Commits

Author SHA1 Message Date
zh
d1dd920fd2 文本框不受卷帘影响 2025-08-26 18:46:32 +08:00
a69034a18e Merge branch 'develop' of http://xny.yj-3d.com:3000/zh/sdk4.0 into develop 2025-08-26 18:21:09 +08:00
7fc4f14756 失去交点判断 2025-08-26 18:21:05 +08:00
zh
feff8c3a76 判断 2025-08-26 18:18:22 +08:00
zh
58b8c6a897 Merge branch 'develop' of http://xny.yj-3d.com:3000/zh/sdk4.0 into develop 2025-08-26 18:09:51 +08:00
zh
349c91f8df 卷帘模式下隐藏点属性框 2025-08-26 18:08:21 +08:00
zh
92ef4a68fd 优化二维模式时的键盘移动事件 2025-08-26 18:07:25 +08:00
623a220cbf 修改文本框同步问题 2025-08-26 18:03:14 +08:00
zh
e8258d96d0 文本框 2025-08-26 15:44:57 +08:00
zh
d0a682f233 Merge branch 'develop' of http://xny.yj-3d.com:3000/zh/sdk4.0 into develop 2025-08-26 15:34:24 +08:00
zh
65441ddff4 文本框 2025-08-26 15:34:07 +08:00
7f3b04eb08 批量添加模型间距限制 2025-08-26 14:57:54 +08:00
9289d08f24 修改文本框二三维不同步问题 2025-08-26 14:47:56 +08:00
f9a3ffb359 Merge branch 'develop' of http://xny.yj-3d.com:3000/zh/sdk4.0 into develop 2025-08-26 14:27:44 +08:00
f5d915bd58 文字 2025-08-26 14:27:41 +08:00
zh
91cc200917 卷帘功能忽略文本框 2025-08-26 14:27:05 +08:00
zh
0c4c956868 二三维文本框 2025-08-26 13:34:38 +08:00
zh
838f39ba40 贴地svg文字偏移 2025-08-25 23:06:27 +08:00
zh
077170f2d4 解决轨迹运动二维模式贴地时视角跟随报错的问题 2025-08-25 20:50:18 +08:00
a1e33d907d 批量模型数量判断并设置提示 2025-08-25 11:58:11 +08:00
zh
57a9ccacbd 扩散光波二维显示 2025-08-25 10:42:54 +08:00
zh
0eef08ce45 增加自定义信息提示 2025-08-23 15:25:25 +08:00
zh
0f9ad0a0f0 解决属性框加载的外部页面可能篡改父页面地址的问题 2025-08-23 15:25:06 +08:00
20 changed files with 289 additions and 69 deletions

View File

@ -135,6 +135,7 @@ const open = async (sdk, options = {}, _Dialog = {}) => {
pitch: viewer.camera.pitch, pitch: viewer.camera.pitch,
roll: viewer.camera.roll roll: viewer.camera.roll
} }
tools.message({text: '操作成功'})
}) })
let totalTimeElm = contentElm.querySelector("input[name='totalTime']") let totalTimeElm = contentElm.querySelector("input[name='totalTime']")

View File

@ -101,6 +101,7 @@ function getFlagFromKeyboard(key) {
*/ */
function keyDown(event) { function keyDown(event) {
let _viewer = this let _viewer = this
// 判断是否有输入框聚焦 // 判断是否有输入框聚焦
function isInputFocused() { function isInputFocused() {
const activeElement = document.activeElement; const activeElement = document.activeElement;
@ -164,32 +165,51 @@ function keyUp(event) {
* @return {*} * @return {*}
*/ */
function keyboardMapRoamingRender(_viewer) { function keyboardMapRoamingRender(_viewer) {
if(!_viewer.scene.screenSpaceCameraController.enableTilt) { if(!_viewer || !_viewer.scene || !_viewer.scene.screenSpaceCameraController.enableTilt) {
return return
} }
let camera = _viewer.camera; let camera = _viewer.camera;
let ellipsoid = _viewer.scene.globe.ellipsoid; let ellipsoid = _viewer.scene.globe.ellipsoid;
let cameraHeight = ellipsoid.cartesianToCartographic(camera.position).height; let cameraHeight = ellipsoid.cartesianToCartographic(camera.position).height;
let cameraHeight2 = camera.positionCartographic.height;
// 根据相机高度设置移动距离,比默认距离移动效果更好 // 根据相机高度设置移动距离,比默认距离移动效果更好
let moveRate = cameraHeight / 20.0; let moveRate = cameraHeight / 20.0;
let rotationRate = moveRate / 500000 / Cesium.Math.toDegrees(camera.pitch); let rotationRate = moveRate / 500000 / Cesium.Math.toDegrees(camera.pitch);
let moveRate2 = cameraHeight2 / 100.0;
if (flags.moveForward) { if (flags.moveForward) {
// camera.moveForward(moveRate); if(_viewer.scene.mode == 2) {
camera.rotate(camera.right, -rotationRate); camera.moveUp(moveRate2);
}
else {
camera.rotate(camera.right, -rotationRate);
}
} }
if (flags.moveBackward) { if (flags.moveBackward) {
// camera.moveBackward(moveRate); if(_viewer.scene.mode == 2) {
camera.rotate(camera.right, rotationRate); camera.moveDown(moveRate2);
}
else {
camera.rotate(camera.right, rotationRate);
}
} }
if (flags.moveLeft) { if (flags.moveLeft) {
// camera.moveLeft(moveRate); if(_viewer.scene.mode == 2) {
camera.rotate(camera.up, -rotationRate); camera.moveLeft(moveRate2);
}
else {
camera.rotate(camera.up, -rotationRate);
}
} }
if (flags.moveRight) { if (flags.moveRight) {
// camera.moveRight(moveRate); if(_viewer.scene.mode == 2) {
camera.rotate(camera.up, rotationRate); camera.moveRight(moveRate2);
}
else {
camera.rotate(camera.up, rotationRate);
}
} }
if (flags.moveUp) { if (flags.moveUp) {
camera.moveUp(moveRate); camera.moveUp(moveRate);

View File

@ -157,7 +157,12 @@ async function syncData2(sdk, id, entityId) {
if (that.showView == 3) { if (that.showView == 3) {
options.show = false options.show = false
} }
let newObject = await new that.constructor(sdk2D, options) let callback
if(that.type === 'TextBox') {
callback = that.callback
}
let newObject = await new that.constructor(sdk2D, options, callback)
newObject.onClick = that.onClick newObject.onClick = that.onClick
newObject.onRightClick = that.onRightClick newObject.onRightClick = that.onRightClick
newObject.onMouseMove = that.onMouseMove newObject.onMouseMove = that.onMouseMove
@ -252,7 +257,11 @@ async function syncData2(sdk, id, entityId) {
if(target) { if(target) {
await target.remove() await target.remove()
} }
target = await new obj.constructor(sdk2D, options) let callback
if(obj.type === 'TextBox') {
callback = obj.callback
}
target = await new obj.constructor(sdk2D, options, callback)
target.onClick = obj.onClick target.onClick = obj.onClick
target.onRightClick = obj.onRightClick target.onRightClick = obj.onRightClick
target.onMouseMove = obj.onMouseMove target.onMouseMove = obj.onMouseMove

View File

@ -102,11 +102,20 @@ function off() {
let leftCanvas = leftBox.getElementsByTagName('canvas')[0] let leftCanvas = leftBox.getElementsByTagName('canvas')[0]
leftBox.style.width = '100%' leftBox.style.width = '100%'
leftCanvas.style.width = '100%' leftCanvas.style.width = '100%'
let billboardAttributeBoxs = sdkP.viewer._element.getElementsByClassName('billboard-attribute-box')
for (let i = 0; i < billboardAttributeBoxs.length; i++) {
billboardAttributeBoxs[i].style.display = 'block'
}
sdkP = null sdkP = null
} }
async function init(sdk) { async function init(sdk) {
let billboardAttributeBoxs = sdk.viewer._element.getElementsByClassName('billboard-attribute-box')
for (let i = 0; i < billboardAttributeBoxs.length; i++) {
billboardAttributeBoxs[i].style.display = 'none'
}
sdk.entityMap.forEach((item, key) => { sdk.entityMap.forEach((item, key) => {
if (item.type && item.type == 'TrajectoryMotion' && item.viewFollow) { if (item.type && item.type == 'TrajectoryMotion' && item.viewFollow) {
item.viewFollow = false item.viewFollow = false
@ -137,10 +146,8 @@ async function init(sdk) {
rightElm.style.position = 'absolute' rightElm.style.position = 'absolute'
rightElm.style.right = 'calc(50% - 50px)' rightElm.style.right = 'calc(50% - 50px)'
if (!activeIds || activeIds.length == 0) { leftElm.style.display = 'none'
leftElm.style.display = 'none' rightElm.style.display = 'none'
rightElm.style.display = 'none'
}
sdk.viewer._element.appendChild(leftElm) sdk.viewer._element.appendChild(leftElm)
sdk.viewer._element.appendChild(rightElm) sdk.viewer._element.appendChild(rightElm)
@ -149,6 +156,12 @@ async function init(sdk) {
let right = 0 let right = 0
if (activeIds) { if (activeIds) {
for (let i = 0; i < activeIds.length; i++) { for (let i = 0; i < activeIds.length; i++) {
let thatP = sdk.entityMap.get(activeIds[i])
if (!thatP || (thatP.type === 'terrain' || !thatP.show) || thatP.type === 'TextBox') {
continue
}
leftElm.style.display = 'unset'
rightElm.style.display = 'unset'
let status = statusMap.get(activeIds[i]) let status = statusMap.get(activeIds[i])
if (status) { if (status) {
if (status.P) { if (status.P) {
@ -911,7 +924,7 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
} }
if (thatP.type === 'GroundSvg' && thatP.text) { if (thatP.type === 'GroundSvg' && thatP.text) {
thatP.text.show = thatP.textShow thatP.text.show = thatP.textShow
target.textShow = false target && (target.textShow = false)
} }
if (thatP.label && thatP.labelShow) { if (thatP.label && thatP.labelShow) {
thatP.label.entity.show = true thatP.label.entity.show = true
@ -1281,6 +1294,8 @@ function setActiveId(ids = []) {
} }
else { else {
if (leftElm && rightElm) { if (leftElm && rightElm) {
leftElm.style.display = 'none'
rightElm.style.display = 'none'
let left = 0 let left = 0
let right = 0 let right = 0
for (let i = 0; i < activeIds.length; i++) { for (let i = 0; i < activeIds.length; i++) {
@ -1298,10 +1313,8 @@ function setActiveId(ids = []) {
let thatP = sdkP.entityMap.get(activeIds[i]) let thatP = sdkP.entityMap.get(activeIds[i])
let thatD = sdkD.entityMap.get(activeIds[i]) // let thatD = sdkD.entityMap.get(activeIds[i])
if (!thatP || (thatP.type === 'terrain' || !thatP.show)) { if (!thatP || (thatP.type === 'terrain' || !thatP.show) || thatP.type === 'TextBox') {
leftElm.style.display = 'none'
rightElm.style.display = 'none'
continue continue
} }
leftElm.style.display = 'unset' leftElm.style.display = 'unset'

View File

@ -5,6 +5,7 @@ import Dialog from '../../Element/Dialog';
import { html } from "./_element"; import { html } from "./_element";
import EventBinding from '../../Element/Dialog/eventBinding'; import EventBinding from '../../Element/Dialog/eventBinding';
import Base from "../index"; import Base from "../index";
import Tools from "../../../Tools";
import { syncData } from '../../../Global/MultiViewportMode' import { syncData } from '../../../Global/MultiViewportMode'
import Model from '../BaseSource/BaseModel/Model' import Model from '../BaseSource/BaseModel/Model'
import { legp } from '../../Element/datalist' import { legp } from '../../Element/datalist'
@ -13,7 +14,7 @@ import DrawPolyline from '../../../Draw/drawPolyline'
import DrawPolygon from '../../../Draw/drawPolygon' import DrawPolygon from '../../../Draw/drawPolygon'
import DrawThreeRect from '../../../Draw/drawThreeRect' import DrawThreeRect from '../../../Draw/drawThreeRect'
import DrawPoint from '../../../Draw/drawPoint' import DrawPoint from '../../../Draw/drawPoint'
import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global' import { setActiveViewer, closeRotateAround, closeViewFollow, CesiumContainer } from '../../../Global/global'
import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen' import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
@ -37,7 +38,7 @@ class BatchModel extends Base {
this.options.name = options.name || '批量模型' this.options.name = options.name || '批量模型'
this.options.type = options.type || '面' this.options.type = options.type || '面'
this.options.url = options.url || '' this.options.url = options.url || ''
this.options.spacing = options.spacing || 50 this.options.spacing = options.spacing * 1 || 50
this.options.positions = options.positions || [] this.options.positions = options.positions || []
this.options.show = (options.show || options.show === false) ? options.show : true this.options.show = (options.show || options.show === false) ? options.show : true
this.callback = callback this.callback = callback
@ -46,8 +47,13 @@ class BatchModel extends Base {
this._elms = {}; this._elms = {};
this.pointArr = [] this.pointArr = []
this.sdk.addIncetance(this.options.id, this) this.sdk.addIncetance(this.options.id, this)
let tools = new Tools(sdk)
// BatchModel.computeDis(this) // BatchModel.computeDis(this)
// if (this.options.positions.length > 0 || this.options.positions.lng) { // if (this.options.positions.length > 0 || this.options.positions.lng) {
if (this.options.spacing < 0 || options.spacing * 1 === 0) {
tools.message({ type: 'warning', text: '请输入正确的间距!' })
return;
}
if ((options.type && options.spacing != undefined) || options.type == '点') { if ((options.type && options.spacing != undefined) || options.type == '点') {
// BatchModel.computeDis(this) // BatchModel.computeDis(this)
@ -67,6 +73,32 @@ class BatchModel extends Base {
} }
Draw && Draw.start((a, positions) => { Draw && Draw.start((a, positions) => {
this.options.positions = positions; this.options.positions = positions;
//判断范围是否过大
if (options.type == '面') {
let posi = positions.map(v => {
return Cesium.Cartesian3.fromDegrees(v.lng, v.lat)
})
let dis1 = Cesium.Cartesian3.distance(posi[0], posi[1])
let dis2 = Cesium.Cartesian3.distance(posi[1], posi[2])
let num1 = dis1 / this.options.spacing
let num2 = dis2 / this.options.spacing
if (num1 * num2 > 100) {
tools.message({ type: 'warning', text: '数量大于100请重新绘制' })
return;
}
} else if (options.type == '线') {
let posi = positions.map(v => {
return Cesium.Cartesian3.fromDegrees(v.lng, v.lat)
})
let dis = 0
for (let i = 0; i < posi.length - 2; i++) {
dis += Cesium.Cartesian3.distance(posi[i], posi[i + 1])
}
if (dis / this.options.spacing > 100) {
tools.message({ type: 'warning', text: '数量大于100请重新绘制' })
return;
}
}
// this.callback(this.options); // this.callback(this.options);
(this.options.positions.length || this.options.positions.lng) && BatchModel.computeDis(this) (this.options.positions.length || this.options.positions.lng) && BatchModel.computeDis(this)
}) })

View File

@ -29,7 +29,8 @@ import MouseTip from '../../../MouseTip'
import { import {
setSplitDirection, setSplitDirection,
syncSplitData, syncSplitData,
setActiveId setActiveId,
getState
} from '../../../Global/SplitScreen' } from '../../../Global/SplitScreen'
import { import {
setActiveViewer, setActiveViewer,
@ -197,7 +198,9 @@ class BillboardObject extends Base {
this.#_destroyMouseEvent = () => { this.#_destroyMouseEvent = () => {
this.attributeElm && (this.attributeElm.style.pointerEvents = 'unset') this.attributeElm && (this.attributeElm.style.pointerEvents = 'unset')
this.sdk.viewer._element.onmousemove = null if(this.sdk && this.sdk.viewer && this.sdk.viewer._element) {
this.sdk.viewer._element.onmousemove = null
}
document.removeEventListener('mouseup', this.#_destroyMouseEvent) document.removeEventListener('mouseup', this.#_destroyMouseEvent)
document.removeEventListener('mouseleave', this.#_destroyMouseEvent) document.removeEventListener('mouseleave', this.#_destroyMouseEvent)
} }
@ -2943,13 +2946,16 @@ class BillboardObject extends Base {
attributeElm.style.left = '0px' attributeElm.style.left = '0px'
attributeElm.style.width = 0 attributeElm.style.width = 0
attributeElm.style.height = 0 attributeElm.style.height = 0
if(getState()) {
attributeElm.style.display = 'none'
}
// attributeElm.innerHTML = this.options.richTextContent // attributeElm.innerHTML = this.options.richTextContent
this.sdk.viewer._element.appendChild(attributeElm) this.sdk.viewer._element.appendChild(attributeElm)
let linkHtml = '' let linkHtml = ''
let goodsHtml = '' let goodsHtml = ''
let richTextHtml = '' let richTextHtml = ''
for (let i = 0; i < this.options.attribute.link.content.length; i++) { for (let i = 0; i < this.options.attribute.link.content.length; i++) {
linkHtml += `<DIV-cy-tab-pane label="${this.options.attribute.link.content[i].name}"><iframe width='100%' height='100%' src="${this.options.attribute.link.content[i].url}"></iframe></DIV-cy-tab-pane>` linkHtml += `<DIV-cy-tab-pane label="${this.options.attribute.link.content[i].name}"><iframe width='100%' height='100%' src="${this.options.attribute.link.content[i].url}" ></iframe></DIV-cy-tab-pane>`
} }
if (this.options.attribute.goods && this.options.attribute.goods.content && this.options.attribute.goods.content.length > 0) { if (this.options.attribute.goods && this.options.attribute.goods.content && this.options.attribute.goods.content.length > 0) {
goodsHtml += `<DIV-cy-tab-pane label="物资"> goodsHtml += `<DIV-cy-tab-pane label="物资">

View File

@ -181,7 +181,7 @@ class CircleDiffuse extends Base {
} }
that.sdk._entityZIndex++ that.sdk._entityZIndex++
if (that.sdk.viewer._element.className === 'cesium-viewer 2d') { if (that.sdk.viewer._element.className === 'cesium-viewer 2d') {
that.entity.ellipse.height = 1000000 that.entity.ellipse.height = 1
} }
CircleDiffuse.createLabel(that) CircleDiffuse.createLabel(that)
syncData(that.sdk, that.options.id) syncData(that.sdk, that.options.id)

View File

@ -1384,10 +1384,10 @@ class CurvelineObject extends Base {
that.options.lengthByMeter = res that.options.lengthByMeter = res
that.lengthUnit = that.options['length-unit'] that.lengthUnit = that.options['length-unit']
syncData(that.sdk, that.options.id) syncData(that.sdk, that.options.id)
if (that.options.show) {
setSplitDirection(0, that.options.id)
}
}) })
if (that.options.show) {
setSplitDirection(0, that.options.id)
}
// if (this.options['nose-to-tail']) { // if (this.options['nose-to-tail']) {
// let array = [] // let array = []

View File

@ -162,6 +162,7 @@ class FlyRoam extends Base {
pitch: viewer.camera.pitch, pitch: viewer.camera.pitch,
roll: viewer.camera.roll roll: viewer.camera.roll
} }
this.message({text: '操作成功'})
}) })
let totalTimeElm = contentElm.querySelector("input[name='totalTime']") let totalTimeElm = contentElm.querySelector("input[name='totalTime']")

View File

@ -376,7 +376,10 @@ class GroundSvg extends Base {
} }
set textFontSize(v) { set textFontSize(v) {
this.options.text.fontSize = v this.options.text.fontSize = v
this.text && (this.text.fontSize = v) if(this.text) {
this.text.fontSize = v
this.text.pixelOffset = v
}
this._elms.textFontSize && this._elms.textFontSize.forEach((item) => { this._elms.textFontSize && this._elms.textFontSize.forEach((item) => {
item.value = v item.value = v
}) })
@ -909,11 +912,10 @@ class GroundSvg extends Base {
text: that.options.text.value, text: that.options.text.value,
fontSize: that.options.text.fontSize, fontSize: that.options.text.fontSize,
color: that.options.text.color, color: that.options.text.color,
pixelOffset: that.options.text.pixelOffset, pixelOffset: that.options.text.fontSize,
backgroundColor: that.options.text.backgroundColor, backgroundColor: that.options.text.backgroundColor,
lineColor: that.options.text.lineColor, lineColor: '#ffffff00',
lineWidth: that.options.text.lineWidth, lineWidth: 0,
pixelOffset: 0,
scaleByDistance: that.options.text.scaleByDistance, scaleByDistance: that.options.text.scaleByDistance,
backgroundColor: ['#ffffff00', '#ffffff00'], backgroundColor: ['#ffffff00', '#ffffff00'],
near: that.options.text.near, near: that.options.text.near,

View File

@ -1410,10 +1410,10 @@ class PolylineObject extends Base {
that.options.lengthByMeter = res that.options.lengthByMeter = res
that.lengthUnit = that.options['length-unit'] that.lengthUnit = that.options['length-unit']
syncData(that.sdk, that.options.id) syncData(that.sdk, that.options.id)
if (that.options.show) {
setSplitDirection(0, that.options.id)
}
}) })
if (that.options.show) {
setSplitDirection(0, that.options.id)
}
// if (this.options['nose-to-tail']) { // if (this.options['nose-to-tail']) {

View File

@ -138,7 +138,7 @@ class RadarScan extends Base {
}) })
that.sdk._entityZIndex++ that.sdk._entityZIndex++
if (that.sdk.viewer._element.className === 'cesium-viewer 2d') { if (that.sdk.viewer._element.className === 'cesium-viewer 2d') {
that.entity.ellipse.height = 1000000 that.entity.ellipse.height = 1
} }
RadarScan.createLabel(that) RadarScan.createLabel(that)
syncData(that.sdk, that.options.id) syncData(that.sdk, that.options.id)

View File

@ -2,6 +2,7 @@
* 文本框 * 文本框
*/ */
import Base from "../index"; import Base from "../index";
import { syncData, getSdk } from '../../../Global/MultiViewportMode'
import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global' import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
class TextBox extends Base { class TextBox extends Base {
/** /**
@ -29,7 +30,15 @@ class TextBox extends Base {
this.textDom = undefined this.textDom = undefined
this.create(this) this.create(this)
this.sdk.addIncetance(this.options.id, this) this.sdk.addIncetance(this.options.id, this)
this.callback = callback this.callback = callback
// syncData(this.sdk, this.options.id)
}
get type() {
return 'TextBox'
} }
async create(that) { async create(that) {
@ -38,6 +47,7 @@ class TextBox extends Base {
let dom = document.createElement('span'); let dom = document.createElement('span');
dom.id = that.options.id dom.id = that.options.id
dom.className = 'popup-textarea' dom.className = 'popup-textarea'
dom.style.zIndex = 1
// 创建textarea元素 // 创建textarea元素
var textarea = document.createElement('textarea'); var textarea = document.createElement('textarea');
textarea.className = 'textarea' textarea.className = 'textarea'
@ -125,10 +135,46 @@ class TextBox extends Base {
async getwords(words) { async getwords(words) {
this.options.text = words this.options.text = words
this.callback(this.options) this.callback(this.options)
let { sdkP } = getSdk()
if (this.sdk === sdkP && sdkP) {//三维
syncData(this.sdk, this.options.id)
}
else if (sdkP) {//二维
sdkP.entityMap.get(this.options.id).text = words
sdkP.entityMap.get(this.options.id).twoToThree(this.options.position)
} else if (!sdkP) {
syncData(this.sdk, this.options.id)
}
}
async twoToThree(position) {
let that = this
that.sdk.viewer.scene.postRender.removeEventListener(that.handler);
let posi = Cesium.Cartesian3.fromDegrees(position.lng, position.lat, position.alt)
that.handler = function () {
const position = Cesium.SceneTransforms.wgs84ToWindowCoordinates(
that.sdk.viewer.scene, posi
);
if (position) {
let width = that.textDom.clientWidth * 1
let height = that.textDom.clientHeight * 1
that.textDom.style.left = `${position.x - width / 2}px`;
that.textDom.style.top = `${position.y - height}px`;
}
}
that.sdk.viewer.scene.postRender.addEventListener(that.handler);
} }
async returnFun() { async returnFun() {
return this.handler return this.handler
} }
get text() {
return this.options.text
}
set text(val) {
this.options.text = val
this.textDom.querySelector('textarea').value = val
this.callback(this.options)
}
get onClick() { get onClick() {
return this.clickCallBack return this.clickCallBack
} }
@ -145,6 +191,7 @@ class TextBox extends Base {
set show(v) { set show(v) {
this.options.show = v this.options.show = v
this.textDom && (this.textDom.style.display = v ? 'block' : 'none'); this.textDom && (this.textDom.style.display = v ? 'block' : 'none');
syncData(this.sdk, this.options.id)
} }
get position() { get position() {
return this.options.position return this.options.position
@ -235,6 +282,7 @@ class TextBox extends Base {
if (this.textDom && this.textDom.parentNode) { if (this.textDom && this.textDom.parentNode) {
this.sdk.viewer.cesiumWidget.container.removeChild(this.textDom); this.sdk.viewer.cesiumWidget.container.removeChild(this.textDom);
} }
await this.sdk.removeIncetance(this.options.id)
} }
flicker() { } flicker() { }

View File

@ -1764,9 +1764,10 @@ class TrajectoryMotion extends Base {
if (!cartesian3) { if (!cartesian3) {
return return
} }
coordinates = _this.cartesian3Towgs84(cartesian3, viewer); let pos84 = _this.cartesian3Towgs84(cartesian3, viewer);
coordinates = [pos84.lng, pos84.lat, pos84.alt + 1.8]
position = cartesian3 position = cartesian3
positionCamera = Cesium.Cartesian3.fromDegrees(coordinates.lng, coordinates.lat, coordinates.alt + 1.8) positionCamera = Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2])
let positions_smooth = [] let positions_smooth = []
for (let i = 0; i <= 1000; i++) { for (let i = 0; i <= 1000; i++) {
if ((i / 1000) > (distance / _this.distance)) { if ((i / 1000) > (distance / _this.distance)) {
@ -1890,7 +1891,7 @@ class TrajectoryMotion extends Base {
else { else {
if (_this.sdk.viewer.trackedEntity) { if (_this.sdk.viewer.trackedEntity) {
_this.sdk.viewer.camera.setView({ _this.sdk.viewer.camera.setView({
destination: Cesium.Cartesian3.fromDegrees(coordinates.lng, coordinates.lat, _this.sdk.viewer.camera.positionCartographic.height), destination: Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], _this.sdk.viewer.camera.positionCartographic.height),
orientation: { orientation: {
heading: Cesium.Math.toRadians(-90), heading: Cesium.Math.toRadians(-90),
pitch: 0, pitch: 0,

View File

@ -137,7 +137,7 @@ class Base extends Tools {
this.originalOptions.show = v this.originalOptions.show = v
} }
} }
this.entity._showView = this.showView this.entity && (this.entity._showView = this.showView)
if (this.type == 'layer') { if (this.type == 'layer') {
if (this.entity) { if (this.entity) {
this.entity._objectState = this.options.show this.entity._objectState = this.options.show

View File

@ -100,7 +100,7 @@ function attributeElm(that) {
let tr = ` let tr = `
<div class="tr"> <div class="tr">
<div class="td"> <div class="td">
<input type="checkbox" value="${'ID' in data.data.list[i] ? data.data.list[i].ID : data.data.list[i].id}"> <input type="checkbox" value="${data.data.list[i].deviceId}">
<span>绑定</span> <span>绑定</span>
</div> </div>
<div class="td">${data.data.list[i].cameraName}</div> <div class="td">${data.data.list[i].cameraName}</div>
@ -126,11 +126,8 @@ function attributeElm(that) {
} }
else { else {
let newArray = that.attributeCamera.filter((item) => { let newArray = that.attributeCamera.filter((item) => {
if ('ID' in data.data.list[i]) { if ('deviceId' in data.data.list[i]) {
return item.ID !== data.data.list[i].ID return item.deviceId !== data.data.list[i].deviceId
}
else {
return item.id !== data.data.list[i].id
} }
}) })
that.attributeCamera = newArray that.attributeCamera = newArray
@ -139,7 +136,7 @@ function attributeElm(that) {
tableContent.appendChild(trElm) tableContent.appendChild(trElm)
for (let m = 0; m < that.attributeCamera.length; m++) { for (let m = 0; m < that.attributeCamera.length; m++) {
if (('ID' in data.data.list[i]) ? (that.attributeCamera[m].ID === data.data.list[i].ID) : (that.attributeCamera[m].id === data.data.list[i].id)) { if (('deviceId' in data.data.list[i]) ? (that.attributeCamera[m].deviceId === data.data.list[i].deviceId):false) {
checkbox.checked = true checkbox.checked = true
break break
} }
@ -200,17 +197,9 @@ function attributeElm(that) {
for (let i = that.attributeCamera.length - 1; i >= 0; i--) { for (let i = that.attributeCamera.length - 1; i >= 0; i--) {
let flag = false let flag = false
for (let m = 0; m < data.data.list.length; m++) { for (let m = 0; m < data.data.list.length; m++) {
if ('ID' in data.data.list[m]) { if (that.attributeCamera[i].deviceId === data.data.list[m].deviceId) {
if (that.attributeCamera[i].ID === data.data.list[m].ID) { flag = true
flag = true break
break
}
}
if ('id' in data.data.list[m]) {
if (that.attributeCamera[i].id === data.data.list[m].id) {
flag = true
break
}
} }
} }
if (!flag) { if (!flag) {

View File

@ -50,7 +50,8 @@ export default class CircleDiffuseMaterialProperty {
let color = this.colors[ratio[i]] let color = this.colors[ratio[i]]
_sourceColor = _sourceColor + ` _sourceColor = _sourceColor + `
if(dis < float(${Number(ratio[i]) / 2})) { if(dis < float(${Number(ratio[i]) / 2})) {
material.diffuse = 1.5 * vec4(${color.red},${color.green},${color.blue},${color.alpha}).rgb; material.diffuse = vec4(0.0,0.0,0.0,0.0).rgb;
material.emission = 1.0 * vec4(${color.red},${color.green},${color.blue},${color.alpha}).rgb;
} }
` `
} }
@ -110,7 +111,7 @@ export default class CircleDiffuseMaterialProperty {
transparency: 1, transparency: 1,
count: 4, count: 4,
gradient: 0.2, gradient: 0.2,
frameNumber: Cesium.getTimestamp(), frameNumber: Cesium.getTimestamp(),
}, },
source: this._source, source: this._source,
}, },

View File

@ -1493,6 +1493,30 @@ class Tools {
} }
} }
message(option = {}) {
let type = option.type || 'success'
let text = option.text || ''
let duration = option.duration || 1500
let message = document.getElementById('YJ-custom-message');
if (message) {
document.body.removeChild(message)
}
message = document.createElement('div')
message.id = 'YJ-custom-message'
if (type == 'success') {
message.innerHTML = `
<i><?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755929961282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5064" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M874.119618 149.859922A510.816461 510.816461 0 0 0 511.997 0.00208a509.910462 509.910462 0 0 0-362.119618 149.857842c-199.817789 199.679789-199.817789 524.581447 0 724.260236a509.969462 509.969462 0 0 0 362.119618 149.857842A508.872463 508.872463 0 0 0 874.119618 874.120158c199.836789-199.679789 199.836789-524.581447 0-724.260236zM814.94268 378.210681L470.999043 744.132295a15.359984 15.359984 0 0 1-5.887994 4.095996c-1.751998 1.180999-2.913997 2.362998-5.276994 2.913997a34.499964 34.499964 0 0 1-13.469986 2.914997 45.547952 45.547952 0 0 1-12.897986-2.303998l-4.095996-2.363997a45.291952 45.291952 0 0 1-7.009992-4.095996l-196.902793-193.789796a34.126964 34.126964 0 0 1-10.555989-25.186973c0-9.37399 3.583996-18.74698 9.98399-25.186974a36.429962 36.429962 0 0 1 50.372947 0l169.98382 167.423824L763.389735 330.220732a37.059961 37.059961 0 0 1 50.371947-1.732998 33.647965 33.647965 0 0 1 11.165988 25.186973 35.544963 35.544963 0 0 1-9.98399 24.575974v-0.04z m0 0" fill="#52C41A" p-id="5065"></path></svg></i>${text}
`
} else if (type == 'warning') {
message.innerHTML = `
<i><?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1756093599258" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1648" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><path d="M512.002558 64.24521c-247.292176 0-447.75786 200.464661-447.75786 447.756837 0 247.287059 200.464661 447.752744 447.75786 447.752744 247.286036 0 447.75172-200.464661 447.75172-447.752744C959.754279 264.710894 759.288594 64.24521 512.002558 64.24521zM512.010745 735.87586c-20.602224 0-37.319977-16.718777-37.319977-37.323047 0-20.597107 16.717753-37.319977 37.319977-37.319977 20.60427 0 37.297464 16.72287 37.297464 37.319977C549.308209 719.158107 532.613992 735.87586 512.010745 735.87586zM549.308209 567.969733c0 20.600177-16.693194 37.293371-37.297464 37.293371-20.602224 0-37.319977-16.693194-37.319977-37.293371L474.690768 325.420581c0-20.605294 16.717753-37.297464 37.319977-37.297464 20.60427 0 37.297464 16.693194 37.297464 37.297464L549.308209 567.969733z" fill="#e98f36" p-id="1649"></path></svg></i>${text}
`
}
document.body.appendChild(message)
message.classList.add(type)
}
} }

View File

@ -10,6 +10,7 @@ import AModelLoader from '../Obj/Base/LoadObjModel/AModelLoader'
import { setSvg } from '../Obj/Element/svg' import { setSvg } from '../Obj/Element/svg'
import Tools from '../Tools' import Tools from '../Tools'
import { Proj } from '../Tools/proj' import { Proj } from '../Tools/proj'
import { syncData, getSdk } from '../Global/MultiViewportMode'
import { import {
unRegLeftClickCallback, unRegLeftClickCallback,
unRegRightClickCallback, unRegRightClickCallback,
@ -151,7 +152,7 @@ class YJEarth {
} }
this.options.contextOptions = { this.options.contextOptions = {
webgl: { webgl: {
alpha: true, // alpha: true,
depth: true, depth: true,
stencil: true, stencil: true,
antialias: true, antialias: true,
@ -419,7 +420,8 @@ class YJEarth {
let ClickHandler = new Cesium.ScreenSpaceEventHandler(_this.viewer.canvas) let ClickHandler = new Cesium.ScreenSpaceEventHandler(_this.viewer.canvas)
ClickHandler.setInputAction((movement) => { ClickHandler.setInputAction((movement) => {
let textList = document.getElementsByClassName('popup-textarea') // let textList = document.getElementsByClassName('popup-textarea')
let textList = _this.viewer._element.getElementsByClassName('popup-textarea')
_this.isLeftClick = false _this.isLeftClick = false
for (let i = textList.length - 1; i > -1; i--) { for (let i = textList.length - 1; i > -1; i--) {
let left = returnNumber(textList[i].style.left) let left = returnNumber(textList[i].style.left)
@ -431,12 +433,20 @@ class YJEarth {
if (x > left && x < left + width && y > top && y < top + height) { if (x > left && x < left + width && y > top && y < top + height) {
if (_this.clickTextDom) { if (_this.clickTextDom) {
_this.clickTextDom.style['pointer-events'] = 'none' _this.clickTextDom.style['pointer-events'] = 'none'
_this.clickTextDom.querySelector('textarea').removeEventListener('blur', _this.blurFun)
} }
_this.clickTextDom = textList[i] _this.clickTextDom = textList[i]
textList[i].style['pointer-events'] = 'all' textList[i].style['pointer-events'] = 'all'
textList[i].querySelector('textarea').focus() textList[i].querySelector('textarea').focus()
_this.isLeftClick = true _this.isLeftClick = true
_this.entityMap.get(_this.clickTextDom.id).isClick(movement.position, _this.clickTextDom.id) _this.entityMap.get(_this.clickTextDom.id).isClick(movement.position, _this.clickTextDom.id)
_this.blurFun = () => {
_this.entityMap.get(_this.clickTextDom.id).isClick((movement && movement.position) || null, _this.clickTextDom.id)
_this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
}
_this.clickTextDom.querySelector('textarea').addEventListener('blur', _this.blurFun)
break; break;
} }
} }
@ -467,6 +477,11 @@ class YJEarth {
x: e.clientX - layerX + width / 2, x: e.clientX - layerX + width / 2,
y: e.clientY - layerY + height, y: e.clientY - layerY + height,
} }
let { sdkP } = getSdk()
if (_this != sdkP && sdkP) {//二维
let num = sdkP.viewer._element.clientWidth
param.x = param.x - num
}
_this.entityMap.get(_this.clickTextDom.id).setHandeler(param) _this.entityMap.get(_this.clickTextDom.id).setHandeler(param)
} }
@ -478,14 +493,14 @@ class YJEarth {
} }
_this.clickTextDom.addEventListener('mousedown', mousedown); _this.clickTextDom.addEventListener('mousedown', mousedown);
document.addEventListener('mousemove', mousemove); _this.viewer._element.addEventListener('mousemove', mousemove);
document.addEventListener('mouseup', mouseup); _this.viewer._element.addEventListener('mouseup', mouseup);
} }
// 点击其他地方取消 // 点击其他地方取消
if (!_this.isLeftClick && _this.clickTextDom) { if (!_this.isLeftClick && _this.clickTextDom) {
_this.clickTextDom.removeEventListener('mousedown', mousedown); _this.clickTextDom.removeEventListener('mousedown', mousedown);
document.removeEventListener('mousemove', mousemove); _this.viewer._element.removeEventListener('mousemove', mousemove);
document.removeEventListener('mouseup', mouseup); _this.viewer._element.removeEventListener('mouseup', mouseup);
_this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value) _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
_this.clickTextDom.style['pointer-events'] = 'none' _this.clickTextDom.style['pointer-events'] = 'none'

View File

@ -3493,6 +3493,7 @@
cursor: e-resize; cursor: e-resize;
background-color: #d3d3d3; background-color: #d3d3d3;
user-select: none; user-select: none;
z-index: 1;
} }
.cesium-performanceDisplay-defaultContainer { .cesium-performanceDisplay-defaultContainer {
@ -3762,4 +3763,61 @@
.billboard-attribute-box .table .table-body .tr:first-child { .billboard-attribute-box .table .table-body .tr:first-child {
border-top: none; border-top: none;
} }
/* 自定义提示 */
#YJ-custom-message {
/* 固定在顶部中央 */
position: fixed;
top: 0;
left: 50%;
transform: translate(-50%, 0%);
/* 初始位置在屏幕顶部外 */
/* 样式美化 */
display: flex;
border-radius: 4px;
font-size: 14px;
padding: 15px 20px;
width: 380px;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
z-index: 9999999;
/* 动画定义 */
animation: YJ-custom-message-slideDown 0.5s forwards,
YJ-custom-message-fadeOut 0.5s 1500ms forwards;
}
#YJ-custom-message i {
margin: 2px 10px 0 0;
display: flex;
align-items: center;
width: 16px;
}
#YJ-custom-message.success {
background-color: #f0f9eb;
color: rgb(82, 196, 26);
}
#YJ-custom-message.warning {
background-color: #fdf6ec;
color: #e6a23c;
}
/* 滑入动画 */
@keyframes YJ-custom-message-slideDown {
to {
top: 20px;
/* 移动到屏幕顶部 */
}
}
/* 淡出动画 - 1500ms后执行 */
@keyframes YJ-custom-message-fadeOut {
to {
opacity: 0;
top: -200px
/* 移回顶部外 */
}
}