diff --git a/src/views/demo/system/achievement/AchievementManage/index.vue b/src/views/demo/system/achievement/AchievementManage/index.vue
index 36e88948..a706fc33 100644
--- a/src/views/demo/system/achievement/AchievementManage/index.vue
+++ b/src/views/demo/system/achievement/AchievementManage/index.vue
@@ -288,11 +288,11 @@
type: 'FeatureCollection',
features: [],
};
- // let lngList: any = [];
- // let latList: any = [];
+ let lngList: any = [];
+ let latList: any = [];
tasklist?.forEach((item, index) => {
- // lngList.push(parseFloat(item.gemo.x));
- // latList.push(parseFloat(item.gemo.y));
+ lngList.push(parseFloat(item.gemo.x));
+ latList.push(parseFloat(item.gemo.y));
let feature: any = {
type: 'Feature',
geometry: {
@@ -311,12 +311,11 @@
});
// 确定中心点和zoom等级
- // let result = calculateCenterAndZoom(lngList, latList);
- // console.log(result);
+ let result = calculateCenterAndZoom(lngList, latList);
// 航飞图片-图层
mapboxComponentRef.value.AchievementManageRaster(
taskLayerGeoJson,
- [118.30207505530701, 35.30123435040745],
+ result.center,
7.848587811931849,
);
}
@@ -353,7 +352,7 @@
const deltaLng = maxLng - minLng;
const deltaLat = maxLat - minLat;
// 估算合适的缩放级别
- let zoom = 14 - Math.log2((Math.max(deltaLng, deltaLat) * 360) / 360); // 360度为地球一圈
+ let zoom = 14 - Math.log2(Math.max(deltaLng, deltaLat)); // 直接使用最大偏移量
zoom = Math.max(8, Math.min(15, zoom)); // 确保缩放级别在合理范围内
return {
center: [centerLng, centerLat],
diff --git a/src/views/demo/system/achievement/Display/index.vue b/src/views/demo/system/achievement/Display/index.vue
new file mode 100644
index 00000000..a54fb2bb
--- /dev/null
+++ b/src/views/demo/system/achievement/Display/index.vue
@@ -0,0 +1,389 @@
+
+
+
+
+
+
diff --git a/src/views/demo/system/achievement/Display/util.ts b/src/views/demo/system/achievement/Display/util.ts
new file mode 100644
index 00000000..f7ec097f
--- /dev/null
+++ b/src/views/demo/system/achievement/Display/util.ts
@@ -0,0 +1,19 @@
+import type { TreeProps } from 'ant-design-vue';
+
+export const prepareTreeData: TreeProps['treeData'] = [
+ {
+ title: '矢量图层',
+ key: '1',
+ children: [],
+ },
+ {
+ title: '历史影像',
+ key: '2',
+ children: [],
+ },
+ {
+ title: '航飞图片',
+ key: '3',
+ children: [],
+ },
+];
\ No newline at end of file
diff --git a/src/views/demo/system/achievement/GeoTiffManager/util.ts b/src/views/demo/system/achievement/GeoTiffManager/util.ts
index 1b5fd4a0..a07f17e0 100644
--- a/src/views/demo/system/achievement/GeoTiffManager/util.ts
+++ b/src/views/demo/system/achievement/GeoTiffManager/util.ts
@@ -6,6 +6,11 @@ export const columns = [
dataIndex: 'id',
ifShow: false,
},
+ {
+ title: '影像名称',
+ dataIndex: 'layerName',
+ width: 100,
+ },
{
title: '数据表名',
dataIndex: 'dataTable',
diff --git a/src/views/demo/system/achievement/index.vue b/src/views/demo/system/achievement/index.vue
index d7f13201..a3360964 100644
--- a/src/views/demo/system/achievement/index.vue
+++ b/src/views/demo/system/achievement/index.vue
@@ -9,6 +9,9 @@
+
+
+
diff --git a/src/views/demo/system/geoservermanagement/clound/mapComponent.vue b/src/views/demo/system/geoservermanagement/clound/mapComponent.vue
index 32e33127..1236a826 100644
--- a/src/views/demo/system/geoservermanagement/clound/mapComponent.vue
+++ b/src/views/demo/system/geoservermanagement/clound/mapComponent.vue
@@ -182,6 +182,7 @@
// 县区边界
handlerDealStreet('GeoserverManagementRaster');
handlerDealCountry('GeoserverManagementRaster');
+ // handlerLocation([118.0676058205292, 35.443435], zoom);
handlerLocation(lngLat, zoom);
let format =
@@ -197,6 +198,8 @@
'&styles=&bbox={bbox-epsg-3857}&width=256&height=256&srs=' +
chooseRow.spatialRef +
format,
+ // 'http://60.213.14.14:8060/geoserver/feixian/wms?service=WMS&version=1.1.0&request=GetMap&layers=feixian:yingxiang&styles=&bbox={bbox-epsg-3857}&width=256&height=256&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE',
+ // 'http://221.2.83.254:9007/geoserver/ksp/wms?service=WMS&version=1.1.0&request=GetMap&layers=ksp:linqubianyaqi&styles=&bbox={bbox-epsg-3857}&width=256&height=256&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE&cql_filter=is_del%20=0',
// 'http://192.168.10.131:8080/geoserver/my_workspace/wms?service=WMS&version=1.1.0&request=GetMap&layers=my_workspace:parse_shpinfo_text3&styles=&bbox=118.32113719388846%2C35.64528587987562%2C118.89333296872105%2C36.17725393199594&width=256&height=256&srs=EPSG:4326&format=image/png&TRANSPARENT=TRUE&exceptions=application%2Fvnd.ogc.se_inimage',
// 'http://175.27.168.120:8080/geoserver/yinanxian/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&FORMAT=image%2Fjpeg&TRANSPARENT=true&LAYERS=yinanxian%3Ayingxiang_01&exceptions=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A4548&STYLES=&WIDTH=529&HEIGHT=769&BBOX=607366.3276808303%2C3919435.438766631%2C612405.5241015075%2C3926765.179014889',
],