diff --git a/resources/java/app/yjearth.jar b/resources/java/app/yjearth.jar index 3d2938c..be4f4ba 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 40cdfad..9eddf0b 100644 --- a/src/renderer/src/api/ts/index.ts +++ b/src/renderer/src/api/ts/index.ts @@ -27,6 +27,7 @@ export const TsApi = { data }) }, + delPlan: async (data: any) => { return await request.post({ url: '/tsPlan/delete', @@ -45,6 +46,19 @@ export const TsApi = { data }) }, + //树的隐藏显示 + updateTreeShow: async (data: any) => { + let datas = [] + data.forEach(item => { + let obj = {id: item.id, show: item.isShow} + // @ts-ignore + datas.push(obj) + }) + return await request.post({ + url: `/tsSource/batchUpdateShowStatus`, + data: datas + }) + }, ///tsSource/addModelSource addTsModelSource: async (data: any) => { return await request.post({ diff --git a/src/renderer/src/views/TS/cabin.vue b/src/renderer/src/views/TS/cabin.vue index b0a016d..23cf2f8 100644 --- a/src/renderer/src/views/TS/cabin.vue +++ b/src/renderer/src/views/TS/cabin.vue @@ -157,7 +157,8 @@ const initTreeCallBack = () => { if (!detail && !params) { detail = { id: arr[i].id, - name: arr[i].sourceName + name: arr[i].sourceName, + isShow: arr[i].isShow } } layers.push( @@ -168,7 +169,7 @@ const initTreeCallBack = () => { ) } else { console.log({...detail, ...params}) - initMapData(arr[i].sourceType, {...detail, ...params}) + initMapData(arr[i].sourceType, {...detail, ...params},) } } @@ -195,7 +196,9 @@ 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, (layer) => { + layer.show = Boolean(layers[i].isShow) + }) } } }) @@ -232,7 +235,7 @@ const onClick = (event: MouseEvent, treeId: string, treeNode: any) => { * @param treeId * @param treeNode */ -const onCheck = (event: any, treeId: any, treeNode: any) => { +const onCheck = async (event: any, treeId: any, treeNode: any) => { console.log(treeNode, 'treeNode') let p_ids: any = [] let parentNode = treeNode.getParentNode(); @@ -262,7 +265,7 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { p_ids.push( { id: parentNode.id, - isShow: 0 + isShow: 0, } ) window['treeObj'].checkNode(parentNode, false, true); @@ -270,7 +273,7 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { p_ids.push( { id: parentNode.id, - isShow: 1 + isShow: 1, } ) } @@ -286,7 +289,7 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { function sourceStatus(node) { if (canCheckType.includes(node.sourceType)) { - ids.push({id: node.id, isShow: node.isShow ? 1 : 0}) + ids.push({id: node.id, isShow: node.isShow ? 1 : 0,}) console.log(node) let entityObject entityObject = (window as any)._entityMap.get(node.id) @@ -308,6 +311,18 @@ const onCheck = (event: any, treeId: any, treeNode: any) => { sourceStatus(treeNode) console.log("ids", ids) + const res = await TsApi.updateTreeShow(ids) + if (res.code == 0 || res.code == 200) { + ElMessage({ + message: '操作成功', + type: 'success' + }) + } else { + ElMessage({ + message: '操作失败', + type: 'error' + }) + } } const onMouseDown = (event: MouseEvent, treeId: string, treeNode: any) => { console.log("onMouseDown") diff --git a/src/renderer/src/views/TS/components/timeScale.vue b/src/renderer/src/views/TS/components/timeScale.vue index 2f428d9..e035cc4 100644 --- a/src/renderer/src/views/TS/components/timeScale.vue +++ b/src/renderer/src/views/TS/components/timeScale.vue @@ -1,6 +1,6 @@