This commit is contained in:
Андрей Дувакин 2024-10-08 08:40:13 +05:00
parent 4ed9d711a7
commit e7c0164313
2 changed files with 10 additions and 2 deletions

View File

@ -100,8 +100,8 @@ const DeliveryOrdersList = ({
<div className="card-body"> <div className="card-body">
<p>Этап {index + 1}</p> <p>Этап {index + 1}</p>
<p> <p>
Расчетная длительность этапа:{" "} Прогнозируемое время этапа:{" "}
{formatTimeInHours(order.estimated_route_time_in_minutes)} {formatTimeInHours(order.estimated_route_time_in_minutes)}
</p> </p>
{calculatingRoutes.includes(order.id) && ( {calculatingRoutes.includes(order.id) && (
<div className="spinner-border" role="status"> <div className="spinner-border" role="status">

View File

@ -37,6 +37,7 @@ const DeliveryOrderDetails = () => {
const [truckCapacity, setTruckCapacity] = useState(""); const [truckCapacity, setTruckCapacity] = useState("");
const [totalOrder, setTotalOrder] = useState(null); const [totalOrder, setTotalOrder] = useState(null);
const [deliveryOrder, setDeliveryOrder] = useState(null); const [deliveryOrder, setDeliveryOrder] = useState(null);
const [orderDuration, setOrderDuration] = useState(null);
const navigate = useNavigate(); const navigate = useNavigate();
useEffect(() => { useEffect(() => {
@ -116,6 +117,7 @@ const DeliveryOrderDetails = () => {
const decodedRoute = polyline.decode(geometry); const decodedRoute = polyline.decode(geometry);
setRoute(decodedRoute); setRoute(decodedRoute);
const duration = data.routes[0].duration; const duration = data.routes[0].duration;
setOrderDuration(duration);
await updateDeliveryOrderRoute( await updateDeliveryOrderRoute(
deliveryOrderId, deliveryOrderId,
@ -126,6 +128,7 @@ const DeliveryOrderDetails = () => {
} }
} else { } else {
const decodedRoute = deliveryOrderDetails.route; const decodedRoute = deliveryOrderDetails.route;
setOrderDuration(deliveryOrderDetails.estimated_route_time_in_minutes);
setRoute(decodedRoute); setRoute(decodedRoute);
} }
} catch (error) { } catch (error) {
@ -161,6 +164,7 @@ const DeliveryOrderDetails = () => {
<th scope="col">Общая стоимость</th> <th scope="col">Общая стоимость</th>
<th scope="col">Тип машины</th> <th scope="col">Тип машины</th>
<th scope="col">Количество машин</th> <th scope="col">Количество машин</th>
<th scope="col">Прогнозируемое время этапа</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -172,6 +176,10 @@ const DeliveryOrderDetails = () => {
Грузоподъемность: {truckCapacity}кг Грузоподъемность: {truckCapacity}кг
</td> </td>
<td>{truckCount}</td> <td>{truckCount}</td>
<td>
{Math.round(deliveryOrder?.estimated_route_time_in_minutes)}{" "}
мин.
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>