IOT/web-Iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

地图航向角修复 绑定设备界面 负责人的显示

Browse Source
This commit is contained in:
mmc
2026-09-11 15:58:41 +08:00
parent 4a47177e47
commit 65aa966606
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/Map.jsx
View File

@@ -1468,6 +1468,15 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
// ============================== // ==============================
// 航向角：优先用设备自带 heading/yaw/angle，否则按设备索引模拟角度（演示旋转）
// ==============================
//let headingDeg = Number(device?.heading ?? device?.yaw ?? device?.headingAngle ?? device?.angle);
//if (!isFinite(headingDeg)) {
// headingDeg = (index * 36) % 360;
//}
//const headingRotation = Cesium.Math.toRadians(-10);
// entity 获取 / 创建 // entity 获取 / 创建
// ============================== // ==============================
@@ -1487,7 +1496,8 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
height, height,
verticalOrigin: window.Cesium.VerticalOrigin.BOTTOM, verticalOrigin: window.Cesium.VerticalOrigin.BOTTOM,
disableDepthTestDistance: Number.POSITIVE_INFINITY, disableDepthTestDistance: Number.POSITIVE_INFINITY,
show: !isIOT show: !isIOT,
//rotation: headingRotation,
}, },
label: { label: {
@@ -1518,6 +1528,7 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
entity.billboard.image = image; entity.billboard.image = image;
entity.billboard.width = width; entity.billboard.width = width;
entity.billboard.height = height; entity.billboard.height = height;
//entity.billboard.rotation = headingRotation;
entity.label.text = device.name || ""; entity.label.text = device.name || "";
@@ -1902,7 +1913,7 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine,
if (realtimePosition?.heading !== undefined && !isNaN(Number(realtimePosition.heading))) { if (realtimePosition?.heading !== undefined && !isNaN(Number(realtimePosition.heading))) {
let headingDeg = Number(realtimePosition.heading); let headingDeg = Number(realtimePosition.heading);
rotation = Cesium.Math.toRadians(headingDeg); rotation = Cesium.Math.toRadians(-headingDeg);

2
src/components/SystemSetting/SmartDeviceManagement.tsx
View File

@@ -358,7 +358,7 @@ export default function SmartDeviceManagement({
{ {
title: t('systemSetting.leader'), width: 150, key: 'userName', title: t('systemSetting.leader'), width: 150, key: 'userName',
render: (_, record: any) => { render: (_, record: any) => {
const user = allUserOptions.find(u => u.userId == record.userId); const user = allUserOptions.find(u => u.userId == record.tenantId);
return user ? (user.nickName || user.userName) : <Text type="secondary">{t('systemSetting.s02')}</Text>; return user ? (user.nickName || user.userName) : <Text type="secondary">{t('systemSetting.s02')}</Text>;
}, },
}, },