diff --git a/resources/java/app/yjearth.jar b/resources/java/app/yjearth.jar index 26f501e..0fb2f2e 100644 Binary files a/resources/java/app/yjearth.jar and b/resources/java/app/yjearth.jar differ diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts index 1296461..302d0c8 100644 --- a/src/renderer/src/I18n/zh-CN.ts +++ b/src/renderer/src/I18n/zh-CN.ts @@ -366,7 +366,7 @@ export default { operationalTime: "作战时间", enterTuiyan: "进入推演页面", ersanwei: "二三维模式", - back: "返回", + back: "返回到历史推演", exitTs: "退出方案库", save: "保存", cancel: "取消", diff --git a/src/renderer/src/I18n/zh-TW.ts b/src/renderer/src/I18n/zh-TW.ts index 2768a42..37c038d 100644 --- a/src/renderer/src/I18n/zh-TW.ts +++ b/src/renderer/src/I18n/zh-TW.ts @@ -48,10 +48,10 @@ export default { firstMenu: { situation: '態勢推演', measure: '測量庫', - tool: '工具库', - effect: '工具庫', + tool: '工具庫', + effect: '特效庫', bigData: '大數據', - modelLibrary: '模型库', + modelLibrary: '模型庫', onlinePictureSource: '在線圖源', analysis: '分析庫', militaryMark: '軍標庫', @@ -364,7 +364,7 @@ export default { operationalTime: "作戰時間", enterTuiyan: "進入推演頁面", ersanwei: "二三維模式", - back: "返回", + back: "返回到曆史推演", exitTs: "退出方案庫", save: "儲存", cancel: "取消", diff --git a/src/renderer/src/api/ts/index.ts b/src/renderer/src/api/ts/index.ts index 9eddf0b..087240f 100644 --- a/src/renderer/src/api/ts/index.ts +++ b/src/renderer/src/api/ts/index.ts @@ -46,6 +46,13 @@ export const TsApi = { data }) }, + //修改树层级 + updateTreeIndex: async (data: any) => { + return await request.post({ + url: `/tsSource/dragSource`, + data + }) + }, //树的隐藏显示 updateTreeShow: async (data: any) => { let datas = [] diff --git a/src/renderer/src/assets/iconfont/font_4587902_y4fhjyq8fxn.js b/src/renderer/src/assets/iconfont/font_4587902_y4fhjyq8fxn.js index d2ee403..d8d1ec7 100644 --- a/src/renderer/src/assets/iconfont/font_4587902_y4fhjyq8fxn.js +++ b/src/renderer/src/assets/iconfont/font_4587902_y4fhjyq8fxn.js @@ -1,6 +1,6 @@ (window._iconfont_svg_string_4587902 = '' + - ''+ + '' + '' + '' + "" + @@ -10,7 +10,7 @@ '' + '' + "" + - ''), + ''), (function (a) { var c = (c = document.getElementsByTagName("script"))[c.length - 1], l = c.getAttribute("data-injectcss"), @@ -39,33 +39,33 @@ var c, l = document.createElement("div"); (l.innerHTML = a._iconfont_svg_string_4587902), - (l = l.getElementsByTagName("svg")[0]) && - (l.setAttribute("aria-hidden", "true"), - (l.style.position = "absolute"), - (l.style.width = 0), - (l.style.height = 0), - (l.style.overflow = "hidden"), - // eslint-disable-next-line no-self-assign - (l = l), - (c = document.body).firstChild - ? F(l, c.firstChild) - : c.appendChild(l)); + (l = l.getElementsByTagName("svg")[0]) && + (l.setAttribute("aria-hidden", "true"), + (l.style.position = "absolute"), + (l.style.width = 0), + (l.style.height = 0), + (l.style.overflow = "hidden"), + // eslint-disable-next-line no-self-assign + (l = l), + (c = document.body).firstChild + ? F(l, c.firstChild) + : c.appendChild(l)); }), document.addEventListener ? ~["complete", "loaded", "interactive"].indexOf(document.readyState) ? setTimeout(i, 0) : ((t = function () { - document.removeEventListener("DOMContentLoaded", t, !1), i(); - }), + document.removeEventListener("DOMContentLoaded", t, !1), i(); + }), document.addEventListener("DOMContentLoaded", t, !1)) : document.attachEvent && - ((o = i), + ((o = i), (h = a.document), (s = !1), n(), (h.onreadystatechange = function () { "complete" == h.readyState && - ((h.onreadystatechange = null), e()); + ((h.onreadystatechange = null), e()); })); } diff --git a/src/renderer/src/views/TS/cabin.vue b/src/renderer/src/views/TS/cabin.vue index 9f9148b..0f7f7e8 100644 --- a/src/renderer/src/views/TS/cabin.vue +++ b/src/renderer/src/views/TS/cabin.vue @@ -156,22 +156,25 @@ const initTreeCallBack = () => { } } if (layerTypes.includes(arr[i].sourceType)) { + console.log(detail, params) if (!detail && !params) { detail = { id: arr[i].id, name: arr[i].sourceName, - isShow: arr[i].isShow + show: Boolean(arr[i].isShow) } } - layers.push( - { - sourceType: arr[i].sourceType, - detail: {...detail, ...params} - } - ) + let layer = { + sourceType: arr[i].sourceType, + detail: {...detail, ...params, layerIndex: layers.length + 1} + } + console.log(layer) + layers.push(layer) } else { console.log({...detail, ...params}) - initMapData(arr[i].sourceType, {...detail, ...params},) + let details = {...detail, ...params} + details.show = Boolean(arr[i].isShow) + initMapData(arr[i].sourceType, details) } } @@ -199,7 +202,7 @@ const initTreeCallBack = () => { if ((window as any).earth_ts) { for (let i = 0; i < layers.length; i++) { initMapData(layers[i].sourceType, layers[i].detail, (layer) => { - layer.show = Boolean(layers[i].isShow) + // layer.show = Boolean(layers[i].show) }) } } @@ -210,6 +213,48 @@ const onDblClick = (event: MouseEvent, treeId: string, treeNode: any) => { entityObject = (window as any)._entityMap.get(treeNode.id) entityObject.flyTo() } +/** + * 用于捕获节点拖拽操作结束的事件回调函数 + * @param event 事件对象 + * @param treeId 树形结构id + * @param treeNodes 被拖拽的节点 JSON 数据集合 + * @param targetNode 成为 treeNodes 拖拽结束的目标节点 JSON 数据对象 + * @param moveType + */ +const onDrop = async (event: DragEvent, + treeId: any, + treeNodes: any, + targetNode: any, + moveType: any) => { + const someNode: any = getSameLevel(window['treeObj'], treeNodes[0]) + const newNode = someNode.map((item: any) => { + let index = item.getIndex() + item.treeIndex = index + return { + ...item, + treeIndex: item.getIndex() + 1 + } + }) + const list = newNode.map((item: any) => { + return { + id: item.id, + treeIndex: item.treeIndex, + parentId: item.parentId || '' + } + }) + const res = await TsApi.updateTreeIndex(list) + if (res.code == 0 || res.code == 200) { + ElMessage({ + message: '操作成功', + type: 'success' + }) + } else { + ElMessage({ + message: '操作失败', + type: 'error' + }) + } +} const onClick = (event: MouseEvent, treeId: string, treeNode: any) => { console.log('selectNode', treeNode) @@ -422,7 +467,8 @@ const setting = { onRightClick: rightClick, onClick: onClick, onCheck: onCheck, - onDblClick: onDblClick + onDblClick: onDblClick, + onDrop: onDrop, /* onClick: this.onClick, onDblClick: this.onDblClick, diff --git a/src/renderer/src/views/TS/components/chart.vue b/src/renderer/src/views/TS/components/chart.vue index 9f2def9..c192b65 100644 --- a/src/renderer/src/views/TS/components/chart.vue +++ b/src/renderer/src/views/TS/components/chart.vue @@ -7,9 +7,9 @@ diff --git a/src/renderer/src/views/TS/components/timeScale.vue b/src/renderer/src/views/TS/components/timeScale.vue index ed9ecf9..9646bdd 100644 --- a/src/renderer/src/views/TS/components/timeScale.vue +++ b/src/renderer/src/views/TS/components/timeScale.vue @@ -56,6 +56,7 @@ let ticLabel = (val) => {