修改
This commit is contained in:
@ -420,8 +420,8 @@ let rightClick = (event: MouseEvent, treeId: string, treeNode: any) => {
|
|||||||
let customView
|
let customView
|
||||||
let entity = window['_entityMap'].get(treeNode.id)
|
let entity = window['_entityMap'].get(treeNode.id)
|
||||||
customView = Boolean(entity.customView && entity.customView.orientation)
|
customView = Boolean(entity.customView && entity.customView.orientation)
|
||||||
|
// customView ? 'resetView' : 'setView'
|
||||||
menus = [...menus, customView ? 'resetView' : 'setView']
|
menus = [...menus, 'resetView', 'setView']
|
||||||
}
|
}
|
||||||
// console.log('menus', menus)
|
// console.log('menus', menus)
|
||||||
if (menus.length == 0) {
|
if (menus.length == 0) {
|
||||||
|
|||||||
@ -25,7 +25,11 @@ const eventBus: any = inject('bus')
|
|||||||
const props = defineProps(['eventList', 'hr', 'originHrOffset', 'scrollLeft'])
|
const props = defineProps(['eventList', 'hr', 'originHrOffset', 'scrollLeft'])
|
||||||
let clickEventBar = (event) => {
|
let clickEventBar = (event) => {
|
||||||
console.log("点击事件块", selectedEventId.value, event)
|
console.log("点击事件块", selectedEventId.value, event)
|
||||||
let entity = window['_entityMap'].get(event.sourceId)
|
let key = event.sourceId
|
||||||
|
/* if (event.callback == 'move')
|
||||||
|
key = event.id + "move" + event.sourceId*/
|
||||||
|
// console.log(key)
|
||||||
|
let entity = window['_entityMap'].get(key)
|
||||||
entity && entity.flyTo()
|
entity && entity.flyTo()
|
||||||
selectedEventId.value = (selectedEventId.value == null || selectedEventId.value != event.id) ? event.id : null
|
selectedEventId.value = (selectedEventId.value == null || selectedEventId.value != event.id) ? event.id : null
|
||||||
eventBus.emit('click-event-show-plane', selectedEventId.value ? event : null)
|
eventBus.emit('click-event-show-plane', selectedEventId.value ? event : null)
|
||||||
|
|||||||
@ -127,12 +127,13 @@ const updateEvent = () => {
|
|||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
eventBus.emit('update-event', obj)
|
eventBus.emit('update-event', obj)
|
||||||
ElMessage({type: "success", message: "操作成功"})
|
ElMessage({type: "success", message: "操作成功"})
|
||||||
cancel()
|
cancel(false)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
const cancel = () => {
|
const cancel = (cancel = true) => {
|
||||||
|
if (cancel)
|
||||||
|
revert()
|
||||||
eventObj.value = null
|
eventObj.value = null
|
||||||
detail.value = {}
|
detail.value = {}
|
||||||
eventBus.emit('click-cancel-hide-plane',)
|
eventBus.emit('click-cancel-hide-plane',)
|
||||||
@ -140,6 +141,13 @@ const cancel = () => {
|
|||||||
eventBus.on('delete-event', () => {
|
eventBus.on('delete-event', () => {
|
||||||
cancel()
|
cancel()
|
||||||
})
|
})
|
||||||
|
const revert = () => {
|
||||||
|
let entity = window['_entityMap'].get(eventObj.value.id + "move" + eventObj.value.sourceId)
|
||||||
|
console.log(eventObj.value)
|
||||||
|
let detail = JSON.parse(eventObj.value.detail)
|
||||||
|
entity.lineShow = detail.line.show
|
||||||
|
entity.smooth = detail.line.smooth
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|||||||
@ -191,6 +191,11 @@ let formatTime = (timeStamp) => {
|
|||||||
return props.TSOBJ.parseTime(timeStamp)
|
return props.TSOBJ.parseTime(timeStamp)
|
||||||
}
|
}
|
||||||
let play = () => {
|
let play = () => {
|
||||||
|
if (props.TSOBJ._Store._currentTimestamp >= props.TSOBJ._Store.getTotalTime()) {
|
||||||
|
ElMessage.warning("到达推演终点")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
props.TSOBJ._Clock._status = "play"
|
props.TSOBJ._Clock._status = "play"
|
||||||
console.log(props.TSOBJ._Clock._status)
|
console.log(props.TSOBJ._Clock._status)
|
||||||
// return
|
// return
|
||||||
|
|||||||
@ -403,6 +403,10 @@ let submit = () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
let submitStandText = (flag) => {
|
let submitStandText = (flag) => {
|
||||||
|
if (standText.value.trim() == '' && flag) {
|
||||||
|
ElMessage.warning("内容不能为空")
|
||||||
|
return
|
||||||
|
}
|
||||||
showStandText.value = false
|
showStandText.value = false
|
||||||
/* let res = {
|
/* let res = {
|
||||||
currentDrawItem: currentDrawItem.value,
|
currentDrawItem: currentDrawItem.value,
|
||||||
|
|||||||
@ -339,6 +339,13 @@ let addMarker = (item, needSendEvent = true) => {
|
|||||||
window.draw.start((a, position) => {
|
window.draw.start((a, position) => {
|
||||||
console.log(position)
|
console.log(position)
|
||||||
if (position != undefined) {
|
if (position != undefined) {
|
||||||
|
if (position.length == 0 && item.type == "standText") {
|
||||||
|
item.source_name = ""
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (position.length < 2 && item.type == "waterL") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
let obj = {id, name: item.source_name, position}
|
let obj = {id, name: item.source_name, position}
|
||||||
switch (item.type) {
|
switch (item.type) {
|
||||||
case 'model':
|
case 'model':
|
||||||
@ -385,10 +392,8 @@ let addMarker = (item, needSendEvent = true) => {
|
|||||||
if (item.type == "standText") {
|
if (item.type == "standText") {
|
||||||
item.source_name = ""
|
item.source_name = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -344,6 +344,7 @@ const reset = (changeEventType = false) => {
|
|||||||
numbers.value = 0
|
numbers.value = 0
|
||||||
times.value = 1
|
times.value = 1
|
||||||
form.name = '闪烁-'
|
form.name = '闪烁-'
|
||||||
|
positions.value = []
|
||||||
// datetime: '',
|
// datetime: '',
|
||||||
|
|
||||||
form['datetime'] = new Date(window['tsObj']._Store._currentTimestamp)
|
form['datetime'] = new Date(window['tsObj']._Store._currentTimestamp)
|
||||||
|
|||||||
@ -37,7 +37,8 @@ export class Clock {
|
|||||||
nowTime = now
|
nowTime = now
|
||||||
// 设置时间指示器位置
|
// 设置时间指示器位置
|
||||||
store.setCursorLeft(store._currentTimestamp)
|
store.setCursorLeft(store._currentTimestamp)
|
||||||
if (store._currentTimestamp >= store.getTotalTime()) {
|
if (store._currentTimestamp > store.getTotalTime()) {
|
||||||
|
eventCallback()
|
||||||
this.stopAnimation()
|
this.stopAnimation()
|
||||||
this._status = "stop"
|
this._status = "stop"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user