功能修改20250327-05

src/views/home/cpns/FloatPanelCube.vue

@@ -46,7 +46,7 @@ const list = ref([
 	{ label: '是否占用', value: '', unit: '' },
 	{ label: '占用类型', value: [], unit: '' },
 	// { label: '人口密度', value: '', unit: '人/km²' },
-	{ label: '人口密度', value: '', unit: '人' },
+	{ label: '人口密度', value: '', unit: '人/km²' },
 	{ label: '河流上方', value: '', unit: '' },
 	{ label: '道路上方', value: '', unit: '' },
 ])
@@ -67,14 +67,21 @@ function getGridData() {
 			list.value[4].value = element.river ? '是' : '否'
 			list.value[5].value = element.road ? '是' : '否'
 			// list.value[3].value = +element.demographics * 100
+			debugger
 			list.value[3].value = element.demographics
 
-			// if(list.value[3].value > 99999) {
-			// 	list.value[3].value = Math.round(list.value[3].value / 10000)
-			// 	list.value[3].unit = '万人/km²'
-			// } else {
-			// 	list.value[3].unit = '人/km²'
-			// }
+			let beishu = 1
+			for (let i = 0; i < 24 - data.level; i++) {
+				beishu = beishu * 4
+			}
+			list.value[3].value = ((element.demographics * 100) / beishu).toFixed(0)
+			//
+			if (list.value[3].value > 9999) {
+				list.value[3].value = Math.round(list.value[3].value / 10000)
+				list.value[3].unit = '万人/km²'
+			} else {
+				list.value[3].unit = '人/km²'
+			}
 
 			const occupyTypes = {
 				clearZone: '净空区',

src/views/home/cpns/FloatPanelTsjs.vue

@@ -144,7 +144,7 @@ const baseInfo = ref({
 	name: '美团001',
 	seriesCode: '1581F5FHD23CT00D9F73',
 	regCode: 'UAS03647299',
-	manufacturer: '深圳市大疆创新科技有限公司',
+	manufacturer: '美团（北京三快科技有限公司）',
 	size: '小型',
 	type: '多桨或多轴航空器',
 	model: 'M3E',
@@ -154,10 +154,10 @@ const baseInfo = ref({
 	height: '110m',
 	velocity: '10m/s',
 	taskType: '城配物流',
-	updateTime: '2025-02-20 14:48',
+	updateTime: useDateFormat(new Date(), 'YYYY-MM-DD HH:mm'),
 
-	unit: '深圳市大疆创新科技有限公司',
-	manager: '深圳市大疆创新科技有限公司',
+	unit: '美团（北京三快科技有限公司）',
+	manager: '美团（北京三快科技有限公司）',
 	tel: '18000000000',
 })
 
@@ -226,7 +226,7 @@ onBeforeMount(() => {
 				baseInfo.value.battery = msg.Data.electricity
 				baseInfo.value.height = msg.Data.height.toFixed(2) + 'm'
 				baseInfo.value.velocity = msg.Data.speed.toFixed(2) + 'm/s'
-				baseInfo.value.updateTime = useDateFormat(Number(msg.Data.dataTime + '000'), 'YYYY-MM-DD HH:mm:ss')
+				baseInfo.value.updateTime = useDateFormat(Number(msg.Data.updateTime + '000'), 'YYYY-MM-DD HH:mm:ss')
 				currentLineId = msg.Data.travelId
 
 				const { electricityWarning, weatherWarning, collision, noFlyZone, clearZone, nearstAircraft, routeDeviate } =