From 4bd78503fea111fd37b4581116dab3416abb6a3e Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Thu, 27 Nov 2025 22:43:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=9D=E8=B7=AF=E6=99=BA=E7=AE=A1=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B4=B4=E5=9B=BE=20=E5=9C=B0=E5=9B=BE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=20=E8=AE=A9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=9A=84=E5=AE=9E=E4=BD=935=E7=A7=92=E8=B7=B3?= =?UTF-8?q?=E5=8A=A8=E6=95=88=E6=9E=9C=20=E5=9C=B0=E5=9B=BE=E7=81=BE?= =?UTF-8?q?=E5=AE=B3=E8=93=9D=E8=89=B2=E8=99=9A=E7=BA=BF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BA=A2=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/images/区县应急点.png | Bin 1698 -> 11256 bytes .../assets/images/市应急点.png | Bin 2117 -> 11438 bytes .../components/LeftPanel/ForceDispatch.vue | 2 +- .../components/LeftPanel/ForcePreset.vue | 22 +- .../RightPanel/CollaborationInfo.vue | 55 +- .../RightPanel/VideoMonitorItem.vue | 8 + .../components/shared/CollapsiblePanel.vue | 103 +- .../composables/useDisasterData.js | 8 +- .../composables/useDualMapCompare.js | 14 +- .../composables/useMapMarkers.js | 130 +- .../composables/useRangeCircle.js | 14 + .../3DSituationalAwarenessRefactor/index.vue | 1089 +++++++++-------- 12 files changed, 842 insertions(+), 603 deletions(-) diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/assets/images/区县应急点.png b/packages/screen/src/views/3DSituationalAwarenessRefactor/assets/images/区县应急点.png index a3e7adcc583edcbc721bf69338b59d98cbdb9005..38b8450248243e94db666e43d74ef4721773a254 100644 GIT binary patch literal 11256 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 sLO8smNb99p0b%707*qoM6N<$g7=XqzyJUM diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/assets/images/市应急点.png b/packages/screen/src/views/3DSituationalAwarenessRefactor/assets/images/市应急点.png index 5de08c3cffc5a659bfbc5860c13d4d5014c810ef..bc2dd15b9f4ddc866ffea4f405edf113b5ce593b 100644 GIT binary patch literal 11438 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 literal 2117 zcmV-L2)g%)P)Px+|4BqaR9Hu~n0a(m^%cjz_q{iJh8>Qy2$6j$0mRk<$^k)(AV?2IsVt>HB(kW; zfv`jfYY_B6u{8wB4keM=g25HrUk7|ij!m0CwT_5J?^CS+7jXa!e#Y5^3b zGZ9@5y{`zgzxYoZx~qTN5jEN6U$%#(R~HEPOAYE6w)DILXvfbXkbMZ+zrU-}VytiU zXZt%N4iHg~N) zV(tY|^@&Ie0lgAD_5BWSVoF5M#H~%M1jD)xzIz{1om!@P2Gpn-(0>p`JMwU@nhzzR zRevJ-A_SCGoR%?I-Ii^dJI+s1O~VvCeIDNNbK%~-3gmQ{&KS%&4ez))QGu)jd$WD| z*sVnLIx({Z=KR9GiM6@lUL{45z^*^fDoNbyw@@@>Qh6CQ04NF|Jy?q^X$WjX2ZZH3 z6Xr%ubgEMm?p>?yfT*4TYOh_ocFI$6qEd7A>0@CX*xPtwO#|oMDF@{FLo)2iiICfh z&A()j+X-?x!_VsWy(nI|BC3~MnM)x*)hIy#y%yMaB+EDbBU1%e)-uTPVoNI-!Lzw2 zPRj^C>lc3j{j5I7VK?5%?OVbzHL;v6?b0>dA>oy+{o)|mpi zzu8bOKSWOWQa^?xb)q5fo%RuIV+KQR-Wb7u9fOv86|UtEehx15K)ZY$-Z3+yddT+f zNZ5Yg?_B|u;$QRGJby-Jm4S-WRwC~2%MJO$zKL)wd=E;;Hc+=`Be3@fY(x7S1u}T> z7`WhWRFKd|+t?wnjT)39fRg=Nb}owKp-LgkIgLs{X_KLJXbp8+HvAb`287fy9+qBR zp*))aYETzc!v(%q1pQ_nw4)~x`1%m^OV`4%Wj&Or?)i3Q@$8ZnR~%)N+Q^{@K*1v? z5ZLoAAZpXie7Fy80a+BooSuKjfVGVn2(nsA-rdSa(SWzY)7j^|4Qrq0hYAn95Ik{i zuXk+8uU&DJ{p}4y1^1wx%Y~&|=W-#Vy0yT!^1*5lzDWyFD8YboUT zMkPSE@1m&hgXDK+%oSnpDS%w;SML<|9%+H7DJH|2o(kn@^Zl!6%uF~YkAmE$nV}gx z`5$=SeBS`lf4mL-MjnDWXP{ea#lNlv~ij#lQQD(#1M?It{fCc?RH5tPy}n&nX7U=Dnf7lCTJ5w~N7k8IW_iRgCN zBg~xc->@yo|Ch}XfkGdQ2Ca8j$Q|31G-!%q{52xvf!zn7oj3>inP0%U{C$utLCd{@ z;-%~1SU3q%O*dFoA^I-;{AJiC41;a>t1F3Utgv4er~!i7*`krt>gpH59c4_oXadTM zT}3!Rc3W7CJwA9-mO?vp98&Wph+F@`Z78zng^Yt<#TIsie*W^hqA@cGe)W-HLdsIp zC*hbq0dni6MlSj0eFDCI3$WV|w`v|sEuRwSw6!65vs1^K;K7`c-YJVo6uHMTB!bkm zG4xz<><1u8a4w$0%Ja{xA)+y5=P&~j<#oHd`#|5~1?fN__*j_2Ml1^KDdR*{{t|#V z29=v2(m_!)Gi$Z)&JXq`FCo5NwGA>BIn}Odct%cW_32NyB!48L(p!oLnz7FIGxR(6 z=c*Z*lDa*cpqrmYVu652GrA$i5(wKEg(hdPDBrVby6*$QmC2$zVdJW{8#?v8%xSd+vZ}| z_K@8sJaaT=d`twY4O9vxj;z`K4cj^gKHmq|Ul# { const item = RESPONSE_LEVELS.find(l => l.value === level) - return item ? `${item.label}` : '三级' + return item ? `${item.label}` : '四级' } /** diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue index 08a8370..98643f9 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue @@ -5,7 +5,7 @@
距离灾害点{{ forcePreset.searchRadius }}km范围内距离灾害点{{ forcePreset.searchRadius - 20 }}km范围内
应急基地与预置点 { + console.log('viewer',viewer.value); + console.log('triggerJump',triggerJump); + + + if (viewer.value && triggerJump) { + + triggerJump(5, 10) // 触发5秒跳动，高度10像素 + } +} + // 下拉框状态 const isDropdownOpen = ref(false); // 距离选项 const distanceOptions = [ // { value: 10, label: "距离灾害点10km范围内" }, - { value: 30, label: "距离灾害点30km范围内" }, - { value: 50, label: "距离灾害点50km范围内" }, + { value: 30, label: "距离灾害点10km范围内" }, + { value: 50, label: "距离灾害点30km范围内" }, ]; /** diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/CollaborationInfo.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/CollaborationInfo.vue index baa9bbe..6fa052a 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/CollaborationInfo.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/CollaborationInfo.vue @@ -18,7 +18,8 @@ [{{ info.source }}] + >[{{ info.source }}] {{ info.content }}
@@ -26,55 +27,61 @@ diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js index f58ffce..61c4daa 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js @@ -7,11 +7,11 @@ export function useDisasterData() { // 灾害基本信息 const disasterInfo = ref({ type: '边坡垮塌', - volume: '10022', + volume: '1220', volumeUnit: 'm³', - length: '13', + length: '33', lengthUnit: 'm', - width: '5', + width: '15', widthUnit: 'm', casualties: '0', vehicles: '0', @@ -43,7 +43,7 @@ export function useDisasterData() { // 力量调度信息 const forceDispatch = ref({ - responseLevel: 3, // 三级 + responseLevel: 4, // 四级 estimatedClearTime: getCurrentDateTime('24:00'), plan: { name: '智能应急方案', diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDualMapCompare.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDualMapCompare.js index 4b0c6ce..e0222e2 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDualMapCompare.js +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDualMapCompare.js @@ -1,6 +1,7 @@ import { ref, onUnmounted } from 'vue' import * as Cesium from 'cesium' import { use3DTiles } from './use3DTiles' +import { useMapMarkers } from '../composables/useMapMarkers' /** * 双地图对比模式 @@ -29,6 +30,8 @@ export function useDualMapCompare() { const { load3DTileset } = use3DTiles() + const { drawCollapseBoundaryLeft } = useMapMarkers() + /** * 初始化左侧Viewer（灾前场景） * @param {HTMLElement} container - 容器元素 @@ -183,7 +186,7 @@ export function useDualMapCompare() { Cesium.Cartesian3.clone(currentPosition, syncController._lastPosition) } else { const positionChanged = !Cesium.Cartesian3.equalsEpsilon( - currentPosition, + currentPosition, syncController._lastPosition, 0.1 ) @@ -192,7 +195,7 @@ export function useDualMapCompare() { handleCameraSync() } if (!controller.isMoving) { - syncController._isUserInteracting = false + syncController._isUserInteracting = false } Cesium.Cartesian3.clone(currentPosition, syncController._lastPosition) } @@ -502,6 +505,13 @@ export function useDualMapCompare() { } await enableCompareMode(rightViewerInstance, options) + const leftContainer = document.getElementById('leftCesiumContainer') + if (leftContainer) { + console.log('[index.vue] 绘制左侧坍塌边界红色虚线...') + drawCollapseBoundaryLeft(leftContainer) + + console.log('[index.vue] 左侧坍塌边界红色虚线已添加') + } } else { disableCompareMode() } diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js index a17cd28..b2b90ea 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js @@ -107,11 +107,12 @@ export function useMapMarkers() { const resolveBillboardHeightReference = (samplingSucceeded) => { // 统一使用 CLAMP_TO_GROUND 让 Cesium 自动贴地 // 配合禁用的 3D Tiles 动态细化，标记位置会保持稳定 - return Cesium.HeightReference.CLAMP_TO_GROUND + // return Cesium.HeightReference.CLAMP_TO_GROUND + return Cesium.HeightReference.RELATIVE_TO_GROUND } /** - * 绘制坍塌边界蓝色实线（右侧地图） + * 绘制坍塌边界红色实线（右侧地图） * 在右侧地图上显示灾后坍塌的边界轮廓 * @param {Cesium.Viewer} viewer * @returns {Cesium.Entity | null} 返回创建的边界线实体 @@ -143,12 +144,12 @@ export function useMapMarkers() { console.log('[useMapMarkers] 右侧坍塌边界点位数量:', positions.length) - // 创建蓝色实线边界 + // 创建红色实线边界 const boundaryEntity = viewer.entities.add({ polyline: { positions: positions, width: 4, // 增加线宽，更明显 - material: Cesium.Color.fromCssColorString('#1CA1FF').withAlpha(1.0), // 纯蓝色实线 + material: Cesium.Color.fromCssColorString('#FF0000').withAlpha(1.0), // 纯红色实线 clampToGround: true, classificationType: Cesium.ClassificationType.BOTH, // 同时分类到地形和3D Tiles zIndex: 1 // 提高层级 @@ -161,7 +162,7 @@ export function useMapMarkers() { }) collapseBoundaryEntity.value = boundaryEntity - console.log('[useMapMarkers] 右侧坍塌边界蓝色实线绘制完成, entityId:', boundaryEntity.id) + console.log('[useMapMarkers] 右侧坍塌边界红色实线绘制完成, entityId:', boundaryEntity.id) // 强制渲染场景 viewer.scene.requestRender() @@ -215,7 +216,7 @@ export function useMapMarkers() { positions: positions, width: 4, material: new Cesium.PolylineDashMaterialProperty({ - color: Cesium.Color.fromCssColorString('#1CA1FF').withAlpha(1.0), // 蓝色 + color: Cesium.Color.fromCssColorString('#FF0000').withAlpha(1.0), // 红色 dashLength: 16.0, // 虚线段长度 dashPattern: 255.0 // 虚线模式 }), @@ -578,19 +579,18 @@ export function useMapMarkers() { }, properties: isSoldier ? { - type: 'soldier', - name: soldierNames[Math.floor(Math.random() * soldierNames.length)], - department: soldierDepartments[Math.floor(Math.random() * soldierDepartments.length)], - location: `目前为止距离现场${locationDistance}公里` - } + type: 'soldier', + name: soldierNames[Math.floor(Math.random() * soldierNames.length)], + department: soldierDepartments[Math.floor(Math.random() * soldierDepartments.length)], + location: `目前为止距离现场${locationDistance}公里` + } : { - type: 'device', - name: deviceNames[Math.floor(Math.random() * deviceNames.length)], - deviceType: deviceTypes[Math.floor(Math.random() * deviceTypes.length)], - location: `目前为止距离现场${locationDistance}公里` - } + type: 'device', + name: deviceNames[Math.floor(Math.random() * deviceNames.length)], + deviceType: deviceTypes[Math.floor(Math.random() * deviceTypes.length)], + location: `目前为止距离现场${locationDistance}公里` + } }) - entities.push(entity) } @@ -849,6 +849,7 @@ export function useMapMarkers() { icon = otherEmergencyIcon type = 'other' levelName = '其他' + // return; } console.log(`[useMapMarkers] 添加标记: ${item.gl1Yjllmc}, 级别: ${levelString} (${levelName})`) @@ -857,7 +858,7 @@ export function useMapMarkers() { position: result.position, billboard: { image: icon, - width: 29, + width: 32, height: 32, verticalOrigin: Cesium.VerticalOrigin.BOTTOM, heightReference: resolveBillboardHeightReference(result.samplingSucceeded), @@ -972,6 +973,96 @@ export function useMapMarkers() { } } + + /** +* 触发实体像素级跳动动画 +* @param {Cesium.Viewer} viewer +* @param {number} duration 动画持续时间（秒） +* @param {number} pixelJumpHeight 像素跳动高度 +*/ + const triggerJumpAnimation = (viewer, duration = 5, pixelJumpHeight = 30) => { + console.log(`[useMapMarkers] 触发像素跳动动画，持续时间 ${duration} 秒，像素高度 ${pixelJumpHeight}`) + if (!viewer) { + console.warn('[useMapMarkers] triggerJumpAnimation: viewer 为空') + return + } + + // 收集所有需要动画的实体（包含所有类型） + const allEntities = [ + ...markerEntities.value, + ...emergencyResourceEntities.value, + ...reserveCenterEntities.value + ].filter(e => e.billboard) // 只需要有billboard的实体 + + // 存储原始像素偏移量 + const entitiesData = allEntities.map(entity => ({ + entity, + originalOffset: entity.billboard.pixelOffset + ? new Cesium.Cartesian2( + entity.billboard.pixelOffset.x, + entity.billboard.pixelOffset.y + ) + : new Cesium.Cartesian2(0, 0) + })) + + // 动画参数 + const startTime = Date.now() + const jumpDuration = 800 // 单次跳动周期（毫秒） + let animationActive = true + + // 定义动画函数 + const animate = () => { + if (!animationActive) return + + const elapsed = Date.now() - startTime + const progress = (elapsed % jumpDuration) / jumpDuration + + // 使用正弦波计算当前像素偏移 + const currentOffset = Math.sin(progress * Math.PI * 2) * pixelJumpHeight + + // 应用像素偏移到所有实体 + entitiesData.forEach(({ entity, originalOffset }) => { + try { + entity.billboard.pixelOffset = new Cesium.Cartesian2( + originalOffset.x, + originalOffset.y - currentOffset // Y轴负方向为上移 + ) + } catch (error) { + console.warn('[useMapMarkers] 更新实体像素偏移失败:', error) + } + }) + + // 继续动画直到持续时间结束 + if (elapsed < duration * 1000) { + requestAnimationFrame(animate) + } else { + // 恢复原始像素偏移 + entitiesData.forEach(({ entity, originalOffset }) => { + entity.billboard.pixelOffset = originalOffset + }) + animationActive = false + console.log('[useMapMarkers] 像素跳动动画结束') + } + } + + // 启动动画 + animate() + + // 提供手动停止方法 + return () => { + if (animationActive) { + animationActive = false + entitiesData.forEach(({ entity, originalOffset }) => { + entity.billboard.pixelOffset = originalOffset + }) + console.log('[useMapMarkers] 像素跳动动画已手动停止') + } + } + } + + + + return { collapseAreaEntities, markerEntities, @@ -996,7 +1087,8 @@ export function useMapMarkers() { clearEmergencyResourceMarkers, addReserveCenterMarkers, clearReserveCenterMarkers, - getCollapseCenter: calculateCollapseCenter // 提前获取中心点，不依赖标记初始化 + getCollapseCenter: calculateCollapseCenter, // 提前获取中心点，不依赖标记初始化 + triggerJumpAnimation, } } diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js index ec08b24..b1b76e9 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useRangeCircle.js @@ -64,6 +64,20 @@ export function useRangeCircle() { outlineWidth: style.outlineWidth, heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, }, + label: { + text: `${radiusKm.toFixed(1) - 20} km`, // 实际是30 / 50 km 临时修改减少20km 后续调整 + font: 'bold 24px sans-serif', + fillColor: Cesium.Color.WHITE, + outlineColor: Cesium.Color.BLACK, + outlineWidth: 2, + style: Cesium.LabelStyle.FILL_AND_OUTLINE, + verticalOrigin: Cesium.VerticalOrigin.CENTER, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + pixelOffset: new Cesium.Cartesian2(0, 0), + backgroundColor: Cesium.Color.fromCssColorString('#333').withAlpha(0.7), + backgroundPadding: new Cesium.Cartesian2(18, 12), + showBackground: true + } }) // 禁用范围圈的鼠标交互，让点击可以穿透到下面的标记点 diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue index e9a6ba0..9c5ea7f 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue @@ -44,10 +44,7 @@ /> - +
@@ -100,7 +97,9 @@ :aria-label="isRightPanelCollapsed ? '展开右侧面板' : '收起右侧面板'" > @@ -200,7 +199,9 @@ width="clamp(100px, 50vw, 1400px)" > - +