diff --git a/src/components/DeliveryOrdersList.jsx b/src/components/DeliveryOrdersList.jsx index c436def..ee739fe 100644 --- a/src/components/DeliveryOrdersList.jsx +++ b/src/components/DeliveryOrdersList.jsx @@ -100,8 +100,8 @@ const DeliveryOrdersList = ({

Этап №{index + 1}

- Расчетная длительность этапа:{" "} - {formatTimeInHours(order.estimated_route_time_in_minutes)} + Прогнозируемое время этапа:{" "} + {formatTimeInHours(order.estimated_route_time_in_minutes)}

{calculatingRoutes.includes(order.id) && (
diff --git a/src/pages/DeliveryOrderDetails.jsx b/src/pages/DeliveryOrderDetails.jsx index d53b15d..044ef8c 100644 --- a/src/pages/DeliveryOrderDetails.jsx +++ b/src/pages/DeliveryOrderDetails.jsx @@ -37,6 +37,7 @@ const DeliveryOrderDetails = () => { const [truckCapacity, setTruckCapacity] = useState(""); const [totalOrder, setTotalOrder] = useState(null); const [deliveryOrder, setDeliveryOrder] = useState(null); + const [orderDuration, setOrderDuration] = useState(null); const navigate = useNavigate(); useEffect(() => { @@ -116,6 +117,7 @@ const DeliveryOrderDetails = () => { const decodedRoute = polyline.decode(geometry); setRoute(decodedRoute); const duration = data.routes[0].duration; + setOrderDuration(duration); await updateDeliveryOrderRoute( deliveryOrderId, @@ -126,6 +128,7 @@ const DeliveryOrderDetails = () => { } } else { const decodedRoute = deliveryOrderDetails.route; + setOrderDuration(deliveryOrderDetails.estimated_route_time_in_minutes); setRoute(decodedRoute); } } catch (error) { @@ -161,6 +164,7 @@ const DeliveryOrderDetails = () => { Общая стоимость Тип машины Количество машин + Прогнозируемое время этапа @@ -172,6 +176,10 @@ const DeliveryOrderDetails = () => { Грузоподъемность: {truckCapacity}кг {truckCount} + + {Math.round(deliveryOrder?.estimated_route_time_in_minutes)}{" "} + мин. +