From e1699c4851f6ca397cd0ad1ff63f32c737654836 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 02 Apr 2025 19:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Home/useUavHome/useUavHome.js | 350 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 228 insertions(+), 122 deletions(-)
diff --git a/src/views/Home/useUavHome/useUavHome.js b/src/views/Home/useUavHome/useUavHome.js
index 53a4123..3c8b93c 100644
--- a/src/views/Home/useUavHome/useUavHome.js
+++ b/src/views/Home/useUavHome/useUavHome.js
@@ -1,33 +1,51 @@
import * as Cesium from 'cesium';
-import data2 from '@/assets/images/home/homeRight/data2.png';
-import data1 from '@/assets/images/home/homeRight/data1.png';
-import MapPopUpBox from '@/views/Home/useUavHome/MapPopUpBox.vue';
+import aggregationImg from '@/assets/images/home/useUavHome/aggregation.png';
+import uavImg from '@/assets/images/home/useUavHome/uavImg.png';
+
+import eventImg from '@/assets/images/home/useEventOperate/event.png';
+
+import DevicePopUpBox from '@/views/Home/useUavHome/DevicePopUpBox.vue';
+import EventPopUpBox from '@/views/Home/useEventOperate/EventPopUpBox.vue';
+
import { render } from 'vue';
import { useStore } from 'vuex';
import { getCenterPoint } from '@/utils/cesium/mapUtil';
import cesiumOperation from '@/utils/cesium-tsa';
-import { HeadingPitchRange } from 'cesium';
-import { getDeviceRegion, getDeviceRegionCount } from '@/api/home/aggregation';
-import _ from 'lodash';
-import { getDeviceInfoNum } from '@/api/home/machineNest';
-import { getTotalJobNum } from '@/api/home';
+import { getDeviceRegion, getDeviceRegionCount, getEventDetails, getMapEvents } from '@/api/home/aggregation';
/**
* 机巢聚合功能
*/
-export const useUavHome = () => {
+export const useUavHome = type => {
const { flyTo } = cesiumOperation();
+ const singleImg = type === 'device' ? uavImg : eventImg;
+ const mergeImg = type === 'device' ? aggregationImg : aggregationImg;
+ const MapPopUpBox = type === 'device' ? DevicePopUpBox : EventPopUpBox;
+ const styleTransform = type === 'device' ? 'translateY(-50%)' : 'translate(-50%,-110%)';
+
let scalingJudgment = [
- { name: '县', splashedList: [], gJson: null, show: false, value: [0, 48651], height: 31753 },
- { name: '市', splashedList: [], gJson: null, show: false, value: [48651, 314863], height: 257731 },
- { name: '省', splashedList: [], gJson: null, show: false, value: [314863, 3796280000], height: 1987280 },
+ { name: '县', splashedList: [], gJson: null, show: false, outline: {}, value: [0, 48651], height: 31753 },
+ { name: '市', splashedList: [], gJson: null, show: false, outline: {}, value: [48651, 314863], height: 257731 },
+ {
+ name: '省',
+ splashedList: [],
+ gJson: null,
+ show: false,
+ outline: {},
+ value: [314863, 3796280000],
+ height: 1987280,
+ },
];
let viewer = null;
let active = null;
let handler = null;
let positionC3 = null;
let currentEntity = null;
+
+ const store = useStore();
+ const userAreaCode = computed(() => store.state.user.userInfo.detail.areaCode);
+ const selectedAreaCode = computed(() => store.state.user.selectedAreaCode);
const listenerHeight = () => {
determineScaling();
viewer.camera.moveEnd.addEventListener(determineScaling);
@@ -46,11 +64,8 @@
active = item.name;
removeEntities();
removeLabel();
- if (item.gJson && item.name !== '县') {
- aggregation(item);
- } else {
- splashed(item);
- }
+ item.gJson ? aggregation(item) : splashed(item);
+ renderOutline(item);
break;
}
}
@@ -68,83 +83,134 @@
return [provinceCode, cityCode, code];
}
- const store = useStore();
- const selectedAreaCode = computed(() => store.state.user.selectedAreaCode);
-
- function getDeviceCount() {
- return getDeviceRegionCount().then(res => {
- return res?.data?.data || [];
+ function getDeviceCount(areaCode) {
+ return getDeviceRegionCount({ areaCode }).then(res => {
+ return (res?.data?.data || []).map(i=>({...i,type:'deviceAggregation'}));
});
}
- function getDeviceList() {
- return getDeviceRegion().then(res => {
- return res?.data?.data || [];
+ function getDeviceList(areaCode) {
+ return getDeviceRegion({ areaCode }).then(res => {
+ return (res?.data?.data || []).map(i =>({...i,type}));
});
}
+
+ let eventList = []
+ function processChildren(childrens) {
+ return (childrens || []).map(item => {
+ const arr = processChildren(item.childrens);
+ if (item.data){
+ eventList = eventList.concat(item.data)
+ }
+ const returnObj = {
+ total_device_count: item.number,
+ region_code: item.id,
+ region_name: item.name,
+ type:'eventAggregation'
+ };
+ if (arr.length !== 0) {
+ returnObj.childrens = arr;
+ }
+ return returnObj;
+ });
+ }
+
+ function getMapEventCount(areaCode) {
+ return getMapEvents({ areaCode }).then(res => {
+ return processChildren(res?.data?.data?.childrens || []);
+ });
+ }
+ function getEventDetailsFun(areaCode){
+ return getEventDetails({areaCode}).then(res => {
+ console.log(res.data.data,'getEventDetailsFun');
+ });
+ }
+
+ const findFun = (featItem, numItem) => Number(featItem.region_code.slice(0, 6)) === numItem.properties.adcode;
+ const { VITE_APP_BASE } = import.meta.env;
+ const defaultDir = `${VITE_APP_BASE}public/geoJson/100000/`;
+
+ const getFiler = async url => {
+ const gJson = await import(/* @vite-ignore */ url);
+ return JSON.parse(JSON.stringify(gJson));
+ };
+ const getOutLine = async (jsonPathPre, hierarchy) => {
+ const parentGJson = await getFiler(`${defaultDir}${jsonPathPre}/index.json`);
+ let features = parentGJson.features.find(
+ item => item.properties.adcode === Number(hierarchy[hierarchy.length - 1])
+ );
+ return { type: 'FeatureCollection', features: [features] };
+ };
+
+ const injectData = (gJson, dataList) => {
+ return {
+ ...gJson,
+ features: gJson.features.map(item => ({ ...item, data: dataList.find(item1 => findFun(item1, item)) })),
+ };
+ };
+
+ const initMapData = async areaCode => {
+ if (!areaCode) return;
+ const list = type === 'device' ? await getDeviceCount(areaCode) : await getMapEventCount(areaCode);
+ const splashedList = type === 'device'
+ ? await getDeviceList(areaCode)
+ : eventList.map(i=>({eventId:i.id,latitude:Number(i.latitude),longitude:Number(i.longitude),type:'event'}))
+ console.log(list, 'list');
+ console.log(splashedList, 'splashedList');
+ const hierarchy = convertToHierarchy(areaCode.slice(0, 6));
+ const jsonPath = hierarchy.join('/');
+ const jsonPathPre = hierarchy.slice(0, hierarchy.length - 1).join('/');
+ scalingJudgment = scalingJudgment.map(item => ({ ...item, show: true }));
+ scalingJudgment[0].gJson = null;
+ scalingJudgment[0].splashedList = splashedList;
+ active = null;
+ console.log(hierarchy);
+
+ // 省
+ if (hierarchy.length === 1) {
+ const gJson1 = await getFiler(`${defaultDir}${jsonPath}/indexDistrict.json`);
+ const gJson2 = await getFiler(`${defaultDir}${jsonPath}/index.json`);
+ scalingJudgment[1].gJson = {
+ ...gJson1,
+ features: gJson1.features.map(item => ({
+ ...item,
+ data: list.flatMap(item => item.childrens || []).find(item1 => findFun(item1, item)),
+ })),
+ };
+ scalingJudgment[2].gJson = injectData(gJson2, list);
+ const { lng, lat } = getCenterPoint(gJson2.features.map(item => item.properties.center));
+ flyTo({ longitude: lng, latitude: lat }, 0, scalingJudgment[2].height);
+ }
+ // 市
+ if (hierarchy.length === 2) {
+ scalingJudgment[2].gJson = null;
+ scalingJudgment[2].show = false;
+ const gJson1 = await getFiler(`${defaultDir}${jsonPath}/index.json`);
+ scalingJudgment[1].gJson = injectData(gJson1, list);
+ const center = getCenterPoint(gJson1.features.map(item => item.properties.center));
+ flyTo({ longitude: center.lng, latitude: center.lat }, 0, scalingJudgment[1].height);
+ }
+ // 区县
+ if (hierarchy.length === 3) {
+ scalingJudgment[1].gJson = null;
+ scalingJudgment[1].show = false;
+ scalingJudgment[2].gJson = null;
+ scalingJudgment[2].show = false;
+ const outlineGJson = await getOutLine(jsonPathPre, hierarchy);
+ const center = outlineGJson.features[0].properties.center;
+ flyTo({ longitude: center[0], latitude: center[1] }, 0, scalingJudgment[0].height);
+ }
+ // 轮廓
+ const outlineGJson = await getOutLine(jsonPathPre, hierarchy);
+ scalingJudgment.forEach(item => item.show && (item.outline = outlineGJson));
+ };
watch(
selectedAreaCode,
async (newValue, oldValue) => {
- if (newValue) {
- const list = await getDeviceCount();
- const splashedList = await getDeviceList();
- console.log(list);
- console.log(splashedList);
- const code = newValue.slice(0, 6);
- const hierarchy = convertToHierarchy(code);
- const jsonPath = hierarchy.join('/');
- const { VITE_APP_BASE } = import.meta.env;
- const defaultDir = `${VITE_APP_BASE}public/geoJson/100000/`;
- scalingJudgment = scalingJudgment.map(item => ({ ...item, show: true }));
- if (hierarchy.length === 1) {
- scalingJudgment[0].gJson = null;
- scalingJudgment[0].splashedList = splashedList;
- const gJson1 = await import(/* @vite-ignore */ `${defaultDir}${jsonPath}/indexDistrict.json`);
- const gJson1Copy = JSON.parse(JSON.stringify(gJson1));
- const gJson2 = await import(/* @vite-ignore */ `${defaultDir}${jsonPath}/index.json`);
- const gJson2Copy = JSON.parse(JSON.stringify(gJson2));
- const findFun = (item1, item) => Number(item1.region_code.slice(0, 6)) === item.properties.adcode;
- scalingJudgment[1].gJson = {
- ...gJson1Copy,
- features: gJson1Copy.features.map(item => ({
- ...item,
- data: list.flatMap(item => item.childrens || []).find(item1 => findFun(item1, item)),
- })),
- };
- scalingJudgment[2].gJson = {
- ...gJson2Copy,
- features: gJson2Copy.features.map(item => ({ ...item, data: list.find(item1 => findFun(item1, item)) })),
- };
- const { lng, lat } = getCenterPoint(gJson2Copy.features.map(item => item.properties.center));
- flyTo({ longitude: lng, latitude: lat }, 0, scalingJudgment[2].height);
- }
- if (hierarchy.length === 2) {
- const gJson1 = await import(/* @vite-ignore */ `${defaultDir}${jsonPath}/index.json`);
- scalingJudgment[0].gJson = null;
- scalingJudgment[1].gJson = JSON.parse(JSON.stringify(gJson1));
- scalingJudgment[2].gJson = null;
- scalingJudgment[2].show = false;
- const center = getCenterPoint(scalingJudgment[1].gJson.features.map(item => item.properties.center));
- flyTo({ longitude: center.lng, latitude: center.lat }, 0, scalingJudgment[1].height);
- }
- if (hierarchy.length === 3) {
- const gJson = await import(/* @vite-ignore */ `${defaultDir}${jsonPath.slice(0, -7)}/index.json`);
- const gJson1 = gJson.features.find(
- item => item.properties.adcode === Number(hierarchy[hierarchy.length - 1])
- );
- // scalingJudgment[0].gJson = { type: "FeatureCollection", features: [gJson1] }
- scalingJudgment[0].gJson = null;
- scalingJudgment[1].gJson = null;
- scalingJudgment[1].show = false;
- scalingJudgment[2].gJson = null;
- scalingJudgment[2].show = false;
- const center = gJson1.properties.center;
- flyTo({ longitude: center[0], latitude: center[1] }, 0, scalingJudgment[0].height);
- }
- }
+ initMapData(newValue);
},
- { immediate: true, deep: true }
+ { deep: true }
);
//散点机巢
@@ -155,7 +221,7 @@
label: {
// 随机整数
text: item.nickname,
- font: '14pt monospace',
+ font: '12pt Source Han Sans CN',
fillColor: Cesium.Color.WHITE,
outlineColor: Cesium.Color.BLACK,
outlineWidth: 2,
@@ -164,7 +230,7 @@
pixelOffset: new Cesium.Cartesian2(0, -9),
},
billboard: {
- image: new Cesium.ConstantProperty(data1),
+ image: new Cesium.ConstantProperty(singleImg),
width: 24,
height: 24,
},
@@ -176,6 +242,33 @@
});
});
}
+
+ // 渲染轮廓
+ const renderOutline = item => {
+ item.outline &&
+ Cesium.GeoJsonDataSource.load(item.outline).then(dataSource => {
+ viewer.dataSources.add(dataSource);
+ const entities = dataSource.entities.values;
+ entities.forEach(entity => {
+ // 隐藏多边形填充
+ entity.polygon.material = Cesium.Color.TRANSPARENT;
+ entity.polygon.outline = false; // 关闭原生轮廓
+ // 创建独立折线作为轮廓
+ const positions = entity.polygon.hierarchy.getValue().positions;
+ viewer.entities.add({
+ polyline: {
+ positions: positions,
+ width: 5, // 直接设置宽度
+ material: new Cesium.PolylineGlowMaterialProperty({
+ glowPower: 0.5,
+ color: Cesium.Color.AQUA,
+ }),
+ clampToGround: true, // 贴地显示
+ },
+ });
+ });
+ });
+ };
// 聚合机巢
const aggregation = (item, flyTo) => {
@@ -191,12 +284,10 @@
if (!feature.position) return;
const position = Cesium.Cartesian3.fromDegrees(feature.position[0], feature.position[1]);
viewer.entities.add({
- id: feature.id,
position: position,
label: {
- // 随机整数
- text: feature.name + feature.data.total_device_count,
- font: '14pt monospace',
+ text: feature.name,
+ font: '14pt Source Han Sans CN',
fillColor: Cesium.Color.WHITE,
outlineColor: Cesium.Color.BLACK,
outlineWidth: 2,
@@ -204,10 +295,21 @@
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
pixelOffset: new Cesium.Cartesian2(0, -9),
},
+ });
+ viewer.entities.add({
+ id: feature.id,
+ position: position,
+ label: {
+ text: feature.data.total_device_count.toString(),
+ font: '12pt Source Han Sans CN',
+ fillColor: Cesium.Color.BLACK,
+ style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+ eyeOffset: new Cesium.Cartesian3(0, 0, -10), // 让label "浮" 在广告牌前面
+ },
billboard: {
- image: new Cesium.ConstantProperty(data2),
- width: 24,
- height: 24,
+ image: new Cesium.ConstantProperty(mergeImg),
+ width: 35,
+ height: 35,
},
properties: {
id: feature.id,
@@ -217,6 +319,7 @@
},
});
});
+
// 加载新的 GeoJSON 数据
Cesium.GeoJsonDataSource.load(item.gJson).then(dataSource => {
viewer.dataSources.add(dataSource);
@@ -228,17 +331,17 @@
Cesium.Color.YELLOW.withAlpha(0) // 透明填充
);
entity.polygon.outline = new Cesium.ConstantProperty(true); // 显示边框
- entity.polygon.outlineColor = new Cesium.ConstantProperty(Cesium.Color.YELLOW); // 黑色边框
+ entity.polygon.outlineColor = new Cesium.ConstantProperty(Cesium.Color.AQUAMARINE);
});
flyTo &&
- viewer.flyTo(dataSource, {
- offset: new Cesium.HeadingPitchRange(
- 0, // heading: 0 (朝向不变)
- Cesium.Math.toRadians(-90), // pitch: -90° (垂直向下)
- 0 // range: 0 (默认距离)
- ),
- duration: 0.5,
- });
+ viewer.flyTo(dataSource, {
+ offset: new Cesium.HeadingPitchRange(
+ 0, // heading: 0 (朝向不变)
+ Cesium.Math.toRadians(-90), // pitch: -90° (垂直向下)
+ 0 // range: 0 (默认距离)
+ ),
+ duration: 0.5,
+ });
});
};
@@ -248,7 +351,7 @@
const tooltipContainer = document.createElement('div');
tooltipContainer.id = 'mapPopUpBox';
tooltipContainer.style.position = 'absolute';
- tooltipContainer.style.transform = 'translateY(-50%)';
+ tooltipContainer.style.transform = styleTransform;
tooltipContainer.style.pointerEvents = 'none';
document.querySelector('.page-index').append(tooltipContainer);
render(vNode, tooltipContainer);
@@ -256,12 +359,10 @@
};
// 弹框位置刷新
- const labelBox = () => {
+ const labelBoxRender = () => {
let dom = document.querySelector('#mapPopUpBox');
if (!dom) {
- const data = { ...currentEntity.requestData, ...currentEntity.customData };
- console.log(data);
- dom = getLabelDom(data);
+ dom = getLabelDom(currentEntity.properties.customData._value.data);
}
const screenPosition = viewer.scene.cartesianToCanvasCoordinates(positionC3);
if (screenPosition) {
@@ -280,21 +381,23 @@
positionC3 = entity?.position?._value;
if (!positionC3) return;
removeLabel();
- const customData = entity.properties.customData._value.data
- console.log(customData);
- if (customData.device_sn){
- // todo
- return
+ const customData = entity.properties.customData._value.data;
+
+ switch (customData.type) {
+ case 'deviceAggregation':
+ viewer.scene.postRender.addEventListener(labelBoxRender);
+ break;
+ case 'device':
+ store.commit('setSingleUavHome', { id: '123' });
+ break;
+ case 'eventAggregation':
+ break;
+ case 'event':
+ viewer.scene.postRender.addEventListener(labelBoxRender);
+ break;
+ default:
+ break;
}
- const areaCode = customData.region_code;
- const res = await getDeviceInfoNum({ areaCode });
- const resJob = await getTotalJobNum({ areaCode })
- currentEntity = {
- ...entity,
- requestData: {...res.data.data,jobNum:resJob.data.data},
- customData: entity.properties.customData._value.data
- };
- viewer.scene.postRender.addEventListener(labelBox);
}
};
@@ -312,7 +415,7 @@
};
// 移除弹框标签
const removeLabel = () => {
- viewer.scene.postRender.removeEventListener(labelBox);
+ viewer.scene.postRender.removeEventListener(labelBoxRender);
removeDom();
};
@@ -327,13 +430,16 @@
active = null;
handler = null;
positionC3 = null;
+ currentEntity = null;
};
const init = () => {
+ initMapData(selectedAreaCode.value || userAreaCode.value);
viewer = window.$viewer;
handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas);
handler.setInputAction(singleMachineEvent, Cesium.ScreenSpaceEventType.LEFT_CLICK);
listenerHeight();
};
+ onBeforeUnmount(() => {});
// onMounted(() => {
// nextTick(() => {
// viewer = window.$viewer;
--
Gitblit v1.9.3