修改
This commit is contained in:
@ -9,7 +9,7 @@
|
||||
import Dialog from '../../../Element/Dialog';
|
||||
import CoordTransform from "../../../../transform/CoordTransform";
|
||||
import BaseSource from "../index";
|
||||
import { syncData } from '../../../../Global/MultiViewportMode'
|
||||
import { syncData, get2DView } from '../../../../Global/MultiViewportMode'
|
||||
import { setSplitDirection, syncSplitData } from '../../../../Global/SplitScreen'
|
||||
import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
|
||||
|
||||
@ -244,8 +244,19 @@ class BaseLayer extends BaseSource {
|
||||
this.originalOptions = this.deepCopyObj(this.options)
|
||||
this._DialogObject.close()
|
||||
this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
|
||||
syncData(this.sdk, this.options.id)
|
||||
// syncData(this.sdk, this.options.id)
|
||||
syncSplitData(this.sdk, this.options.id)
|
||||
let sdk2D = get2DView()
|
||||
if (sdk2D && sdk2D != this.sdk) {
|
||||
for(let i=0;i<sdk2D.viewer.imageryLayers._layers.length;i++) {
|
||||
let layer = sdk2D.viewer.imageryLayers._layers[i]
|
||||
if(layer._id && layer._id == this.options.id) {
|
||||
layer.alpha = this.options.alpha
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
closeCallBack: () => {
|
||||
this.reset()
|
||||
|
@ -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'
|
||||
// }
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -825,7 +825,6 @@ class PolylineObject extends Base {
|
||||
set labelLineColor(v) {
|
||||
this.options.label.lineColor = v
|
||||
this.label.lineColor = v
|
||||
let _this = this
|
||||
if (this._elms.labelLineColor) {
|
||||
this._elms.labelLineColor.forEach((item, i) => {
|
||||
let lineColorPicker = new YJColorPicker({
|
||||
@ -840,6 +839,29 @@ class PolylineObject extends Base {
|
||||
}, //点击确认按钮事件回调
|
||||
clear: () => {
|
||||
this.labelLineColor = 'rgba(0,255,255,0.5)'
|
||||
} //点击清空按钮事件回调
|
||||
})
|
||||
this._elms.labelLineColor[i] = lineColorPicker
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
get labelBackgroundColorStart() {
|
||||
return this.options.label.backgroundColor[0]
|
||||
}
|
||||
set labelBackgroundColorStart(v) {
|
||||
this.options.label.backgroundColor[0] = v
|
||||
this.label.backgroundColor = [v, this.label.backgroundColor[1]]
|
||||
if (this._elms.labelBackgroundColorStart) {
|
||||
this._elms.labelBackgroundColorStart.forEach((item, i) => {
|
||||
let labelBackgroundColorStartPicker = new YJColorPicker({
|
||||
el: item.el,
|
||||
size: 'mini', //颜色box类型
|
||||
alpha: true, //是否开启透明度
|
||||
defaultColor: this.labelBackgroundColorStart,
|
||||
disabled: false, //是否禁止打开颜色选择器
|
||||
openPickerAni: 'opacity', //打开颜色选择器动画
|
||||
sure: color => {
|
||||
this.labelBackgroundColorStart = color
|
||||
}, //点击确认按钮事件回调
|
||||
clear: () => {
|
||||
@ -848,10 +870,11 @@ class PolylineObject extends Base {
|
||||
})
|
||||
this._elms.labelBackgroundColorStart[
|
||||
i
|
||||
] = _this.labelBackgroundColorStartPicker
|
||||
] = labelBackgroundColorStartPicker
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
get labelBackgroundColorEnd() {
|
||||
return this.options.label.backgroundColor[1]
|
||||
}
|
||||
|
@ -2087,7 +2087,7 @@ class TrajectoryMotion extends Base {
|
||||
rubricElm.style.color = '#ff5733';
|
||||
rubricElm.style.display = 'none'
|
||||
|
||||
rubricElm.innerHTML = `场景正北方向为轨迹前进正方向<div x-arrow="" class="custom__popper__arrow" style="left: 59px;"></div>`
|
||||
rubricElm.innerHTML = `场景正东方向为轨迹前进正方向<div x-arrow="" class="custom__popper__arrow" style="left: 59px;"></div>`
|
||||
let iconRubric = contentElm.getElementsByClassName('icon-rubric')[0]
|
||||
iconRubric.addEventListener('mouseenter', (e) => {
|
||||
rubricElm.style.display = 'block'
|
||||
|
@ -88,6 +88,10 @@ class WallStereoscopic extends Base {
|
||||
}
|
||||
}
|
||||
|
||||
get type() {
|
||||
return 'wallStereoscopic'
|
||||
}
|
||||
|
||||
static createLabel(that) {
|
||||
// 标签
|
||||
that.label = new LabelObject(that.sdk, {
|
||||
|
@ -290,7 +290,7 @@ class Base extends Tools {
|
||||
let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
|
||||
|
||||
let position = { lng: 0, lat: 0 }
|
||||
if (this.options.position) {
|
||||
if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
|
||||
position = { ...this.options.position }
|
||||
}
|
||||
else if (this.options.positions) {
|
||||
@ -436,7 +436,7 @@ class Base extends Tools {
|
||||
|
||||
let position = { lng: 0, lat: 0 }
|
||||
let relativePosition = { ...cameraPosition84 }
|
||||
if (this.options.position) {
|
||||
if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
|
||||
position = { ...this.options.position }
|
||||
}
|
||||
else if (this.options.positions) {
|
||||
|
Reference in New Issue
Block a user