diff --git a/src/modules/mileage/MonitoringView.tsx b/src/modules/mileage/MonitoringView.tsx
index 53a5566..14b0b24 100644
--- a/src/modules/mileage/MonitoringView.tsx
+++ b/src/modules/mileage/MonitoringView.tsx
@@ -358,7 +358,7 @@ export default function MonitoringView() {
{v.customer} |
- {v.department} |
+ {v.department || v.rentStatus || ''} |
@@ -685,7 +685,7 @@ export default function MonitoringView() {
{sortBy === 'today' ? '今日' : '累计'}总里程 (KM)
- {(sortBy === 'today' ? stats.totalToday : stats.totalAll).toLocaleString()}
+ {Math.round(sortBy === 'today' ? stats.totalToday : stats.totalAll).toLocaleString()}
{sortBy === 'today' && {'\u2191'}12%}
@@ -735,8 +735,8 @@ export default function MonitoringView() {
- {v.customer || '未分配'}
- {v.department?.replace('业务', '')}
+ {v.department ? v.department.replace('业务', '') : v.rentStatus || ''}
+ {v.customer || '未分配'}
diff --git a/src/modules/mileage/types.ts b/src/modules/mileage/types.ts
index 00a7ff1..57f955a 100644
--- a/src/modules/mileage/types.ts
+++ b/src/modules/mileage/types.ts
@@ -9,6 +9,7 @@ export interface MonitoringVehicle {
customer: string | null;
department: string | null;
manager: string | null;
+ rentStatus: string | null;
}
export interface MonitoringStats {
diff --git a/src/server/routes/mileage.ts b/src/server/routes/mileage.ts
index 6252869..89f2709 100644
--- a/src/server/routes/mileage.ts
+++ b/src/server/routes/mileage.ts
@@ -9,13 +9,16 @@ const VEHICLE_INFO_SQL = `SELECT
truck.plate_number AS plate,
cus.customer_name AS customer,
dep.dep_name AS department,
- u.user_name AS manager
+ u.user_name AS manager,
+ dic_status.dic_name AS rent_status
FROM tab_truck truck
LEFT JOIN tab_truck_status_info si ON si.truck_id = truck.id AND si.is_deleted = 0
LEFT JOIN tab_contract c ON c.id = si.contract_id AND c.is_deleted = 0
LEFT JOIN tab_customer cus ON cus.id = c.customer_id AND cus.is_deleted = 0
LEFT JOIN tab_user u ON u.id = c.bd AND u.is_deleted = 0
LEFT JOIN tab_department dep ON dep.id = u.dep_id AND dep.is_deleted = 0
+LEFT JOIN tab_dic dic_status ON dic_status.parent_code = 'dic_truck_rent_status'
+ AND dic_status.dic_code = truck.truck_rent_status AND dic_status.is_deleted = 0
WHERE truck.is_deleted = 0 AND truck.is_operation = 1`;
// ========== 实时监控缓存(每2分钟刷新) ==========
@@ -30,6 +33,7 @@ interface CachedVehicle {
customer: string | null;
department: string | null;
manager: string | null;
+ rentStatus: string | null;
}
interface MonitoringCache {
@@ -95,6 +99,7 @@ async function refreshMonitoringCache() {
customer: info?.customer || null,
department: info?.department || null,
manager: info?.manager || null,
+ rentStatus: info?.rent_status || null,
};
});
|