From e52e85ce368849a5f20fb8ba0ed7909d31b668bd Mon Sep 17 00:00:00 2001 From: takeshita Date: Fri, 28 Nov 2025 18:12:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ts=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/api/photo/index.ts | 3 ++- src/renderer/src/views/TS/deduction.vue | 3 ++- src/renderer/src/views/TS/list.vue | 1 + .../components/setPup/components/graphLabelManage.vue | 6 ++++-- .../headers/components/setPup/components/modelManage.vue | 6 ++++-- .../headers/components/setPup/components/photoManage.vue | 4 +++- .../src/views/components/leftSide/leftSideSecond.vue | 1 - src/renderer/src/views/components/propertyBox/graph.vue | 1 + 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/renderer/src/api/photo/index.ts b/src/renderer/src/api/photo/index.ts index 829a74e..1573eb3 100644 --- a/src/renderer/src/api/photo/index.ts +++ b/src/renderer/src/api/photo/index.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import request from '@/axios/request' //图标库 export const PhotoApi = { @@ -44,7 +45,7 @@ export const PhotoApi = { }) }, //图标类型列表 - modelTypeList: async (data: any) => { + modelTypeList: async (data?: any) => { return await request.get({ url: `/iconLibrary/iconTypeTree`, params: data, diff --git a/src/renderer/src/views/TS/deduction.vue b/src/renderer/src/views/TS/deduction.vue index 46fd81c..1610d3a 100644 --- a/src/renderer/src/views/TS/deduction.vue +++ b/src/renderer/src/views/TS/deduction.vue @@ -84,6 +84,7 @@ diff --git a/src/renderer/src/views/components/leftSide/leftSideFirst.vue b/src/renderer/src/views/components/leftSide/leftSideFirst.vue index 35d97f5..d3799d9 100644 --- a/src/renderer/src/views/components/leftSide/leftSideFirst.vue +++ b/src/renderer/src/views/components/leftSide/leftSideFirst.vue @@ -2,9 +2,10 @@
-
-
+ +
diff --git a/src/renderer/src/views/components/propertyBox/ViewShed.vue b/src/renderer/src/views/components/propertyBox/ViewShed.vue index cfdf2ee..81a58d9 100644 --- a/src/renderer/src/views/components/propertyBox/ViewShed.vue +++ b/src/renderer/src/views/components/propertyBox/ViewShed.vue @@ -90,7 +90,7 @@
- + diff --git a/src/renderer/src/views/components/propertyBox/attackArrow.vue b/src/renderer/src/views/components/propertyBox/attackArrow.vue index a2c5924..f4fec57 100644 --- a/src/renderer/src/views/components/propertyBox/attackArrow.vue +++ b/src/renderer/src/views/components/propertyBox/attackArrow.vue @@ -147,7 +147,7 @@
- + @@ -401,4 +401,15 @@ defineExpose({ }) - \ No newline at end of file + \ No newline at end of file diff --git a/src/renderer/src/views/components/propertyBox/attribute.vue b/src/renderer/src/views/components/propertyBox/attribute.vue index da935bc..c615427 100644 --- a/src/renderer/src/views/components/propertyBox/attribute.vue +++ b/src/renderer/src/views/components/propertyBox/attribute.vue @@ -47,15 +47,15 @@
{{ item.url }}
- - +
- - + +
@@ -69,7 +69,7 @@
{{ t('general.编辑内容') }} - + @@ -244,7 +244,7 @@
{{ t('general.编辑内容') }} -
@@ -388,8 +388,8 @@ const cameraSelect = ({page, limit}) => { if (res.code === 0 || res.code === 200) { if (res.data) { cameraParams.value.total = res.data.total + cameraList.value = res.data.records if (res.data.records && res.data.records.length > 0) { - cameraList.value = res.data.records for (let i = 0; i < cameraList.value.length; i++) { cameraList.value[i].checked = false for (let j = 0; j < props.entityOptions.attributeCamera.length; j++) { @@ -724,8 +724,8 @@ const changeAttributeCamera = (e) => { .YJ-custom-base-dialog > .content .attribute-content-vr .table .tr .td:nth-child(1), .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .th:nth-child(1), .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .td:nth-child(1) { - width: 164px; - flex: 0 0 164px; + width: 150px; + flex: 0 0 150px; } .YJ-custom-base-dialog > .content .attribute-content-link .table .tr .th:nth-child(2), @@ -744,21 +744,21 @@ const changeAttributeCamera = (e) => { .YJ-custom-base-dialog > .content .attribute-content-vr .table .tr .td:nth-child(3), .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .th:nth-child(3), .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .td:nth-child(3) { - flex: 0 0 150px; - width: 150px; + flex: 0 0 175px; + width: 175px; justify-content: center; } -.YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .th:nth-child(3), -.YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .td:nth-child(3), -.YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .th:nth-child(3), -.YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .td:nth-child(3), -.YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .th:nth-child(3), -.YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .td:nth-child(3) { - flex: 0 0 190px; - width: 190px; - justify-content: center; -} +// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .th:nth-child(3), +// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .td:nth-child(3), +// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .th:nth-child(3), +// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .td:nth-child(3), +// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .th:nth-child(3), +// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .td:nth-child(3) { +// flex: 0 0 190px; +// width: 190px; +// justify-content: center; +// } .YJ-custom-base-dialog > .content .attribute-content-link .table .tr .td .input-group .input, .YJ-custom-base-dialog > .content .attribute-content-vr .table .tr .td .input-group .input, diff --git a/src/renderer/src/views/components/propertyBox/billboardObject.vue b/src/renderer/src/views/components/propertyBox/billboardObject.vue index c58fe61..8750cc4 100644 --- a/src/renderer/src/views/components/propertyBox/billboardObject.vue +++ b/src/renderer/src/views/components/propertyBox/billboardObject.vue @@ -3,147 +3,197 @@ :closeCallback="closeCallback"> @@ -375,6 +425,31 @@ const { cusUpdateNode, getSelectedNodes, cusRemoveNode } = useTreeNode() const baseDialog: any = ref(null) const eventBus: any = inject('bus') +const name_map: any = ref([]) +const name_map1: any = ref([]) +const name_map2: any = ref([ + { + epsg: 'EPSG:32601', + name: 'WGS84 通用横轴墨卡托投影' + }, + { + epsg: 'EPSG:4534', + name: '2000 坐标 3 度不带代号' + }, + { + epsg: 'EPSG:4513', + name: '2000 坐标 3 度带代号' + }, + { + epsg: 'EPSG:4502', + name: '2000 坐标 6 度不带代号' + }, + { + epsg: 'EPSG:4491', + name: '2000 坐标 6 度带代号' + } +]) + const epsg_map = ref([ { name: 'WGS 84 / UTM zone 3N', @@ -390,6 +465,10 @@ for (const [key, value] of window.earth.proj.epsg_map) { } epsg_map.value = array +let tool = new YJ.Tools(window.earth) +name_map.value = Array.from(tool.name_map.values()) +name_map1.value = name_map.value.splice(0, 2) + const format1 = ref(true) const format2 = ref(false) const format3 = ref(false) @@ -434,6 +513,9 @@ const x = ref() const y = ref() const z = ref() const coordinate = ref('EPSG:4326') +const isHotGroupOpen: any = ref(true) +const isHotGroupOpen2: any = ref(false) +const showPosiType: any = ref(false) const heightMode = ref(0) const labelColorRef = ref(null) const sourceType = ref('') @@ -454,6 +536,13 @@ const open = async (id, type) => { baseDialog.value?.open() await nextTick() + let data = name_map1.value.filter((item) => item.epsg === coordinate.value) + showPosiType.value = data.length + if (data.length) { + isHotGroupOpen.value = true + } else { + isHotGroupOpen2.value = true + } let labelColorPicker = new window.YJColorPicker({ el: labelColorRef.value, size: 'mini', //颜色box类型 @@ -519,6 +608,11 @@ const closeCallback = () => { eventBus?.emit('destroyComponent') } +const toggleGroup = (type: string) => { + if (type === 'hot') isHotGroupOpen.value = !isHotGroupOpen.value + if (type === 'ty') isHotGroupOpen2.value = !isHotGroupOpen2.value +} + const changeName = (e) => { entityOptions.value.labelText = e.target.value } @@ -771,7 +865,7 @@ defineExpose({ } ::v-deep>.content { - width: 590px; + width: 600px; .title1 { width: 46%; @@ -802,7 +896,7 @@ defineExpose({ .billboard-object.dialog-en { ::v-deep>.content { - width: 690px; + width: 660px; .title1 { width: 40%; diff --git a/src/renderer/src/views/components/propertyBox/circleDiffuse.vue b/src/renderer/src/views/components/propertyBox/circleDiffuse.vue index 2c984a8..9dc8a27 100644 --- a/src/renderer/src/views/components/propertyBox/circleDiffuse.vue +++ b/src/renderer/src/views/components/propertyBox/circleDiffuse.vue @@ -103,7 +103,7 @@
- + diff --git a/src/renderer/src/views/components/propertyBox/curvelineObject.vue b/src/renderer/src/views/components/propertyBox/curvelineObject.vue index 3797927..4a5f54b 100644 --- a/src/renderer/src/views/components/propertyBox/curvelineObject.vue +++ b/src/renderer/src/views/components/propertyBox/curvelineObject.vue @@ -59,13 +59,13 @@
线段缓冲 - +
缓冲宽度
- + m
@@ -190,7 +190,7 @@
- + @@ -383,7 +383,7 @@ const open = async (id, type) => { const heightModeChange = (val) => { that.heightMode = heightMode.value // @ts-ignore - if(heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') { + if (heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') { entityOptions.value.extend = false } } @@ -425,8 +425,8 @@ const changeWordsName = (val) => { const lineTypechange = () => { } -const lineExtendchange = (e)=>{ - if(e.target.checked) { +const lineExtendchange = (e) => { + if (e.target.checked) { heightMode.value = 2 } } @@ -554,4 +554,14 @@ defineExpose({ } } } +.polyline.dialog-en { + ::v-deep>.content { + .attribute-content-link .table .tr .td.operation button, + .attribute-content-vr .table .tr .td.operation button, + .attribute-content-rtmp .table .tr .td.operation button { + width: 76px !important; + flex: 0 0 76px !important; + } + } +} \ No newline at end of file diff --git a/src/renderer/src/views/components/propertyBox/explosion.vue b/src/renderer/src/views/components/propertyBox/explosion.vue index 0a3a3ab..db40481 100644 --- a/src/renderer/src/views/components/propertyBox/explosion.vue +++ b/src/renderer/src/views/components/propertyBox/explosion.vue @@ -56,7 +56,7 @@
- + diff --git a/src/renderer/src/views/components/propertyBox/flat.vue b/src/renderer/src/views/components/propertyBox/flat.vue index c826e19..5567587 100644 --- a/src/renderer/src/views/components/propertyBox/flat.vue +++ b/src/renderer/src/views/components/propertyBox/flat.vue @@ -36,7 +36,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/flyLine.vue b/src/renderer/src/views/components/propertyBox/flyLine.vue index 9e94e7a..ee92e96 100644 --- a/src/renderer/src/views/components/propertyBox/flyLine.vue +++ b/src/renderer/src/views/components/propertyBox/flyLine.vue @@ -76,7 +76,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/graphObject.vue b/src/renderer/src/views/components/propertyBox/graphObject.vue index 7aed28d..6ce760c 100644 --- a/src/renderer/src/views/components/propertyBox/graphObject.vue +++ b/src/renderer/src/views/components/propertyBox/graphObject.vue @@ -194,7 +194,7 @@ - + diff --git a/src/renderer/src/views/components/propertyBox/graphSetting.vue b/src/renderer/src/views/components/propertyBox/graphSetting.vue index d06fa09..b6808b1 100644 --- a/src/renderer/src/views/components/propertyBox/graphSetting.vue +++ b/src/renderer/src/views/components/propertyBox/graphSetting.vue @@ -74,7 +74,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/groundText.vue b/src/renderer/src/views/components/propertyBox/groundText.vue index e428f5a..f2264a3 100644 --- a/src/renderer/src/views/components/propertyBox/groundText.vue +++ b/src/renderer/src/views/components/propertyBox/groundText.vue @@ -1,6 +1,5 @@ diff --git a/src/renderer/src/views/components/propertyBox/imagePop.vue b/src/renderer/src/views/components/propertyBox/imagePop.vue index 48449d8..4d61ad0 100644 --- a/src/renderer/src/views/components/propertyBox/imagePop.vue +++ b/src/renderer/src/views/components/propertyBox/imagePop.vue @@ -32,7 +32,7 @@
- + diff --git a/src/renderer/src/views/components/propertyBox/labelStyle.vue b/src/renderer/src/views/components/propertyBox/labelStyle.vue index e12ecee..9ae19b0 100644 --- a/src/renderer/src/views/components/propertyBox/labelStyle.vue +++ b/src/renderer/src/views/components/propertyBox/labelStyle.vue @@ -38,7 +38,7 @@
- 字体样式 + 字体风格
@@ -63,7 +63,7 @@
-
+
@@ -124,13 +124,6 @@
-
diff --git a/src/renderer/src/views/components/propertyBox/layer.vue b/src/renderer/src/views/components/propertyBox/layer.vue index 033cae8..1fe7c46 100644 --- a/src/renderer/src/views/components/propertyBox/layer.vue +++ b/src/renderer/src/views/components/propertyBox/layer.vue @@ -31,7 +31,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/modelObject.vue b/src/renderer/src/views/components/propertyBox/modelObject.vue index a0a8d05..edfa448 100644 --- a/src/renderer/src/views/components/propertyBox/modelObject.vue +++ b/src/renderer/src/views/components/propertyBox/modelObject.vue @@ -524,7 +524,7 @@
- + diff --git a/src/renderer/src/views/components/propertyBox/modelSetting.vue b/src/renderer/src/views/components/propertyBox/modelSetting.vue index 14a0a45..b3b5971 100644 --- a/src/renderer/src/views/components/propertyBox/modelSetting.vue +++ b/src/renderer/src/views/components/propertyBox/modelSetting.vue @@ -74,7 +74,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/particleEffects.vue b/src/renderer/src/views/components/propertyBox/particleEffects.vue index 337c0f5..b186329 100644 --- a/src/renderer/src/views/components/propertyBox/particleEffects.vue +++ b/src/renderer/src/views/components/propertyBox/particleEffects.vue @@ -183,7 +183,7 @@
- + diff --git a/src/renderer/src/views/components/propertyBox/polygonObject.vue b/src/renderer/src/views/components/propertyBox/polygonObject.vue index 25d8c22..9352831 100644 --- a/src/renderer/src/views/components/propertyBox/polygonObject.vue +++ b/src/renderer/src/views/components/propertyBox/polygonObject.vue @@ -1,5 +1,6 @@ @@ -186,10 +192,10 @@ let originalOptions: any let that: any const open = async (id: any, type: any) => { - if(type && type === 'rectangle') { + if (type && type === 'rectangle') { title.value = '矩形' } - else if(type && type === 'rendezvous') { + else if (type && type === 'rendezvous') { title.value = '集结地' } that = window.earth.entityMap.get(id) @@ -270,7 +276,7 @@ const heightConfirm = () => { } } const inputDblclick = async (event, i, anme) => { - if(heightMode.value == 2) { + if (heightMode.value == 2) { return } activeTd.value = { @@ -333,31 +339,31 @@ const close = () => { const remove = () => { close() ElMessageBox.confirm('此操作将永久删除节点及所有子节点, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(async () => { - let node = window.treeObj.getNodeByParam('id', that.options.id, null) - let source_ids = cusRemoveNode(window.treeObj, [node]) - const res = await TreeApi.removeDirectory({ ids: source_ids }) - if (res.code == 0 || res.code == 200) { - ElMessage({ - message: '删除成功', - type: 'success' - }) - that.remove() + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + .then(async () => { + let node = window.treeObj.getNodeByParam('id', that.options.id, null) + let source_ids = cusRemoveNode(window.treeObj, [node]) + const res = await TreeApi.removeDirectory({ ids: source_ids }) + if (res.code == 0 || res.code == 200) { + ElMessage({ + message: '删除成功', + type: 'success' + }) + that.remove() (window as any)._entityMap.delete(source_ids[0]) - } else { - ElMessage({ - message: res.msg || '删除失败', - type: 'error' - }) - } - }) - .catch(() => { - // 用户点击取消，不执行任何操作 - }) + } else { + ElMessage({ + message: res.msg || '删除失败', + type: 'error' + }) + } + }) + .catch(() => { + // 用户点击取消，不执行任何操作 + }) } watch( @@ -376,4 +382,16 @@ defineExpose({ }) - + diff --git a/src/renderer/src/views/components/propertyBox/polyhedronObject.vue b/src/renderer/src/views/components/propertyBox/polyhedronObject.vue index 8c13bbf..fd351ef 100644 --- a/src/renderer/src/views/components/propertyBox/polyhedronObject.vue +++ b/src/renderer/src/views/components/propertyBox/polyhedronObject.vue @@ -64,7 +64,7 @@
- + diff --git a/src/renderer/src/views/components/propertyBox/polylineObject.vue b/src/renderer/src/views/components/propertyBox/polylineObject.vue index 35616c9..038376b 100644 --- a/src/renderer/src/views/components/propertyBox/polylineObject.vue +++ b/src/renderer/src/views/components/propertyBox/polylineObject.vue @@ -75,8 +75,8 @@
缓冲宽度
- + m
@@ -111,13 +111,13 @@
-
-
- - - - - +
+ + + + + +
高度模式 @@ -176,12 +176,14 @@
- - +
+ + +
- - -
+
+ +
@@ -200,7 +202,7 @@ - + @@ -391,7 +393,7 @@ const open = async (id: any, type) => { const heightModeChange = (val) => { that.heightMode = heightMode.value // @ts-ignore - if(heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') { + if (heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') { entityOptions.value.extend = false } } @@ -433,8 +435,8 @@ const changeWordsName = (val) => { } const lineTypechange = () => { } -const lineExtendchange = (e)=>{ - if(e.target.checked) { +const lineExtendchange = (e) => { + if (e.target.checked) { heightMode.value = 2 } } @@ -562,4 +564,16 @@ defineExpose({ } } } + +.polyline.dialog-en { + ::v-deep>.content { + + .attribute-content-link .table .tr .td.operation button, + .attribute-content-vr .table .tr .td.operation button, + .attribute-content-rtmp .table .tr .td.operation button { + width: 76px !important; + flex: 0 0 76px !important; + } + } +} diff --git a/src/renderer/src/views/components/propertyBox/radarScan.vue b/src/renderer/src/views/components/propertyBox/radarScan.vue index ceecef7..a33713e 100644 --- a/src/renderer/src/views/components/propertyBox/radarScan.vue +++ b/src/renderer/src/views/components/propertyBox/radarScan.vue @@ -66,7 +66,7 @@ - + diff --git a/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue b/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue index c30b960..21551fd 100644 --- a/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue +++ b/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue @@ -82,7 +82,7 @@ - + diff --git a/src/renderer/src/views/components/propertyBox/richText.vue b/src/renderer/src/views/components/propertyBox/richText.vue index 4978f2b..f3d6d71 100644 --- a/src/renderer/src/views/components/propertyBox/richText.vue +++ b/src/renderer/src/views/components/propertyBox/richText.vue @@ -24,7 +24,7 @@ import { GisApi } from '@/api/gisApi' const props = defineProps({ }); -const host = window.location.host +const host = localStorage.getItem('ip') const visible = ref(false) const baseDialog:any = ref(null); const eventBus:any = inject("bus"); diff --git a/src/renderer/src/views/components/propertyBox/standText.vue b/src/renderer/src/views/components/propertyBox/standText.vue index a744a00..977e32f 100644 --- a/src/renderer/src/views/components/propertyBox/standText.vue +++ b/src/renderer/src/views/components/propertyBox/standText.vue @@ -39,7 +39,7 @@ - + diff --git a/src/renderer/src/views/components/propertyBox/terrain.vue b/src/renderer/src/views/components/propertyBox/terrain.vue index 1e4ec0b..15665a2 100644 --- a/src/renderer/src/views/components/propertyBox/terrain.vue +++ b/src/renderer/src/views/components/propertyBox/terrain.vue @@ -14,7 +14,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/tileset.vue b/src/renderer/src/views/components/propertyBox/tileset.vue index 6e9cfb6..9d87d72 100644 --- a/src/renderer/src/views/components/propertyBox/tileset.vue +++ b/src/renderer/src/views/components/propertyBox/tileset.vue @@ -49,7 +49,7 @@ - + diff --git a/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue b/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue index 3f27958..96f2ff7 100644 --- a/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue +++ b/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue @@ -233,7 +233,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/vector.vue b/src/renderer/src/views/components/propertyBox/vector.vue index b3e9f14..fb024fb 100644 --- a/src/renderer/src/views/components/propertyBox/vector.vue +++ b/src/renderer/src/views/components/propertyBox/vector.vue @@ -21,7 +21,7 @@ diff --git a/src/renderer/src/views/components/propertyBox/vectorAttr.vue b/src/renderer/src/views/components/propertyBox/vectorAttr.vue index 29227bb..fe19fc8 100644 --- a/src/renderer/src/views/components/propertyBox/vectorAttr.vue +++ b/src/renderer/src/views/components/propertyBox/vectorAttr.vue @@ -12,18 +12,18 @@
@@ -113,9 +113,10 @@ const maxPageNum: any = ref(0) const filterData: any = ref([]) const title = ref('') const closeCallback = () => { - entityOptions.value.originalOptions = structuredClone(originalOptions) - entityOptions.value.reset() - eventBus.emit('destroyComponent') + // entityOptions.value.originalOptions = structuredClone(originalOptions) + // console.log('entityOptions--------------', entityOptions.value) + // entityOptions.value.reset() + // eventBus.emit('destroyComponent') } const getKeys = () => { keyData.value = [] @@ -140,9 +141,8 @@ let features const open = async (id: any) => { // that = window.earth.entityMap.get(id) node = window.treeObj.getNodeByParam('id', id, null) - entityOptions.value.field = JSON.parse(node.params).field that = getThat(node) - console.log(node, that, entityOptions.field, 'yyyyyyyyyyyyyy') + entityOptions.value.field = that.field if (that.options.id === id) { features = that.geojson.features } else { @@ -157,7 +157,7 @@ const open = async (id: any) => { let spliceData = arrSplice(arr, pageSize.value) maxPageNum.value = spliceData.length tableData.value = spliceData[pageNum.value - 1] - title.value = node.sourceName + title.value = node.title || node.sourceName getKeys() originalOptions = structuredClone(that.options) entityOptions.value = that @@ -227,8 +227,8 @@ const getTableList = ({ page, limit }) => { tableData.value = spliceData[pageNum.value - 1] } const changeFieId = async (e) => { - console.log(e, 'eeeeeeeee') - let data = JSON.parse(node.params) + let fNode = window.treeObj.getNodeByParam('id', that.options.id, null) + let data = JSON.parse(fNode.params) data.field = e let params2 = { id: data.id, diff --git a/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue b/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue index aa2115a..ff52f13 100644 --- a/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue +++ b/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue @@ -98,7 +98,7 @@ - + diff --git a/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue b/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue index 8017a7f..f6b9098 100644 --- a/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue +++ b/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue @@ -31,12 +31,16 @@ 材质样式
- + {{ item.name }}
@@ -99,25 +103,25 @@ const material = ref([ name: '纯色墙', value: '纯色墙', key: 0, - icon: 'icon-wall' + icon: '../sdk/custom/img/icon-wall.png', }, { name: '上升墙', value: '上升墙', key: 1, - icon: 'icon-wall-gradient' + icon: '../sdk/custom/img/icon-wall-gradient.png' }, { name: '箭头墙', value: '箭头墙', key: 2, - icon: 'icon-wall-arrow' + icon: '../sdk/img/material/arrow.png' }, { name: '警戒墙', value: '警戒墙', key: 3, - icon: 'icon-wall-warn' + icon: '../sdk/img/material/warn.png' } ]) eventBus.on("openStandTextAdd", () => { diff --git a/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts b/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts index 3f8e516..09f398e 100644 --- a/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts +++ b/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts @@ -98,6 +98,7 @@ export const useRightOperate = () => { params.params = JSON.stringify(params.params) cusAddNodes(window.treeObj, params.parentId, [params]) let entityObject = renderVector(params, true); + entityObject.flyTo(); (window as any)._entityMap.set(id, entityObject) } else if (["geojson"].includes(sourceType)) { let baseURL = localStorage.getItem('ip') @@ -113,6 +114,8 @@ export const useRightOperate = () => { width: 1, color: "rgb(239, 6, 6, 1)", } + }, (entity:any) => { + entity?.flyTo() }) } else { // 获取最后一个点的位置 @@ -683,7 +686,9 @@ export const useRightOperate = () => { }) for (let i = 0; i < res.data.length; i++) { let item = res.data[i] - initMapData(type, JSON.parse(item.params), null) + initMapData(type, JSON.parse(item.params), (entity: any) => { + entity.flyTo() + }) } cusAddNodes(window.treeObj, parentId, res.data) } diff --git a/src/renderer/src/views/components/tree/hooks/treeNode.ts b/src/renderer/src/views/components/tree/hooks/treeNode.ts index bb33d8a..9d525d4 100644 --- a/src/renderer/src/views/components/tree/hooks/treeNode.ts +++ b/src/renderer/src/views/components/tree/hooks/treeNode.ts @@ -595,6 +595,7 @@ export const useTreeNode = () => { node.sourceName = sourceName; node.oldname = sourceName; node.params = params; + delete node.title window.treeObj.updateNode(node); } diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index 0443a65..df00208 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -1,13 +1,7 @@