bdzl2/bxztApp
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增所需力量

Browse Source
This commit is contained in:
huangchenhao 2025-11-28 10:20:23 +08:00
parent a1115c2c42
commit 93ba75de47
2 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/EmergencyPlanContent.vue
View File

@ -169,7 +169,36 @@
</div>
</section>
<!-- 4. 力量调派方案 -->
<!-- 4. 所需力量 -->
<section class="plan-section">
<div class="section-header">
<img
src="../../assets/images/modal/弹窗title.png"
alt=""
class="title-icon"
/>
<h3 class="section-title">所需力量</h3>
</div>
<div class="section-body">
<div class="dispatch-plans">
<div class="dispatch-card">
<div class="resource-grid">
<div
v-for="(resource, index) in requiredResources"
:key="index"
class="resource-item"
:class="{ 'full-width': resource.label === '物资' }"
>
<span class="resource-label">{{ resource.label }}</span>
<span class="resource-value">{{ resource.value }}</span>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- 5. 力量调派方案 -->
<section class="plan-section">
<div class="section-header">
<img
@ -317,6 +346,21 @@ const clearanceSteps = reactive([
},
]);
/**
* 所需力量数据
*/
const requiredResources = ref([
{ label: "挖掘设备", value: "2台" },
{ label: "装载机", value: "2台" },
{ label: "运渣设备", value: "6台" },
{ label: "运输设备", value: "2台" },
{ label: "人员", value: "20人" },
{
label: "物资",
value: "标志标牌10块、锥桶50件，铁锹10把，雪糕筒100件，麻袋、砂石料等若干",
},
]);
/**
* 力量调派预案
*/
@ -1012,4 +1056,7 @@ const handleDeletePlan = (id) => {
background: #052044 !important;
}
}
.full-width {
grid-column: 1 / -1;
}
</style>

41
packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useAmapRouting.js
View File

@ -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)