diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts index 3b36710..4ead5dc 100644 --- a/src/renderer/src/I18n/zh-CN.ts +++ b/src/renderer/src/I18n/zh-CN.ts @@ -34,7 +34,8 @@ export default { addXlsx: '添加作战数据', showAttr: '查看属性', importHeader: '导入表头', - resetPerspective: '重置透视' + resetPerspective: '重置透视', + addEvent: '添加态势事件', }, iconTitle: { reset: '默认视角', diff --git a/src/renderer/src/I18n/zh-EN.ts b/src/renderer/src/I18n/zh-EN.ts index 741089d..97697d3 100644 --- a/src/renderer/src/I18n/zh-EN.ts +++ b/src/renderer/src/I18n/zh-EN.ts @@ -34,6 +34,8 @@ export default { showAttr: 'show Attribute', importHeader: 'import Header', resetPerspective: 'reset Perspective', + addEvent: 'add Event', + }, iconTitle: { reset: 'default view', diff --git a/src/renderer/src/I18n/zh-TW.ts b/src/renderer/src/I18n/zh-TW.ts index 58ab7c3..8a4cf1c 100644 --- a/src/renderer/src/I18n/zh-TW.ts +++ b/src/renderer/src/I18n/zh-TW.ts @@ -34,6 +34,7 @@ export default { showAttr: '查看屬性', importHeader: '導入表头', resetPerspective: '重置透視', + addEvent: '添加態勢事件', }, iconTitle: { reset: '默認視角', diff --git a/src/renderer/src/views/TS/cabin.vue b/src/renderer/src/views/TS/cabin.vue index 2cac2b1..87a9101 100644 --- a/src/renderer/src/views/TS/cabin.vue +++ b/src/renderer/src/views/TS/cabin.vue @@ -35,10 +35,16 @@ const treeObj = ref() //树形的实例 let zNodes: any = ref([])//树形结构数据 let nodes: any = ref([])//选中的node节点 let input2 = ref('') +let formData = new FormData() +formData.append('id', window["planId"]) + onMounted(() => { - let formData = new FormData() + // let data = [] - formData.append('id', window["planId"]) + + +}) +const initTreeCallBack = () => { TsApi.queryTsSource(formData).then(async res => { console.log('queryTsSource', res) if (res.code == 200) { @@ -47,57 +53,55 @@ onMounted(() => { } zNodes.value = res.data console.log("data", zNodes.value) - treeObj.value = $.fn.zTree.init($(`#treeDemos`), setting, zNodes.value) window.treeObj = treeObj.value } + + console.log("initTreeCallBack++++++++++++++++++++", zNodes.value) + let arr = zNodes.value + let layerTypes = [ + "arcgisWximagery", + "arcgisBlueImagery", + "ArcgisLWImagery", + "gdlwImagery", + "gdwxImagery", + "gdslImagery", + "layer", + ]; + let layers: any = [] + for (let i = 0; i < arr.length; i++) { + if (arr[i].sourceType === 'directory') { + continue + } + let detail = JSON.parse(arr[i].detail || '{}') + let params = JSON.parse(arr[i].params || '{}') + if (!detail.name) { + detail.name = arr[i].sourceName + } + if (!detail.id) { + detail.id = arr[i].id + } + if (layerTypes.includes(arr[i].sourceType)) { + layers.push( + { + sourceType: arr[i].sourceType, + detail: {...detail, ...params} + } + ) + } else { + initMapData(arr[i].sourceType, {...detail, ...params}) + } + } + + layers.sort((obj1, obj2) => { + return obj1.detail.layerIndex - obj2.detail.layerIndex; + }); + if (window.earth_ts) { + for (let i = 0; i < layers.length; i++) { + // initMapData(layers[i].sourceType, layers[i].detail, null) + } + } }) - -}) -const initTreeCallBack = () => { - let arr = zNodes.value - let layerTypes = [ - "arcgisWximagery", - "arcgisBlueImagery", - "ArcgisLWImagery", - "gdlwImagery", - "gdwxImagery", - "gdslImagery", - "layer", - ]; - let layers: any = [] - for (let i = 0; i < arr.length; i++) { - if (arr[i].sourceType === 'directory') { - continue - } - let detail = JSON.parse(arr[i].detail || '{}') - let params = JSON.parse(arr[i].params || '{}') - if (!detail.name) { - detail.name = arr[i].sourceName - } - if (!detail.id) { - detail.id = arr[i].id - } - if (layerTypes.includes(arr[i].sourceType)) { - layers.push( - { - sourceType: arr[i].sourceType, - detail: {...detail, ...params} - } - ) - } else { - initMapData(arr[i].sourceType, {...detail, ...params}) - } - } - - layers.sort((obj1, obj2) => { - return obj1.detail.layerIndex - obj2.detail.layerIndex; - }); - if (window.earth_ts) { - for (let i = 0; i < layers.length; i++) { - // initMapData(layers[i].sourceType, layers[i].detail, null) - } - } } const onDblClick = (event: MouseEvent, treeId: string, treeNode: any) => { let entityObject diff --git a/src/renderer/src/views/TS/components/rightMenuTs.vue b/src/renderer/src/views/TS/components/rightMenuTs.vue index 580ea6b..435c0e1 100644 --- a/src/renderer/src/views/TS/components/rightMenuTs.vue +++ b/src/renderer/src/views/TS/components/rightMenuTs.vue @@ -7,7 +7,7 @@
@@ -37,6 +37,10 @@ const {rightMenus} = useRightOperate() const menus: any = ref([]) //右侧菜单 const rightClickTreeNode: any = ref() const {itemClick} = useRightMenu() +const eventBus: any = inject('bus') +const itemClicks = (item) => { + itemClick(item, eventBus) +} const initMenus = (arr: any, treeNode: any) => { let rightMenu: any = [] console.log('rightMenu2222', rightMenu) diff --git a/src/renderer/src/views/TS/components/rightOperate.ts b/src/renderer/src/views/TS/components/rightOperate.ts index 2cdf823..b3cc9bb 100644 --- a/src/renderer/src/views/TS/components/rightOperate.ts +++ b/src/renderer/src/views/TS/components/rightOperate.ts @@ -1,5 +1,6 @@ import {$changeComponentPop} from "../../../utils/communication"; + export const useRightOperate = () => { const addDirectory = () => { $changeComponentPop('.adddirectoryBox', true) @@ -8,8 +9,8 @@ export const useRightOperate = () => { const addResource = () => { console.log("addResource") } - const addEvent = () => { - $(".newEvent")[0].style.display = "block" + const addEvent = (eventBus) => { + eventBus.emit('openAddEvent', true) } const rightMenus: any = reactive({ addDirectory: { diff --git a/src/renderer/src/views/TS/components/tsdirectory.vue b/src/renderer/src/views/TS/components/tsdirectory.vue index 34d6ef6..1d58a72 100644 --- a/src/renderer/src/views/TS/components/tsdirectory.vue +++ b/src/renderer/src/views/TS/components/tsdirectory.vue @@ -64,7 +64,7 @@ const submitForm = async (formEl: FormInstance | undefined) => { const add = throttle(async () => { let parentId = getKeyOfSelectedNode(window.treeObj, 'id') let fnone = getSelectedNode(window.treeObj) - addMapSource({id: new YJ.Tools().randomString(), type: 'directory', pId: parentId}, res => { + addMapSource('directory', parentId, {id: new YJ.Tools().randomString(), name: form.sourceName,}, res => { if (res.code == 0 || res.code == 200) { ElMessage({ message: '添加成功', @@ -135,7 +135,7 @@ const add = throttle(async () => { // } const cancel = () => { - $changeComponentPop('.adddirectory', false) + $changeComponentPop('.tsdirectory', false) form.sourceName = '图层' ruleForm.value?.resetFields() } diff --git a/src/renderer/src/views/TS/edit.vue b/src/renderer/src/views/TS/edit.vue index e0c531a..db4de14 100644 --- a/src/renderer/src/views/TS/edit.vue +++ b/src/renderer/src/views/TS/edit.vue @@ -83,6 +83,7 @@ const createEarth = async () => { setTimeout(() => { new YJ.Tools(window.earth_ts).flyHome() }, 1000) + console.log("createEarth++++++++++++++++++++") cabin.value.initTreeCallBack() } const closeSituationEdit = () => { diff --git a/src/renderer/src/views/TS/element.vue b/src/renderer/src/views/TS/element.vue index 1e975eb..1efac75 100644 --- a/src/renderer/src/views/TS/element.vue +++ b/src/renderer/src/views/TS/element.vue @@ -34,7 +34,7 @@
-
+
@@ -74,17 +74,17 @@ const defaultProps = { const activIndex = ref(0) const tabs = [ - {name: "人工模型", dataType: 'tree', key: "model"}, - {name: "军事标绘", dataType: 'tree', key: "graph"}, + {name: "人工模型", dataType: 'tree', key: "model",}, + {name: "军事标绘", dataType: 'tree', key: "graph", funName: 'DrawPoint',}, { name: "基础标绘", dataType: 'list', children: [ {name: "点", source_name: "点标注", funName: 'DrawPoint', type: "point"}, - {name: "线", source_name: "", funName: 'DrawPolyline', type: ""}, - {name: "面", source_name: "", funName: 'DrawPolygon', type: ""}, - {name: "圆", source_name: "", funName: 'DrawCircle', type: ""}, - {name: "攻击箭头", source_name: "", funName: 'DrawAttackArrow', type: ""}, - {name: "钳形箭头", source_name: "", funName: 'DrawPincerArrow', type: ""} + {name: "线", source_name: "线标注", funName: 'DrawPolyline', type: "line"}, + {name: "面", source_name: "面标注", funName: 'DrawPolygon', type: "panel"}, + {name: "圆", source_name: "圆标注", funName: 'DrawCircle', type: "circle"}, + {name: "攻击箭头", source_name: "攻击箭头", funName: 'DrawAttackArrow', type: "attackArrow"}, + {name: "钳形箭头", source_name: "钳形箭头", funName: 'DrawPincerArrow', type: "pincerArrow"} ] }, {name: "特效", dataType: 'list', children: [{name: "火焰"}]}, @@ -137,11 +137,18 @@ const getModelListByType = (id) => { if (activIndex.value == 0) { formData.append('modelTypeId', id) ModelApi.showModelByType(formData).then((res) => { + res.data.forEach(item => { + item.funName = 'DrawPoint' + item.type = 'model' + }) elementList.value = res.data }) } else { formData.append('militaryTypeId', id) GraphApi.showModelByType(formData).then((res) => { + res.data.forEach(item => { + item.funName = 'DrawPoint' + }) elementList.value = res.data }) } @@ -162,14 +169,40 @@ let getGraphTypeList = async () => { // 添加标绘 let addMarker = (item) => { let nodes = getSelectedNodes(window['treeObj']) - console.log("绘制" + item.name) + console.log("绘制", item) console.log("获取选中的节点", nodes) let id = new YJ.Tools().randomString() - let pId = nodes.length >= 1 ? nodes[0].id : -1 + let pId = -1 + if (nodes.length) { + pId = nodes[0].sourceType == 'directory' ? nodes[0].id : nodes[0].parentId + } + // let pId = nodes.length >= 1 ? nodes[0].id : -1 window.draw = new YJ.Draw[item.funName](earth_ts) window.draw.start((a, position) => { console.log(position) - addMapSource({id, type: item.type, name: item.source_name, position, pId}) + if (position != undefined) { + let obj = {id, name: item.source_name, position} + switch (item.type) { + case 'model': + obj.modelDataUrl = item.modelDataUrl + obj.name = item.modelName + break + case 'line': + case 'panel': + case 'attackArrow': + case 'pincerArrow': + delete obj.position + obj.positions = position + break + case 'circle': + obj.center = position.center + obj.radius = position.radius + break + } + addMapSource(item.type, pId, obj) + } + + }) } diff --git a/src/renderer/src/views/TS/entity.ts b/src/renderer/src/views/TS/entity.ts index 9b5c782..d9ec859 100644 --- a/src/renderer/src/views/TS/entity.ts +++ b/src/renderer/src/views/TS/entity.ts @@ -3,21 +3,32 @@ import {useTreeNode} from '@/views/components/tree/hooks/treeNode' const {cusAddNodes, getSelectedNode} = useTreeNode() -export function addMapSource(option, cb: any = null) { - console.log("添加到地球上", option) - let id = option.id || new YJ.Tools().randomString() - let name = option.name - let entityObject +export function initMapData(type, data) { let options - let baseURL = localStorage.getItem('ip') - switch (option.type) { + let entityObject + switch (type) { case 'point': - console.log({id, name, position: option.position}) - entityObject = new YJ.Obj.BillboardObject(window['earth_ts'], {id, name, position: option.position}) - console.log("添加dian") - break; + entityObject = new YJ.Obj.BillboardObject(window['earth_ts'], data) + break + case 'model': + entityObject = new YJ.Obj.Model(window['earth_ts'], data) + break + case 'line': + entityObject = new YJ.Obj.PolylineObject(window['earth_ts'], data) + break + case 'panel': + entityObject = new YJ.Obj.PolygonObject(window['earth_ts'], data) + break + case 'circle': + entityObject = new YJ.Obj.CircleObject(window['earth_ts'], data) + break + case 'attackArrow': + entityObject = new YJ.Obj.AttackArrowObject(window['earth_ts'], data) + break + case 'pincerArrow': + entityObject = new YJ.Obj.PincerArrowObject(window['earth_ts'], data) + break } - if (entityObject) { function getOptions() { let opt = structuredClone(entityObject.options) @@ -26,15 +37,59 @@ export function addMapSource(option, cb: any = null) { } options = getOptions() - } - console.log('options', options) + if (entityObject.options.id) { + (window as any)._entityMap.set(entityObject.options.id, entityObject) + } + return options + + } else return null +} + +export function addMapSource(type, pId, option, cb: any = null) { + console.log("添加到地球上", option) + let options + let baseURL = localStorage.getItem('ip') + /*switch (type) { + case 'point': + data = {id, name, position: option.position} + break; + case 'line': + case 'panel': + data = {id, name, positions: option.positions} + break + case 'circle': + data = {id, name, positions: option.positions} + + break + case 'attackArrow': + break + case 'pincerArrow': + break + case 'model': + data = { + id, + name, + position: option.position, + url: baseURL + option.modelDataUrl, + maximumScale: 1, + rotate: { + x: 0, + y: 0, + z: 0 + } + } + break + }*/ + options = initMapData(type, option) + + // 进数据库 let dbOption = { "id": option.id, - "sourceName": name, - "sourceType": option.type, + "sourceName": option.name, + "sourceType": type, "sourcePath": "", - "parentId": option.pId, + "parentId": pId, "treeIndex": 0, "isShow": 1, "detail": JSON.stringify(options) || '{}', @@ -46,20 +101,9 @@ export function addMapSource(option, cb: any = null) { console.log("addTsSource", res) cb && cb(res) // 上树 - cusAddNodes(window.treeObj, getSelectedNode(window.treeObj), [dbOption], true) + let selectedNode = window.treeObj.getNodeByParam('id', pId) + cusAddNodes(window.treeObj, selectedNode, [dbOption], true) }) } -export function initMapData(type, data) { - let entityObject - switch (type) { - case 'point': - console.log("ssssssss+++", window['earth_ts']) - entityObject = new YJ.Obj.BillboardObject(window['earth_ts'], data) - } - if (entityObject) { - if (entityObject.options.id) { - (window as any)._entityMap.set(entityObject.options.id, entityObject) - } - } -} + diff --git a/src/renderer/src/views/TS/newEvent.vue b/src/renderer/src/views/TS/newEvent.vue index e422030..5860d0e 100644 --- a/src/renderer/src/views/TS/newEvent.vue +++ b/src/renderer/src/views/TS/newEvent.vue @@ -114,9 +114,10 @@ const second = ref(0) const times = ref(0)//闪烁间隔 const numbers = ref(0)//闪烁次数 const isContainModelPosition = ref(true) +const eventBus: any = inject('bus') form['datetime'] = new Date(2000, 1, 1, 12, 0, 0) -const isShowPup = ref(true) +const isShowPup = ref(false) const eventTree: { children: ({ label: string } | { label: string })[]; id: string; label: string }[] = [ { id: "normal", @@ -142,6 +143,15 @@ const handleNodeClick = (data: Tree, node, TreeNode, event) => { currentKey.value = data.id; // data.id 为节点的唯一 key（需与 tree 的 node-key 对应） form.name = data.label } +eventBus.on('openAddEvent', (data, cb, type) => { + // selectCallback = cb + // addType.value = type + isShowPup.value = data + // if (data) { + // getModelList() + // getSetting() + // } +})