From c833400397df2b83e849e9803a4cb6c1ee2857ac Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Sat, 31 May 2025 13:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=80=89=E6=8B=A9=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=202=E3=80=81=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj | 10 +++++----- Web/package.json | 14 +++++++------- .../views/system/log/logvis/component/visMap.vue | 15 +++++++++++++-- Web/src/views/system/log/logvis/index.vue | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 6ec553c6..06abb355 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -27,10 +27,10 @@ - - - - + + + + @@ -56,7 +56,7 @@ - + diff --git a/Web/package.json b/Web/package.json index b6a52890..d319e2cb 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2025.05.29", + "lastBuildTime": "2025.05.31", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -80,8 +80,8 @@ "vue-signature-pad": "^3.0.2", "vue3-flag-icons": "^0.0.3", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.6.12", - "vxe-table": "^4.13.31", + "vxe-pc-ui": "^4.6.13", + "vxe-table": "^4.13.32", "xe-utils": "^3.7.4", "xlsx-js-style": "^1.2.0" }, @@ -89,7 +89,7 @@ "@iconify/vue": "^5.0.0", "@plugin-web-update-notification/vite": "^2.0.0", "@types/lodash-es": "^4.17.12", - "@types/node": "^22.15.24", + "@types/node": "^22.15.29", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", "@typescript-eslint/eslint-plugin": "^8.33.0", @@ -97,15 +97,15 @@ "@vitejs/plugin-vue": "^5.2.4", "@vitejs/plugin-vue-jsx": "^4.2.0", "@vue/compiler-sfc": "^3.5.16", - "code-inspector-plugin": "^0.20.11", - "eslint": "^9.27.0", + "code-inspector-plugin": "^0.20.12", + "eslint": "^9.28.0", "eslint-plugin-vue": "^10.1.0", "globals": "^16.2.0", "less": "^4.3.0", "openapi-ts-request": "^1.5.0", "prettier": "^3.5.3", "rollup-plugin-visualizer": "^6.0.1", - "sass": "^1.89.0", + "sass": "^1.89.1", "terser": "^5.40.0", "typescript": "^5.8.3", "vite": "^6.3.5", diff --git a/Web/src/views/system/log/logvis/component/visMap.vue b/Web/src/views/system/log/logvis/component/visMap.vue index 052486bb..946d6f12 100644 --- a/Web/src/views/system/log/logvis/component/visMap.vue +++ b/Web/src/views/system/log/logvis/component/visMap.vue @@ -26,14 +26,17 @@ import { Heatmap as HeatmapLayer, Tile as TileLayer } from 'ol/layer'; import Feature from 'ol/Feature'; import { Geometry, Point } from 'ol/geom'; import VectorSource from 'ol/source/Vector'; +import { transform } from 'ol/proj'; import gcoord from 'gcoord'; import { getAPI } from '/@/utils/axios-utils'; import { SysLogVisApi } from '/@/api-services/api'; +const emits = defineEmits(['pickupCoord']); const props = defineProps({ title: String, + isPickupCoord: Boolean, }); const state = reactive({ isShowDialog: false, @@ -102,6 +105,13 @@ const initMap = () => { zoom: 4, // 初始缩放级别 }), }); + + // 拾取经纬度坐标 + map.on('singleclick', function (e) { + let coordinate = transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'); + emits('pickupCoord', coordinate); + if (props.isPickupCoord) state.isShowDialog = false; + }); }; // 打开弹窗 @@ -112,12 +122,13 @@ const openDialog = () => { nextTick(() => { initMap(); - loadVidLog(); + // 拾取经纬度坐标模式不加载日志数据 + if (!props.isPickupCoord) loadVidLog(); }); } }; -// 加载热力图-访问数据 +// 加载热力图-访问日志数据 const loadVidLog = async () => { var res = await getAPI(SysLogVisApi).apiSysLogVisListGet(); var pts = res.data.result ?? []; diff --git a/Web/src/views/system/log/logvis/index.vue b/Web/src/views/system/log/logvis/index.vue index ab8b6935..dc39b9fd 100644 --- a/Web/src/views/system/log/logvis/index.vue +++ b/Web/src/views/system/log/logvis/index.vue @@ -94,7 +94,7 @@ - +