diff --git a/core/core-frontend/config/dev.ts b/core/core-frontend/config/dev.ts index 4fe7742..6bb8c2c 100644 --- a/core/core-frontend/config/dev.ts +++ b/core/core-frontend/config/dev.ts @@ -2,13 +2,13 @@ export default { server: { proxy: { '/api/f': { - target: 'http://192.168.1.58:8100', + target: 'http://192.168.1.20:8100', changeOrigin: true, rewrite: path => path.replace(/^\/api\/f/, 'de2api') }, // 使用 proxy 实例 '/api': { - target: 'http://192.168.1.58:8100', + target: 'http://192.168.1.20:8100', changeOrigin: true, rewrite: path => path.replace(/^\/api/, 'de2api') } diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index 750bb22..26ade8f 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -386,7 +386,8 @@ const boardMoveActive = computed(() => { 'symbolic-map', 'heat-map', 't-heatmap', - 'circle-packing' + 'circle-packing', + 'three-map' ] return element.value.isPlugin || CHARTS.includes(element.value.innerType) }) diff --git a/core/core-frontend/src/components/three-display/index.vue b/core/core-frontend/src/components/three-display/index.vue new file mode 100644 index 0000000..8539e24 --- /dev/null +++ b/core/core-frontend/src/components/three-display/index.vue @@ -0,0 +1,273 @@ + + + + + \ No newline at end of file diff --git a/core/core-frontend/src/components/visualization/SettingMenu.vue b/core/core-frontend/src/components/visualization/SettingMenu.vue index 33c51bd..9138e07 100644 --- a/core/core-frontend/src/components/visualization/SettingMenu.vue +++ b/core/core-frontend/src/components/visualization/SettingMenu.vue @@ -176,7 +176,8 @@ const state = reactive({ 'word-cloud', 'flow-map', 'bidirectional-bar', - 'symbolic-map' + 'symbolic-map', + 'three-map' ], linkageExcludeViewType: [ 'richTextView', @@ -187,7 +188,8 @@ const state = reactive({ 'word-cloud', 'flow-map', 'bidirectional-bar', - 'symbolic-map' + 'symbolic-map', + 'three-map' ], copyData: null, hyperlinksSetVisible: false, diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index 3a3ac3f..3020ec6 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -422,7 +422,7 @@ const openMessageLoading = cb => { }) } // 地图 -const mapChartTypes = ['bubble-map', 'flow-map', 'heat-map', 'map', 'symbolic-map'] +const mapChartTypes = ['bubble-map', 'flow-map', 'heat-map', 'map', 'symbolic-map','three-map'] const htmlToImage = () => { downLoading.value = mapChartTypes.includes(viewInfo.value.type) ? false : true useEmitt().emitter.emit('renderChart-' + viewInfo.value.id) diff --git a/core/core-frontend/src/components/visualization/ViewTrackBar.vue b/core/core-frontend/src/components/visualization/ViewTrackBar.vue index 3d1d5ce..1f4031c 100644 --- a/core/core-frontend/src/components/visualization/ViewTrackBar.vue +++ b/core/core-frontend/src/components/visualization/ViewTrackBar.vue @@ -1,26 +1,12 @@