修改线绘制 流动箭头,保存,然后再次编辑,未显示对应参数以及虚线远视角报错问题
This commit is contained in:
@ -1317,12 +1317,19 @@ class PolylineObject extends Base {
|
|||||||
positions: Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray),
|
positions: Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray),
|
||||||
width: that.options.width,
|
width: that.options.width,
|
||||||
clampToGround: ground,
|
clampToGround: ground,
|
||||||
material: that.getMaterial(that.options.color, that.options.type, that.entity, that.options),
|
// material: that.getMaterial(that.options.color, that.options.type, that.entity, that.options),
|
||||||
zIndex: that.sdk._entityZIndex
|
zIndex: that.sdk._entityZIndex
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
that.entity.polyline.oriWidth = that.options.width
|
that.entity.polyline.oriWidth = that.options.width
|
||||||
that.judgeLine(that.entity, that.options)
|
that.judgeLine(that.entity, that.options)
|
||||||
|
that.entity.polyline.material = that.getMaterial(
|
||||||
|
that.options.color,
|
||||||
|
that.options.type,
|
||||||
|
that.entity,
|
||||||
|
that.options
|
||||||
|
)
|
||||||
that.sdk._entityZIndex++
|
that.sdk._entityZIndex++
|
||||||
PolylineObject.createLabel(that)
|
PolylineObject.createLabel(that)
|
||||||
// that.entity.polyline.positionsLngLat = positions
|
// that.entity.polyline.positionsLngLat = positions
|
||||||
@ -1529,10 +1536,20 @@ class PolylineObject extends Base {
|
|||||||
// this.attributeCamera = this.options.attribute.camera.content
|
// this.attributeCamera = this.options.attribute.camera.content
|
||||||
// this.attributeGoods = this.options.attribute.goods.content
|
// this.attributeGoods = this.options.attribute.goods.content
|
||||||
|
|
||||||
|
function tabClick(e) {
|
||||||
|
if (e === '2' || e === 2) {//点击线条样式
|
||||||
|
if (2 < _this.options.type && _this.options.type < 13) {//贴图参数
|
||||||
|
document.getElementById('dashTextureDom').style.display = 'flex'
|
||||||
|
} else {
|
||||||
|
document.getElementById('dashTextureDom').style.display = 'none'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 创建标签页
|
// 创建标签页
|
||||||
let tabsElm = new cy_tabs(
|
let tabsElm = new cy_tabs(
|
||||||
'polyline-object-edit-tabs',
|
'polyline-object-edit-tabs',
|
||||||
undefined,
|
tabClick,
|
||||||
this.sdk
|
this.sdk
|
||||||
)
|
)
|
||||||
// 颜色组件
|
// 颜色组件
|
||||||
|
@ -1,76 +1,77 @@
|
|||||||
class cy_tabs {
|
class cy_tabs {
|
||||||
constructor(id, clickTabCallBack, sdk) {
|
constructor(id, clickTabCallBack, sdk) {
|
||||||
let elm = document.getElementById(id);
|
let elm = document.getElementById(id);
|
||||||
let pane = elm.getElementsByTagName('DIV-cy-tab-pane')
|
let pane = elm.getElementsByTagName('DIV-cy-tab-pane')
|
||||||
|
|
||||||
let tabTop = `<div class="DIV-cy-tab-top">`
|
let tabTop = `<div class="DIV-cy-tab-top">`
|
||||||
let tabContent = `<div class="DIV-cy-tab-content">`
|
let tabContent = `<div class="DIV-cy-tab-content">`
|
||||||
let tabindex = 0
|
let tabindex = 0
|
||||||
for (let i = 0; i < pane.length; i++) {
|
for (let i = 0; i < pane.length; i++) {
|
||||||
let flag = false
|
let flag = false
|
||||||
if (sdk && sdk.tabHide && Array.isArray(sdk.tabHide)) {
|
if (sdk && sdk.tabHide && Array.isArray(sdk.tabHide)) {
|
||||||
for (let m = 0; m < sdk.tabHide.length; m++) {
|
for (let m = 0; m < sdk.tabHide.length; m++) {
|
||||||
if (pane[i].getAttribute('label') === sdk.tabHide[m]) {
|
if (pane[i].getAttribute('label') === sdk.tabHide[m]) {
|
||||||
flag = true
|
flag = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (flag) {
|
if (flag) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
let style = 'display: none;'
|
let style = 'display: none;'
|
||||||
let active = ''
|
let active = ''
|
||||||
if (tabindex == 0) {
|
if (tabindex == 0) {
|
||||||
style = ''
|
style = ''
|
||||||
active = 'is-active'
|
active = 'is-active'
|
||||||
}
|
}
|
||||||
tabTop = tabTop + `
|
tabTop = tabTop + `
|
||||||
<div class="DIV-cy-tab-pane-title">
|
<div class="DIV-cy-tab-pane-title">
|
||||||
<div class="DIV-cy-tab-pane-title-p `+ active + `" tabindex="` + tabindex + `"><span>` + pane[i].getAttribute('label') + `</span></div>
|
<div class="DIV-cy-tab-pane-title-p `+ active + `" tabindex="` + tabindex + `"><span>` + pane[i].getAttribute('label') + `</span></div>
|
||||||
</div>
|
</div>
|
||||||
`
|
`
|
||||||
tabContent = tabContent + `<div class="DIV-cy-tab-content-pane ${pane[i].className}" style="` + style + `">` + pane[i].innerHTML + `</div>`
|
tabContent = tabContent + `<div class="DIV-cy-tab-content-pane ${pane[i].className}" style="` + style + `">` + pane[i].innerHTML + `</div>`
|
||||||
tabindex++
|
tabindex++
|
||||||
|
}
|
||||||
|
tabTop = tabTop + `</div>`
|
||||||
|
tabContent = tabContent + `</div>`
|
||||||
|
|
||||||
|
let BoxElm = document.createElement('div');
|
||||||
|
BoxElm.setAttribute('id', id)
|
||||||
|
BoxElm.setAttribute('class', 'DIV-cy-tabs')
|
||||||
|
BoxElm.innerHTML = tabTop + tabContent
|
||||||
|
elm.parentNode.insertBefore(BoxElm, elm);
|
||||||
|
elm.parentNode.removeChild(elm);
|
||||||
|
|
||||||
|
// 点击事件
|
||||||
|
let tabs = BoxElm.getElementsByClassName('DIV-cy-tab-pane-title-p')
|
||||||
|
for (let i = 0; i < tabs.length; i++) {
|
||||||
|
tabs[i].addEventListener('click', (e) => {
|
||||||
|
let tabindex = e.target.getAttribute('tabindex')
|
||||||
|
let contentElm = BoxElm.getElementsByClassName('DIV-cy-tab-content-pane')
|
||||||
|
clickTabCallBack && clickTabCallBack(tabindex)
|
||||||
|
for (let i = 0; i < contentElm.length; i++) {
|
||||||
|
if (i === parseInt(tabindex)) {
|
||||||
|
contentElm[i].style.display = ''
|
||||||
|
tabs[i].className = 'DIV-cy-tab-pane-title-p is-active'
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
contentElm[i].style.display = 'none'
|
||||||
|
tabs[i].className = 'DIV-cy-tab-pane-title-p'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
tabTop = tabTop + `</div>`
|
contentElm[parseInt(tabindex)].style.display = ''
|
||||||
tabContent = tabContent + `</div>`
|
})
|
||||||
|
|
||||||
let BoxElm = document.createElement('div');
|
|
||||||
BoxElm.setAttribute('id', id)
|
|
||||||
BoxElm.setAttribute('class', 'DIV-cy-tabs')
|
|
||||||
BoxElm.innerHTML = tabTop + tabContent
|
|
||||||
elm.parentNode.insertBefore(BoxElm, elm);
|
|
||||||
elm.parentNode.removeChild(elm);
|
|
||||||
|
|
||||||
// 点击事件
|
|
||||||
let tabs = BoxElm.getElementsByClassName('DIV-cy-tab-pane-title-p')
|
|
||||||
for (let i = 0; i < tabs.length; i++) {
|
|
||||||
tabs[i].addEventListener('click', (e) => {
|
|
||||||
let tabindex = e.target.getAttribute('tabindex')
|
|
||||||
let contentElm = BoxElm.getElementsByClassName('DIV-cy-tab-content-pane')
|
|
||||||
for (let i = 0; i < contentElm.length; i++) {
|
|
||||||
if (i === parseInt(tabindex)) {
|
|
||||||
contentElm[i].style.display = ''
|
|
||||||
tabs[i].className = 'DIV-cy-tab-pane-title-p is-active'
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
contentElm[i].style.display = 'none'
|
|
||||||
tabs[i].className = 'DIV-cy-tab-pane-title-p'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
contentElm[parseInt(tabindex)].style.display = ''
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
this.clickTabCallBack = clickTabCallBack
|
|
||||||
}
|
}
|
||||||
|
|
||||||
clickTabCallBack() {
|
this.clickTabCallBack = clickTabCallBack
|
||||||
if (this.clickTabCallBack) {
|
}
|
||||||
this.clickTabCallBack()
|
|
||||||
}
|
clickTabCallBack() {
|
||||||
|
if (this.clickTabCallBack) {
|
||||||
|
this.clickTabCallBack()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default cy_tabs
|
export default cy_tabs
|
@ -638,7 +638,7 @@ class Tools {
|
|||||||
// break
|
// break
|
||||||
case 6: //流动虚线2
|
case 6: //流动虚线2
|
||||||
let that = this
|
let that = this
|
||||||
|
let repeatX
|
||||||
material = new Cesium.FlowDashedLineFlowMaterialProperty({
|
material = new Cesium.FlowDashedLineFlowMaterialProperty({
|
||||||
color: color,
|
color: color,
|
||||||
uType: type == 5 ? 0 : 1,
|
uType: type == 5 ? 0 : 1,
|
||||||
@ -660,11 +660,10 @@ class Tools {
|
|||||||
let point2 = new Cesium.Cartesian2(that.sdk.viewer.canvas.clientWidth / 2, that.sdk.viewer.canvas.clientHeight)
|
let point2 = new Cesium.Cartesian2(that.sdk.viewer.canvas.clientWidth / 2, that.sdk.viewer.canvas.clientHeight)
|
||||||
var cartesian1 = that.sdk.viewer.scene.pickPosition(point1)
|
var cartesian1 = that.sdk.viewer.scene.pickPosition(point1)
|
||||||
var cartesian2 = that.sdk.viewer.scene.pickPosition(point2)
|
var cartesian2 = that.sdk.viewer.scene.pickPosition(point2)
|
||||||
|
if (cartesian1 && cartesian2) {
|
||||||
var distance2 = Cesium.Cartesian3.distance(cartesian1, cartesian2);
|
var distance2 = Cesium.Cartesian3.distance(cartesian1, cartesian2);
|
||||||
|
repeatX = distance2 * 2 / distance
|
||||||
let repeatX = distance2 * 2 / distance
|
}
|
||||||
|
|
||||||
return repeatX;
|
return repeatX;
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user