diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/EmergencyPlanContent.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/EmergencyPlanContent.vue index 20d0bb1..f7cdd32 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/EmergencyPlanContent.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/EmergencyPlanContent.vue @@ -169,7 +169,36 @@ - + + + + + 所需力量 + + + + + + + {{ resource.label }} + {{ resource.value }} + + + + + + + + { background: #052044 !important; } } +.full-width { + grid-column: 1 / -1; +} diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useAmapRouting.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useAmapRouting.js index 17a7ee4..bd96e2b 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useAmapRouting.js +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useAmapRouting.js @@ -36,11 +36,11 @@ export function useAmapRouting() { lastError.value = error.message console.error('[useAmapRouting] 路线计算失败:', error) - // 降级:生成直线路径 - if (options.fallbackToStraightLine !== false) { - console.warn('[useAmapRouting] 使用直线降级方案') - return generateStraightLineRoute(origin, destination) - } + // // 降级:生成直线路径 + // if (options.fallbackToStraightLine !== false) { + // console.warn('[useAmapRouting] 使用直线降级方案') + // return generateStraightLineRoute(origin, destination) + // } throw error } finally { @@ -60,22 +60,23 @@ export function useAmapRouting() { const results = await calculateMultipleRoutes(routePairs) - // 对失败的路线使用直线降级 - const processedResults = results.map(result => { - if (!result.success) { - console.warn(`[useAmapRouting] 路线 ${result.name} 失败,使用直线降级`) - const fallbackRoute = generateStraightLineRoute(result.origin, result.destination) - return { - ...result, - ...fallbackRoute, - isFallback: true, - success: true - } - } - return result - }) + // // 对失败的路线使用直线降级 + // const processedResults = results.map(result => { + // if (!result.success) { + // console.warn(`[useAmapRouting] 路线 ${result.name} 失败,使用直线降级`) + // const fallbackRoute = generateStraightLineRoute(result.origin, result.destination) + // return { + // ...result, + // ...fallbackRoute, + // isFallback: true, + // success: true + // } + // } + // return result + // }) - return processedResults + // return processedResults + return results } catch (error) { lastError.value = error.message console.error('[useAmapRouting] 批量路线计算失败:', error)