diff --git a/resources/java/app/application.yml b/resources/java/app/application.yml index 7753f07..41e4c70 100644 --- a/resources/java/app/application.yml +++ b/resources/java/app/application.yml @@ -1,7 +1,7 @@ server: host: 127.0.0.1 port: 8848 - path: C:\Users\MSI\AppData\Roaming\dzsp_shijingjun_offline_Y_save + path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save poi: global: enabled: false diff --git a/resources/java/app/yjearth.jar b/resources/java/app/yjearth.jar index 1ef674d..70327e7 100644 Binary files a/resources/java/app/yjearth.jar and b/resources/java/app/yjearth.jar differ diff --git a/src/renderer/src/api/ts/index.ts b/src/renderer/src/api/ts/index.ts index d7207b8..40cdfad 100644 --- a/src/renderer/src/api/ts/index.ts +++ b/src/renderer/src/api/ts/index.ts @@ -39,6 +39,12 @@ export const TsApi = { data }) }, + updateTsSource: async (data: any) => { + return await request.post({ + url: '/tsSource/update', + data + }) + }, ///tsSource/addModelSource addTsModelSource: async (data: any) => { return await request.post({ diff --git a/src/renderer/src/icons/svg/addEventTs.svg b/src/renderer/src/icons/svg/addEventTs.svg new file mode 100644 index 0000000..5b8bcb0 --- /dev/null +++ b/src/renderer/src/icons/svg/addEventTs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/views/TS/cabin.vue b/src/renderer/src/views/TS/cabin.vue index 412d0ba..e4511a8 100644 --- a/src/renderer/src/views/TS/cabin.vue +++ b/src/renderer/src/views/TS/cabin.vue @@ -186,7 +186,7 @@ const initTreeCallBack = () => { }); if ((window as any).earth_ts) { for (let i = 0; i < layers.length; i++) { - // initMapData(layers[i].sourceType, layers[i].detail, null) + initMapData(layers[i].sourceType, layers[i].detail, null) } } }) diff --git a/src/renderer/src/views/TS/components/MouseRight.vue b/src/renderer/src/views/TS/components/MouseRight.vue new file mode 100644 index 0000000..7e9b7b3 --- /dev/null +++ b/src/renderer/src/views/TS/components/MouseRight.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/renderer/src/views/TS/components/grid.vue b/src/renderer/src/views/TS/components/grid.vue index b314fec..843141a 100644 --- a/src/renderer/src/views/TS/components/grid.vue +++ b/src/renderer/src/views/TS/components/grid.vue @@ -137,7 +137,10 @@ onMounted(() => { for (let i = 0; i < doms.length; i++) { doms[i].style.lineHeight = "19px" }*/ - let panelHeight = window['tsObj']._Store.getDomElement(".chart", 0).getBoundingClientRect().height + let panel = window['tsObj']._Store.getDomElement(".chart", 0) + if (!panel) + return + let panelHeight = panel.getBoundingClientRect().height // 转为字符串并按 "." 分割 const [whole, decimalStr] = String(panelHeight).split('.'); diff --git a/src/renderer/src/views/TS/components/rightMenuTs.vue b/src/renderer/src/views/TS/components/rightMenuTs.vue index f2a348b..16b22bc 100644 --- a/src/renderer/src/views/TS/components/rightMenuTs.vue +++ b/src/renderer/src/views/TS/components/rightMenuTs.vue @@ -10,7 +10,7 @@ @click="itemClicks(item)" >
- +
{{ t(`rightMenu.${item.key}`) }} diff --git a/src/renderer/src/views/TS/components/rightOperate.ts b/src/renderer/src/views/TS/components/rightOperate.ts index 69e2380..286bcfd 100644 --- a/src/renderer/src/views/TS/components/rightOperate.ts +++ b/src/renderer/src/views/TS/components/rightOperate.ts @@ -128,6 +128,8 @@ export const useRightOperate = () => { } let detail = JSON.parse(res.data.detail) let mapParams = {...detail, ...res.data.params} + if (res.data.sourceType) + sourceType = res.data.sourceType initMapData(sourceType, mapParams, entity => { entity.flyTo() @@ -205,11 +207,12 @@ export const useRightOperate = () => { }, addEvent: { key: 'addEvent', + icon: 'addEventTs', callback: addEvent } }) return { - rightMenus + rightMenus, delNode, addEvent } } diff --git a/src/renderer/src/views/TS/edit.vue b/src/renderer/src/views/TS/edit.vue index a7f83cb..5555c72 100644 --- a/src/renderer/src/views/TS/edit.vue +++ b/src/renderer/src/views/TS/edit.vue @@ -39,6 +39,7 @@ + @@ -110,13 +111,14 @@