gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、增加地图选择经纬度组件 2、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-05-31 13:55:10 +08:00
parent 1c73e36cb6
commit c833400397
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -27,10 +27,10 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.4" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.76" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.76" />
<PackageReference Include="Furion.Pure" Version="4.9.7.76" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.5" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.77" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.77" />
<PackageReference Include="Furion.Pure" Version="4.9.7.77" />
<PackageReference Include="Hardware.Info" Version="101.0.1.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />
@ -56,7 +56,7 @@
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.5" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1250" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1251" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

14
Web/package.json
View File

@ -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",

15
Web/src/views/system/log/logvis/component/visMap.vue
View File

@ -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 ?? [];

2
Web/src/views/system/log/logvis/index.vue
View File

@ -94,7 +94,7 @@
</vxe-grid>
</el-card>
<VisMap ref="mapRef" :title="state.title" />
<VisMap ref="mapRef" :title="state.title"/>
</div>
</template>