merge palladium 18t color variant

fix asset vehicle source grouping
update asset refresh status
2026-06-23 13:32:29 +08:00 · 2026-06-23 13:16:32 +08:00 · 2026-06-18 14:18:40 +08:00 · 2026-06-18 14:04:27 +08:00 · 2026-06-18 10:18:35 +08:00 · 2026-06-17 11:53:39 +08:00
23 changed files with 705 additions and 490 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,11 +5,21 @@ services:
    image: harbor.lnh2e.com/lingniu-v1/ln-bi:main-1.0.0
    network_mode: host
    environment:
-      DB_HOST: "47.101.148.99"
+      DB_HOST: "rm-bp179zbv481rnw3e2no.mysql.rds.aliyuncs.com"
      DB_PORT: "3306"
-      DB_USER: "root"
+      DB_USER: "oneos_db_prod"
-      DB_PASSWORD: "LN#Passw0rd@2026"
+      DB_PASSWORD: "adASHJcviqwjkbn23ngt1"
-      DB_NAME: "lingniu_prod"
+      DB_NAME: "ln_asset_management"
      HYDROGEN_DB_HOST: "47.99.185.173"
      HYDROGEN_DB_PORT: "3306"
      HYDROGEN_DB_USER: "root"
      HYDROGEN_DB_PASSWORD: "lnMysql."
      HYDROGEN_DB_NAME: "ln_asset_management"
      MILEAGE_DB_HOST: "101.133.130.65"
      MILEAGE_DB_PORT: "3306"
      MILEAGE_DB_USER: "bi_reader_02"
      MILEAGE_DB_PASSWORD: "bi_reader_02_Pass"
      MILEAGE_DB_NAME: "hydrogen_energy"
      SERVER_PORT: "8111"
      EXTERNAL_API_BASE: "https://lnh2e.com"
      JWT_SECRET: "ln-bi-jwt-prod-k8s9m2x7"
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>羚牛氢能车辆资产</title>
+    <title>羚牛氢能</title>
  </head>
  <body>
    <div id="root"></div>
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -128,6 +128,10 @@ function AuthGate() {
    };
  }, []);
  useEffect(() => {
    document.title = pathSet === "energy" ? "羚牛氢能-能源BI" : "羚牛氢能-资产BI";
  }, [pathSet]);
  const modules = useMemo<ModuleConfig[]>(() => {
    if (pathSet === "energy") {
      return [HYDROGEN_MODULE, ELECTRIC_MODULE, ETC_MODULE];
--- a/src/index.css
+++ b/src/index.css
@@ -14,3 +14,12 @@ body {
  overflow: auto;
  height: 100%;
 }
@keyframes marquee {
  from { transform: translateX(0); }
  to   { transform: translateX(-50%); }
 }
@utility animate-marquee {
  animation: marquee 30s linear infinite;
 }
--- a/src/modules/assets/AssetsModule.tsx
+++ b/src/modules/assets/AssetsModule.tsx
@@ -46,6 +46,52 @@ const TABS = [
  { id: 'customer', label: '按客户' },
 ];
 function MarqueeBanner() {
  const trackRef = useRef<HTMLDivElement>(null);
  const innerRef = useRef<HTMLDivElement>(null);
  const [overflow, setOverflow] = useState(false);
  useEffect(() => {
    const check = () => {
      if (!trackRef.current || !innerRef.current) return;
      setOverflow(innerRef.current.scrollWidth > trackRef.current.clientWidth);
    };
    check();
    const ro = new ResizeObserver(check);
    ro.observe(trackRef.current!);
    return () => ro.disconnect();
  }, []);
  const text = '车辆资产已于 2026 年 6 月 18 日完成“运营状态”与“业务关联”校验';
  return (
    <div className="relative -mx-6 mb-4 bg-green-50 border-y border-green-200">
      <div ref={trackRef} className="overflow-hidden">
        <div className={`flex w-max py-2 ${overflow ? 'animate-marquee' : 'w-full justify-center'}`}>
          <span ref={innerRef} className="inline-block whitespace-nowrap px-6 text-xs text-green-700 font-medium">
            {text}
          </span>
          {overflow && (
            <span className="inline-block whitespace-nowrap px-6 text-xs text-green-700 font-medium">
              {text}
            </span>
          )}
        </div>
      </div>
    </div>
  );
 }
 function formatLocalDateTime(date: Date): string {
  const y = date.getFullYear();
  const m = String(date.getMonth() + 1).padStart(2, '0');
  const d = String(date.getDate()).padStart(2, '0');
  const hh = String(date.getHours()).padStart(2, '0');
  const mm = String(date.getMinutes()).padStart(2, '0');
  const ss = String(date.getSeconds()).padStart(2, '0');
  return `${y}-${m}-${d} ${hh}:${mm}:${ss}`;
 }
 export default function AssetsModule() {
  const [activeTab, setActiveTab] = useState<'overview' | 'department' | 'region' | 'customer'>('overview');
  const [tabReady, setTabReady] = useState(true);
@@ -92,7 +138,7 @@ export default function AssetsModule() {
  const [modalWeeklyDetail, setModalWeeklyDetail] = useState<WeeklyDetailItem[]>([]);
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState<string | null>(null);
-  const [lastUpdate, setLastUpdate] = useState<string>('');
+  const [lastUpdate, setLastUpdate] = useState<string>(() => formatLocalDateTime(new Date()));
  const [modalLoading, setModalLoading] = useState(false);
  // Dept/Region/Customer data
@@ -162,7 +208,7 @@ export default function AssetsModule() {
      setRegionData(region);
      setCustomerData(cust);
      setInventoryData(inv);
-      setLastUpdate(new Date().toLocaleString('zh-CN'));
+      setLastUpdate(formatLocalDateTime(new Date()));
    } catch (e) {
      setError(e instanceof Error ? e.message : '数据加载失败');
    } finally {
@@ -526,7 +572,7 @@ export default function AssetsModule() {
      <div className="sticky top-0 z-40 -mx-6 -mt-6 mb-4 bg-white/95 backdrop-blur-sm border-b border-gray-100/80">
        {/* Title row */}
        <div className="relative flex items-center justify-center px-4 pt-3 pb-1">
-          <h1 className="hidden sm:block text-base font-semibold text-gray-800 tracking-wide">羚牛氢能车辆资产</h1>
+          <h1 className="hidden sm:block text-base font-semibold text-gray-800 tracking-wide">羚牛氢能-资产BI</h1>
          {/* Right: status + theme */}
          <div className="absolute right-4 top-1/2 -translate-y-1/2 flex items-center gap-2">
            <div className="hidden sm:flex items-center gap-1 text-[10px] text-gray-400">
@@ -689,13 +735,12 @@ export default function AssetsModule() {
            <span className="w-1 h-1 rounded-full bg-blue-400 inline-block" />
            最后更新: {lastUpdate}
          </div>
          <div className="flex items-center gap-1">
            <span className="w-1 h-1 rounded-full bg-green-400 animate-pulse inline-block" />
            每分钟更新一次
          </div>
        </div>
      </div>
      {/* OneOS 迁移提示滚动条 */}
      <MarqueeBanner />
      {/* Main Content Area */}
      <div className="flex flex-col gap-6">
--- a/src/modules/assets/types.ts
+++ b/src/modules/assets/types.ts
@@ -106,6 +106,7 @@ export interface VehicleListItem {
  city: string | null;
  status: string;
  ownership: string;
  rentCompany?: string | null;
  contractNo: string | null;
  customerName: string | null;
  subjectOrg: string | null;
--- a/src/modules/mileage/MonitoringView.tsx
+++ b/src/modules/mileage/MonitoringView.tsx
@@ -3,7 +3,7 @@ import { motion, AnimatePresence } from 'motion/react';
 import {
  Truck, Filter, ChevronDown,
  Maximize2, Minimize2, RotateCcw,
-  ArrowUp, ArrowDown, ChevronsUp, Download,
+  ArrowUp, ArrowDown, ChevronsUp, Download, Check,
 } from 'lucide-react';
 import type { MonitoringVehicle, MonitoringStats, MonitoringFilters } from './types';
 import { fetchMonitoring } from './api';
@@ -12,6 +12,12 @@ import PlateMultiSelect from './PlateMultiSelect';
 import { exportMileageXlsx } from './xlsx-export';
 import VehicleDetailModal from './VehicleDetailModal';
 const HIGH_MILEAGE_ALERT_TARGETS = new Set([
  '交投40辆4.5T普货',
  '交投190辆4.5T冷链车',
 ]);
 const HIGH_MILEAGE_ALERT_KM = 800;
 const SearchableSelect = ({
  options,
  value,
@@ -92,6 +98,129 @@ const SearchableSelect = ({
  );
 };
 const BatchMultiSelect = ({
  options,
  selected,
  onChange,
  placeholder,
 }: {
  options: string[],
  selected: string[],
  onChange: (val: string[]) => void,
  placeholder: string
 }) => {
  const rootRef = useRef<HTMLDivElement>(null);
  const [isOpen, setIsOpen] = useState(false);
  const [search, setSearch] = useState('');
  const selectedSet = useMemo(() => new Set(selected), [selected]);
  const filtered = useMemo(() => {
    if (!search) return options;
    return options.filter(opt => opt.toLowerCase().includes(search.toLowerCase()));
  }, [options, search]);
  const label = selected.length === 0
    ? placeholder
    : selected.length === options.length
      ? '全部批次'
      : selected.length === 1
        ? selected[0]
        : `已选 ${selected.length} 个批次`;
  const toggle = (opt: string) => {
    if (selectedSet.has(opt)) {
      onChange(selected.filter(item => item !== opt));
    } else {
      onChange([...selected, opt]);
    }
  };
  useEffect(() => {
    if (!isOpen) return;
    const handlePointerDown = (event: PointerEvent) => {
      const target = event.target;
      if (target instanceof Node && !rootRef.current?.contains(target)) {
        setIsOpen(false);
        setSearch('');
      }
    };
    document.addEventListener('pointerdown', handlePointerDown);
    return () => document.removeEventListener('pointerdown', handlePointerDown);
  }, [isOpen]);
  return (
    <div ref={rootRef} className="relative">
      <button
        type="button"
        className="w-full bg-slate-50 border-none rounded-lg py-1.5 pl-2 pr-6 text-left text-[10px] font-bold text-slate-600 outline-none focus:ring-1 focus:ring-blue-500/20"
        onClick={() => setIsOpen(open => !open)}
      >
        <span className="block truncate">{label}</span>
        <ChevronDown size={10} className="absolute right-2 top-1/2 -translate-y-1/2 text-slate-400 pointer-events-none" />
      </button>
      <AnimatePresence>
        {isOpen && (
          <motion.div
            initial={{ opacity: 0, y: -5 }}
            animate={{ opacity: 1, y: 0 }}
            exit={{ opacity: 0, y: -5 }}
            className="absolute z-50 left-0 right-0 mt-1 bg-white border border-slate-100 rounded-xl shadow-xl overflow-hidden"
          >
            <div className="p-2 border-b border-slate-50">
              <input
                type="text"
                className="w-full bg-slate-50 border-none rounded-lg py-1.5 px-2 text-[10px] font-bold text-slate-600 outline-none focus:ring-1 focus:ring-blue-500/20 placeholder:text-slate-400"
                placeholder="搜索批次"
                value={search}
                onChange={(e) => setSearch(e.target.value)}
              />
            </div>
            <div className="flex items-center gap-1 px-2 py-1.5 border-b border-slate-50">
              <button
                type="button"
                className="flex-1 px-2 py-1 text-[10px] font-bold text-blue-600 hover:bg-blue-50 rounded-lg"
                onClick={() => onChange(options)}
              >
                全选批次
              </button>
              <button
                type="button"
                className="flex-1 px-2 py-1 text-[10px] font-bold text-slate-400 hover:bg-slate-50 rounded-lg"
                onClick={() => onChange([])}
              >
                不限
              </button>
            </div>
            <div className="max-h-44 overflow-y-auto">
              {filtered.map((opt: string) => {
                const checked = selectedSet.has(opt);
                return (
                  <button
                    type="button"
                    key={opt}
                    className="w-full px-3 py-2 text-[10px] font-bold text-slate-600 hover:bg-slate-50 cursor-pointer border-t border-slate-50 flex items-center justify-between gap-2 text-left"
                    onClick={() => toggle(opt)}
                  >
                    <span className="truncate">{opt}</span>
                    <span className={`w-3.5 h-3.5 rounded border flex items-center justify-center flex-shrink-0 ${checked ? 'bg-blue-600 border-blue-600 text-white' : 'border-slate-200 text-transparent'}`}>
                      <Check size={10} />
                    </span>
                  </button>
                );
              })}
              {filtered.length === 0 && (
                <div className="px-3 py-2 text-[10px] font-bold text-slate-300 italic">
                  无匹配项
                </div>
              )}
            </div>
          </motion.div>
        )}
      </AnimatePresence>
    </div>
  );
 };
 export default function MonitoringView() {
  const [searchTerm, setSearchTerm] = useState('');
  const [filterDept, setFilterDept] = useState('All');
@@ -111,7 +240,7 @@ export default function MonitoringView() {
  const [filterEntity, setFilterEntity] = useState('All');
  const [filterRentStatus, setFilterRentStatus] = useState('All');
  const [filterPlatePrefix, setFilterPlatePrefix] = useState('All');
-  const [filterTargetName, setFilterTargetName] = useState('All');
+  const [filterTargetNames, setFilterTargetNames] = useState<string[]>([]);
  const [filterRegion, setFilterRegion] = useState('All');
  const [filterMileageRange, setFilterMileageRange] = useState({ min: '', max: '' });
  const [appliedMileageRange, setAppliedMileageRange] = useState({ min: '', max: '' });
@@ -137,6 +266,12 @@ export default function MonitoringView() {
  const departments = filterOptions.departments;
  const plateNumbers = filterOptions.plates;
  const isHighMileageAlert = useCallback((v: MonitoringVehicle) => {
    const inAlertTarget = v.targetNames?.some(name => HIGH_MILEAGE_ALERT_TARGETS.has(name))
      || filterTargetNames.some(name => HIGH_MILEAGE_ALERT_TARGETS.has(name));
    return inAlertTarget && Math.max(0, v.dailyKm || 0) >= HIGH_MILEAGE_ALERT_KM;
  }, [filterTargetNames]);
  // 加载首页数据
  const loadFirstPage = useCallback(() => {
    setPageLoading(true);
@@ -152,7 +287,7 @@ export default function MonitoringView() {
      entity: filterEntity !== 'All' ? filterEntity : undefined,
      rentStatus: filterRentStatus !== 'All' ? filterRentStatus : undefined,
      platePrefix: filterPlatePrefix !== 'All' ? filterPlatePrefix : undefined,
-      targetName: filterTargetName !== 'All' ? filterTargetName : undefined,
+      targetNames: filterTargetNames.length > 0 ? filterTargetNames : undefined,
      region: filterRegion !== 'All' ? filterRegion : undefined,
      plate: filterPlates.length > 0 ? filterPlates.join(',') : undefined,
      mileageMin: appliedMileageRange.min || undefined,
@@ -166,7 +301,7 @@ export default function MonitoringView() {
      setPage(1);
      setHasMore(d.page < d.totalPages);
    }).catch(() => {}).finally(() => setPageLoading(false));
-  }, [sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterProject, filterEntity, filterRentStatus, filterPlatePrefix, filterTargetName, filterRegion, filterPlates, appliedMileageRange, filterDate]);
+  }, [sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterProject, filterEntity, filterRentStatus, filterPlatePrefix, filterTargetNames, filterRegion, filterPlates, appliedMileageRange, filterDate]);
  // 加载更多
  const loadMore = useCallback(() => {
@@ -185,7 +320,7 @@ export default function MonitoringView() {
      entity: filterEntity !== 'All' ? filterEntity : undefined,
      rentStatus: filterRentStatus !== 'All' ? filterRentStatus : undefined,
      platePrefix: filterPlatePrefix !== 'All' ? filterPlatePrefix : undefined,
-      targetName: filterTargetName !== 'All' ? filterTargetName : undefined,
+      targetNames: filterTargetNames.length > 0 ? filterTargetNames : undefined,
      region: filterRegion !== 'All' ? filterRegion : undefined,
      plate: filterPlates.length > 0 ? filterPlates.join(',') : undefined,
      mileageMin: appliedMileageRange.min || undefined,
@@ -196,7 +331,7 @@ export default function MonitoringView() {
      setPage(nextPage);
      setHasMore(nextPage < d.totalPages);
    }).catch(() => {}).finally(() => setLoadingMore(false));
-  }, [sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterProject, filterEntity, filterRentStatus, filterPlatePrefix, filterTargetName, filterRegion, filterPlates, appliedMileageRange, filterDate, page, loadingMore, hasMore]);
+  }, [sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterProject, filterEntity, filterRentStatus, filterPlatePrefix, filterTargetNames, filterRegion, filterPlates, appliedMileageRange, filterDate, page, loadingMore, hasMore]);
  // 筛选/排序变化时重新加载
  useEffect(() => {
@@ -228,7 +363,7 @@ export default function MonitoringView() {
        entity: filterEntity !== 'All' ? filterEntity : undefined,
        rentStatus: filterRentStatus !== 'All' ? filterRentStatus : undefined,
        platePrefix: filterPlatePrefix !== 'All' ? filterPlatePrefix : undefined,
-        targetName: filterTargetName !== 'All' ? filterTargetName : undefined,
+        targetNames: filterTargetNames.length > 0 ? filterTargetNames : undefined,
        region: filterRegion !== 'All' ? filterRegion : undefined,
        plate: filterPlates.length > 0 ? filterPlates.join(',') : undefined,
        mileageMin: appliedMileageRange.min || undefined,
@@ -241,7 +376,7 @@ export default function MonitoringView() {
    } finally {
      setExporting(false);
    }
-  }, [exporting, sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterProject, filterEntity, filterRentStatus, filterPlatePrefix, filterTargetName, filterRegion, filterPlates, appliedMileageRange, filterDate]);
+  }, [exporting, sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterProject, filterEntity, filterRentStatus, filterPlatePrefix, filterTargetNames, filterRegion, filterPlates, appliedMileageRange, filterDate]);
  // 每分钟自动刷新
  useEffect(() => {
@@ -307,7 +442,7 @@ export default function MonitoringView() {
      customer: filterCustomer !== 'All' ? filterCustomer : undefined,
      rentStatus: filterRentStatus !== 'All' ? filterRentStatus : undefined,
      platePrefix: filterPlatePrefix !== 'All' ? filterPlatePrefix : undefined,
-      targetName: filterTargetName !== 'All' ? filterTargetName : undefined,
+      targetNames: filterTargetNames.length > 0 ? filterTargetNames : undefined,
      region: filterRegion !== 'All' ? filterRegion : undefined,
      plate: filterPlates.length > 0 ? filterPlates.join(',') : undefined,
      date: filterDate || undefined,
@@ -316,7 +451,7 @@ export default function MonitoringView() {
      setFullscreenStats(d.stats);
      setFilterOptions(d.filters);
    }).catch(() => {}).finally(() => setFullscreenLoading(false));
-  }, [isFullscreen, sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterRentStatus, filterPlatePrefix, filterTargetName, filterRegion, filterPlates, filterDate, fullscreenRefresh]);
+  }, [isFullscreen, sortBy, sortOrder, searchTerm, filterDept, filterCustomer, filterRentStatus, filterPlatePrefix, filterTargetNames, filterRegion, filterPlates, filterDate, fullscreenRefresh]);
  // 全屏时禁止背景滚动
  useEffect(() => {
@@ -403,14 +538,14 @@ export default function MonitoringView() {
            <div className="flex-shrink-0 px-3 py-1 border-b border-slate-800/60 flex items-center justify-between">
              <div className="flex items-center gap-1 overflow-x-auto no-scrollbar">
                <button
-                  onClick={() => setFilterTargetName('All')}
+                  onClick={() => setFilterTargetNames([])}
-                  className={`px-2 py-0.5 rounded text-[8px] font-bold transition-all whitespace-nowrap ${filterTargetName === 'All' ? 'bg-blue-600 text-white' : 'bg-slate-800 text-slate-400 hover:bg-slate-700'}`}
+                  className={`px-2 py-0.5 rounded text-[8px] font-bold transition-all whitespace-nowrap ${filterTargetNames.length === 0 ? 'bg-blue-600 text-white' : 'bg-slate-800 text-slate-400 hover:bg-slate-700'}`}
                >全部</button>
                {filterOptions.targetNames.map(n => (
                  <button
                    key={n}
-                    onClick={() => setFilterTargetName(filterTargetName === n ? 'All' : n)}
+                    onClick={() => setFilterTargetNames(prev => prev.includes(n) ? prev.filter(item => item !== n) : [...prev, n])}
-                    className={`px-2 py-0.5 rounded text-[8px] font-bold transition-all whitespace-nowrap ${filterTargetName === n ? 'bg-blue-600 text-white' : 'bg-slate-800 text-slate-400 hover:bg-slate-700'}`}
+                    className={`px-2 py-0.5 rounded text-[8px] font-bold transition-all whitespace-nowrap ${filterTargetNames.includes(n) ? 'bg-blue-600 text-white' : 'bg-slate-800 text-slate-400 hover:bg-slate-700'}`}
                  >{n.replace(/交投|羚牛|恒运/, '').replace(/辆/, '台')}</button>
                ))}
              </div>
@@ -525,7 +660,9 @@ export default function MonitoringView() {
                    </tr>
                  </thead>
                  <tbody className="divide-y divide-slate-800/30">
-                    {fullscreenVehicles.map((v) => (
+                    {fullscreenVehicles.map((v) => {
                      const highMileageAlert = isHighMileageAlert(v);
                      return (
                      <tr key={v.plate} className="hover:bg-slate-800/20 transition-colors">
                        <td className="px-3 py-2 text-center">
                          <div className={`w-2 h-2 rounded-full mx-auto ${v.isOnline ? 'bg-green-500 shadow-[0_0_6px_rgba(34,197,94,0.4)]' : (v.isDataSynced || v.totalKm != null) ? 'bg-slate-600' : 'bg-amber-400 animate-pulse'}`}></div>
@@ -535,8 +672,8 @@ export default function MonitoringView() {
                        <td className="px-3 py-2 text-[11px] text-slate-400">{v.rentStatus || '-'}</td>
                        <td className="px-3 py-2 text-[11px] text-slate-400">{v.department || '-'}</td>
                        <td className="px-3 py-2 text-right">
-                          <span className={`text-xs font-mono font-bold ${(v.isDataSynced || v.totalKm != null) ? 'text-blue-400' : 'text-amber-400'}`}>
+                          <span className={`text-xs font-mono font-bold ${(v.isDataSynced || v.totalKm != null) ? (highMileageAlert ? 'text-red-400' : 'text-blue-400') : 'text-amber-400'}`}>
-                            {(v.isDataSynced || v.totalKm != null) ? <>{Math.max(0, v.dailyKm || 0).toLocaleString()} <span className="text-[8px] text-slate-500">km</span></> : <span className="text-[8px] text-amber-500/50">未对接</span>}
+                            {(v.isDataSynced || v.totalKm != null) ? <>{Math.max(0, v.dailyKm || 0).toLocaleString()} <span className={`text-[8px] ${highMileageAlert ? 'text-red-400/70' : 'text-slate-500'}`}>km</span></> : <span className="text-[8px] text-amber-500/50">未对接</span>}
                          </span>
                        </td>
                        <td className="px-3 py-2 text-right">
@@ -545,7 +682,8 @@ export default function MonitoringView() {
                          </span>
                        </td>
                      </tr>
-                    ))}
+                      );
                    })}
                  </tbody>
                </table>
              </div>
@@ -581,7 +719,7 @@ export default function MonitoringView() {
              </div>
              <div className="flex items-center gap-1.5 mt-1">
                <span className="flex h-1.5 w-1.5 rounded-full bg-blue-500 animate-pulse"></span>
-                <span className="text-[9px] font-bold text-slate-400 uppercase tracking-tight">实时监控 • 每分钟更新</span>
+                <span className="text-[9px] font-bold text-slate-400 uppercase tracking-tight">数据监控 • 每15分钟更新</span>
              </div>
            </div>
          </div>
@@ -614,10 +752,10 @@ export default function MonitoringView() {
        {/* Bottom Row: 外部三选 (批次型号 / 运营区域 / 车牌多选) + 详情筛选 */}
        <div className="flex items-center gap-2">
          <div className="flex-1 grid grid-cols-3 gap-1.5">
-            <SearchableSelect
+            <BatchMultiSelect
              options={filterOptions.targetNames}
-              value={filterTargetName}
+              selected={filterTargetNames}
-              onChange={setFilterTargetName}
+              onChange={setFilterTargetNames}
              placeholder="批次型号"
            />
            <SearchableSelect
@@ -636,7 +774,7 @@ export default function MonitoringView() {
          <button
            onClick={() => setIsFilterOpen(!isFilterOpen)}
-            className={`p-1.5 rounded-lg transition-all flex-shrink-0 ${isFilterOpen || searchTerm || filterDept !== 'All' || filterCustomer !== 'All' || filterRentStatus !== 'All' || filterPlates.length > 0 || filterProject !== 'All' ? 'bg-blue-50 text-blue-600 border border-blue-100' : 'bg-slate-50 text-slate-400 border border-transparent'}`}
+            className={`p-1.5 rounded-lg transition-all flex-shrink-0 ${isFilterOpen || searchTerm || filterDept !== 'All' || filterCustomer !== 'All' || filterRentStatus !== 'All' || filterPlates.length > 0 || filterProject !== 'All' || filterTargetNames.length > 0 ? 'bg-blue-50 text-blue-600 border border-blue-100' : 'bg-slate-50 text-slate-400 border border-transparent'}`}
          >
            <Filter size={16} />
          </button>
@@ -784,7 +922,7 @@ export default function MonitoringView() {
                    setFilterProject('All');
                    setFilterEntity('All');
                    setFilterPlatePrefix('All');
-                    setFilterTargetName('All');
+                    setFilterTargetNames([]);
                    setFilterRegion('All');
                    setFilterMileageRange({ min: '', max: '' });
                    setAppliedMileageRange({ min: '', max: '' });
@@ -811,7 +949,10 @@ export default function MonitoringView() {
      {/* Active Filter Tags */}
      {(() => {
        const tags: { label: string; onClear: () => void }[] = [];
-        if (filterTargetName !== 'All') tags.push({ label: `批次: ${filterTargetName}`, onClear: () => setFilterTargetName('All') });
+        if (filterTargetNames.length > 0) tags.push({
          label: filterTargetNames.length === filterOptions.targetNames.length ? '批次: 全部批次' : `批次: ${filterTargetNames.length === 1 ? filterTargetNames[0] : `${filterTargetNames[0]} 等${filterTargetNames.length}`}`,
          onClear: () => setFilterTargetNames([])
        });
        if (filterRegion !== 'All') tags.push({ label: `区域: ${filterRegion}`, onClear: () => setFilterRegion('All') });
        if (filterPlates.length > 0) tags.push({ label: `车牌: ${filterPlates.length === 1 ? filterPlates[0] : `${filterPlates[0]} 等${filterPlates.length}`}`, onClear: () => setFilterPlates([]) });
        if (filterRentStatus !== 'All') tags.push({ label: `状态: ${filterRentStatus}`, onClear: () => setFilterRentStatus('All') });
@@ -827,7 +968,7 @@ export default function MonitoringView() {
        if (tags.length === 0) return null;
        const clearAll = () => {
          setFilterDept('All'); setFilterCustomer('All'); setFilterRentStatus('All'); setFilterProject('All'); setFilterEntity('All');
-          setFilterPlates([]); setSearchTerm(''); setFilterPlatePrefix('All'); setFilterTargetName('All'); setFilterRegion('All');
+          setFilterPlates([]); setSearchTerm(''); setFilterPlatePrefix('All'); setFilterTargetNames([]); setFilterRegion('All');
          setFilterMileageRange({ min: '', max: '' }); setAppliedMileageRange({ min: '', max: '' });
          setFilterDate('');
        };
@@ -896,7 +1037,9 @@ export default function MonitoringView() {
        )}
        <div className="grid grid-cols-1 gap-1.5">
-          {filteredVehicles.map((v) => (
+          {filteredVehicles.map((v) => {
            const highMileageAlert = isHighMileageAlert(v);
            return (
            <motion.div
              initial={{ opacity: 0 }}
              animate={{ opacity: 1 }}
@@ -930,8 +1073,8 @@ export default function MonitoringView() {
                    <div className="w-2 h-2 rounded-full bg-amber-400 animate-pulse" title="未对接车机数据"></div>
                  )}
                  <span className="text-[7px] font-black text-blue-600/40 bg-blue-50 w-3 h-3 rounded flex items-center justify-center leading-none">今</span>
-                  <div className={`text-sm font-black leading-none ${(v.isDataSynced || v.totalKm != null) ? 'text-blue-600' : 'text-amber-600'}`}>
+                  <div className={`text-sm font-black leading-none ${(v.isDataSynced || v.totalKm != null) ? (highMileageAlert ? 'text-red-600' : 'text-blue-600') : 'text-amber-600'}`}>
-                    {(v.isDataSynced || v.totalKm != null) ? <>{Math.max(0, v.dailyKm || 0).toLocaleString()} <span className="text-[8px] text-slate-400">km</span></> : <span className="text-[7px] text-amber-500/70">未对接</span>}
+                    {(v.isDataSynced || v.totalKm != null) ? <>{Math.max(0, v.dailyKm || 0).toLocaleString()} <span className={`text-[8px] ${highMileageAlert ? 'text-red-400' : 'text-slate-400'}`}>km</span></> : <span className="text-[7px] text-amber-500/70">未对接</span>}
                  </div>
                </div>
                <div className="flex items-center gap-1">
@@ -942,7 +1085,8 @@ export default function MonitoringView() {
                </div>
              </div>
            </motion.div>
-          ))}
+            );
          })}
        </div>
        {filteredVehicles.length === 0 && !loadingMore && (
--- a/src/modules/mileage/StatisticsView.tsx
+++ b/src/modules/mileage/StatisticsView.tsx
@@ -381,16 +381,12 @@ export default function StatisticsView() {
                              <p className="text-[10px] font-black text-slate-700">{fmtKm(assessment.target)} km</p>
                            </div>
                            <div className="space-y-0.5">
-                              <p className="text-[8px] font-bold text-slate-400 uppercase tracking-wider">{assessment.label}累计里程</p>
+                              <p className="text-[8px] font-bold text-slate-400 uppercase tracking-wider">{assessment.label}已完成</p>
-                              <p className="text-[10px] font-black text-slate-700">{fmtKm(assessment.actualMileage)} km</p>
+                              <p className="text-[10px] font-black text-emerald-600">{fmtKm(assessment.completed)} km</p>
                              <p className="text-[8px] font-bold text-slate-300">
                                数据截至 {assessment.daysLeft === 0 ? fmtDateLabel(assessment.endDate) : currentDateLabel}
                              </p>
                            </div>
                            <div className="space-y-0.5">
                              <p className="text-[8px] font-bold text-slate-400 uppercase tracking-wider">{assessment.label}计入完成</p>
                              <p className="text-[10px] font-black text-emerald-600">{fmtKm(assessment.completed)} km</p>
                            </div>
                            <div className="space-y-0.5">
                              <p className="text-[8px] font-bold text-slate-400 uppercase tracking-wider">{assessment.label}完成率</p>
                              <p className="text-[10px] font-black text-blue-600">{fmtPercent(assessment.completionRate)}</p>
--- a/src/modules/mileage/api.ts
+++ b/src/modules/mileage/api.ts
@@ -16,6 +16,7 @@ export async function fetchMonitoring(params?: {
  rentStatus?: string;
  platePrefix?: string;
  targetName?: string;
  targetNames?: string[];
  region?: string;
  plate?: string;
  mileageMin?: string;
@@ -35,6 +36,11 @@ export async function fetchMonitoring(params?: {
  if (params?.rentStatus) query.set('rentStatus', params.rentStatus);
  if (params?.platePrefix) query.set('platePrefix', params.platePrefix);
  if (params?.targetName) query.set('targetName', params.targetName);
  if (params?.targetNames) {
    params.targetNames.forEach(name => {
      if (name) query.append('targetName', name);
    });
  }
  if (params?.region) query.set('region', params.region);
  if (params?.plate) query.set('plate', params.plate);
  if (params?.mileageMin) query.set('mileageMin', params.mileageMin);
--- a/src/modules/mileage/types.ts
+++ b/src/modules/mileage/types.ts
@@ -13,6 +13,7 @@ export interface MonitoringVehicle {
  entity: string | null;
  project: string | null;
  region: string | null;
  targetNames: string[];
 }
 export interface MonitoringStats {
@@ -83,7 +84,6 @@ export interface TargetYearlyAssessment {
  label: string;
  vehicleCount: number;
  target: number;
  actualMileage: number;
  completed: number;
  remaining: number;
  completionRate: number;
--- a/src/modules/mileage/xlsx-export.ts
+++ b/src/modules/mileage/xlsx-export.ts
@@ -20,9 +20,9 @@ function mileageCell(v: MonitoringVehicle, kind: 'today' | 'total'): string | nu
  if (kind === 'today') {
    // 当日未对接但有历史累计，视作今日 0；只有完全无数据才标「未对接」
    if (!v.isDataSynced && v.totalKm == null) return '未对接';
-    return Math.max(0, Math.round(v.dailyKm || 0));
+    return Math.max(0, v.dailyKm || 0);
  }
-  return v.totalKm != null ? Math.round(v.totalKm) : '未对接';
+  return v.totalKm != null ? v.totalKm : '未对接';
 }
 export function exportMileageXlsx(vehicles: MonitoringVehicle[], ctx: ExportContext): void {
@@ -57,6 +57,13 @@ export function exportMileageXlsx(vehicles: MonitoringVehicle[], ctx: ExportCont
  ws['!freeze'] = { xSplit: 0, ySplit: 1 } as never;
  for (let r = 1; r < data.length; r++) {
    for (const c of [7, 8]) {
      const ref = XLSX.utils.encode_cell({ r, c });
      if (ws[ref]?.t === 'n') ws[ref].z = '0.##########';
    }
  }
  // 表头样式（在客户端 SheetJS 社区版仅基本样式生效）
  for (let c = 0; c < HEADERS.length; c++) {
    const ref = XLSX.utils.encode_cell({ r: 0, c });
--- a/src/server/auth/login.ts
+++ b/src/server/auth/login.ts
@@ -52,11 +52,15 @@ app.get('/exchange', async (c) => {
    // 查询 depCode 对应的部门名称
    let depName = '';
    if (userInfo.depCode) {
-      const [rows] = await pool.execute(
+      try {
-        'SELECT dep_name FROM tab_department WHERE dep_code = ? AND is_deleted = 0 LIMIT 1',
+        const [rows] = await pool.execute(
-        [userInfo.depCode]
+          'SELECT dep_name FROM tab_department WHERE dep_code = ? AND is_deleted = 0 LIMIT 1',
-      ) as [{ dep_name: string }[], unknown];
+          [userInfo.depCode]
-      depName = rows[0]?.dep_name || '';
+        ) as [{ dep_name: string }[], unknown];
        depName = rows[0]?.dep_name || '';
      } catch (e: any) {
        if (e?.code !== 'ER_NO_SUCH_TABLE') throw e;
      }
    }
    const payload: JwtPayload = {
--- a/src/server/mileage-db.ts
+++ b/src/server/mileage-db.ts
@@ -1,11 +1,14 @@
 import mysql from 'mysql2/promise';
 import dotenv from 'dotenv';
 dotenv.config();
 const mileagePool = mysql.createPool({
-  host: '101.133.130.65',
+  host: process.env.MILEAGE_DB_HOST || '101.133.130.65',
-  port: 3306,
+  port: Number(process.env.MILEAGE_DB_PORT) || 3306,
-  user: 'bi_reader_02',
+  user: process.env.MILEAGE_DB_USER || 'bi_reader_02',
-  password: 'bi_reader_02_Pass',
+  password: process.env.MILEAGE_DB_PASSWORD || 'bi_reader_02_Pass',
-  database: 'hydrogen_energy',
+  database: process.env.MILEAGE_DB_NAME || 'hydrogen_energy',
  waitForConnections: true,
  connectionLimit: 5,
  queueLimit: 0,
--- a/src/server/routes/ele/index.ts
+++ b/src/server/routes/ele/index.ts
@@ -149,8 +149,8 @@ async function buildPlateLookup(plates: Set<string>): Promise<Map<string, string
  const placeholders = arr.map(() => '?').join(',');
  const [rows] = await pool.query<RowDataPacket[]>(
    `SELECT plate_number, CAST(id AS CHAR) AS truck_id
-       FROM tab_truck
+       FROM vehicle_info
-       WHERE is_deleted = 0 AND plate_number IN (${placeholders})`,
+       WHERE del_flag = '0' AND plate_number IN (${placeholders})`,
    arr,
  );
  const map = new Map<string, string>();
--- a/src/server/routes/mileage/cache.ts
+++ b/src/server/routes/mileage/cache.ts
@@ -65,12 +65,47 @@ interface MileageRow {
  source: string;
 }
 interface TargetRow {
  id: number;
  target_name: string;
  plate_number: string;
 }
 async function fetchTargetRows(): Promise<TargetRow[]> {
  return pool.execute(
    `SELECT t.id, t.target_name, v.plate_number
     FROM lingniu_prod.tab_mileage_assessment_target t
     JOIN lingniu_prod.tab_mileage_assessment_vehicle v ON v.target_id = t.id AND v.is_deleted = 0
     WHERE t.is_deleted = 0`
  ).then(([rows]) => rows as TargetRow[]);
 }
 function buildTargetPlatesMap(targetRows: TargetRow[]): Map<string, Set<string>> {
  const targetPlatesMap = new Map<string, Set<string>>();
  for (const r of targetRows) {
    const set = targetPlatesMap.get(r.target_name) || new Set();
    set.add(r.plate_number);
    targetPlatesMap.set(r.target_name, set);
  }
  return targetPlatesMap;
 }
 function buildPlateTargetNamesMap(targetRows: TargetRow[]): Map<string, string[]> {
  const map = new Map<string, string[]>();
  for (const r of targetRows) {
    const list = map.get(r.plate_number) || [];
    list.push(r.target_name);
    map.set(r.plate_number, list);
  }
  return map;
 }
 async function fetchBizTotalMileageMap(): Promise<Map<string, number>> {
  // v_vehicle_daily_stats.total_km 对 G7S 数据源常为 NULL（G7 只回传日增量），
-  // 业务库 tab_mileage_assessment_vehicle.vehicle_total_mileage 是累加后的权威累计值，
+  // 业务库 lingniu_prod.tab_mileage_assessment_vehicle.vehicle_total_mileage 是累加后的权威累计值，
  // 用它兜底保证 totalKm 汇总完整。
  const [rows] = await pool.execute(
-    'SELECT plate_number, vehicle_total_mileage FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0'
+    'SELECT plate_number, vehicle_total_mileage FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0'
  ) as [{ plate_number: string; vehicle_total_mileage: string | number | null }[], unknown];
  const map = new Map<string, number>();
  for (const r of rows) {
@@ -115,6 +150,7 @@ function mergeVehicles(
  yesterdayMap: Map<string, number>,
  bizTotalMap: Map<string, number>,
  latestPgTotalMap: Map<string, number>,
  targetNamesByPlate: Map<string, string[]>,
 ): CachedVehicle[] {
  const mileageMap = new Map<string, MileageRow>();
  for (const row of mileageRows) {
@@ -147,6 +183,7 @@ function mergeVehicles(
      entity: info?.entity || null,
      project: info?.project || null,
      region: regionMap[m.plate] || null,
      targetNames: targetNamesByPlate.get(m.plate) || [],
      yesterdayKm: yesterdayMap.get(m.plate) || 0,
    };
  });
@@ -184,25 +221,16 @@ export async function refreshMonitoringCache(): Promise<void> {
        return map;
      })(),
      fetchVehicleInfoMap(),
-      pool.execute(
+      fetchTargetRows(),
        `SELECT t.id, t.target_name, v.plate_number
         FROM tab_mileage_assessment_target t
         JOIN tab_mileage_assessment_vehicle v ON v.target_id = t.id AND v.is_deleted = 0
         WHERE t.is_deleted = 0`
      ).then(([rows]) => rows as { id: number; target_name: string; plate_number: string }[]),
      fetchBizTotalMileageMap(),
      fetchLatestPgTotalMileageMap(),
    ]);
-    const targetPlatesMap = new Map<string, Set<string>>();
+    const targetPlatesMap = buildTargetPlatesMap(targetRows);
-    for (const r of targetRows) {
+    const targetNamesByPlate = buildPlateTargetNamesMap(targetRows);
      const set = targetPlatesMap.get(r.target_name) || new Set();
      set.add(r.plate_number);
      targetPlatesMap.set(r.target_name, set);
    }
    const targetNames = Array.from(targetPlatesMap.keys());
-    const vehicles = mergeVehicles(mileageRows, infoMap, yesterdayMap, bizTotalMap, latestPgTotalMap);
+    const vehicles = mergeVehicles(mileageRows, infoMap, yesterdayMap, bizTotalMap, latestPgTotalMap, targetNamesByPlate);
    const totalToday = vehicles.reduce((sum, v) => sum + v.dailyKm, 0);
    const totalAll = vehicles.reduce((sum, v) => sum + (v.totalKm || 0), 0);
@@ -221,7 +249,7 @@ export async function refreshMonitoringCache(): Promise<void> {
 }
 export async function queryDateMileage(dateStr: string): Promise<CachedVehicle[]> {
-  const [mileageRows, yesterdayRows, infoMap, bizTotalMap, latestPgTotalMap] = await Promise.all([
+  const [mileageRows, yesterdayRows, infoMap, targetRows, bizTotalMap, latestPgTotalMap] = await Promise.all([
    mileagePool.execute(
      'SELECT plate, vin, daily_km, total_km, source FROM v_vehicle_daily_stats WHERE stat_date = ?',
      [dateStr]
@@ -231,6 +259,7 @@ export async function queryDateMileage(dateStr: string): Promise<CachedVehicle[]
      [dateStr]
    ).then(([r]) => r as { plate: string; daily_km: string }[]),
    fetchVehicleInfoMap(),
    fetchTargetRows(),
    fetchBizTotalMileageMap(),
    fetchLatestPgTotalMileageMap(dateStr),
  ]);
@@ -242,7 +271,14 @@ export async function queryDateMileage(dateStr: string): Promise<CachedVehicle[]
    if (km > existing) yesterdayMap.set(r.plate, km);
  }
-  return mergeVehicles(mileageRows, infoMap, yesterdayMap, bizTotalMap, latestPgTotalMap);
+  return mergeVehicles(
    mileageRows,
    infoMap,
    yesterdayMap,
    bizTotalMap,
    latestPgTotalMap,
    buildPlateTargetNamesMap(targetRows),
  );
 }
 export function buildDateFilters(vehicles: CachedVehicle[]): MonitoringFilters {
--- a/src/server/routes/mileage/monitoring.ts
+++ b/src/server/routes/mileage/monitoring.ts
@@ -19,7 +19,7 @@ const EMPTY_RESPONSE: MonitoringResponse = {
 function applyFilters(vehicles: CachedVehicle[], params: {
  search: string; dept: string; customer: string; project: string;
  entity: string; rentStatus: string; plate: string; platePrefix: string;
-  targetName: string; region: string; mileageMin: string; mileageMax: string;
+  targetNames: string[]; region: string; mileageMin: string; mileageMax: string;
 }): CachedVehicle[] {
  let result = vehicles;
@@ -42,10 +42,9 @@ function applyFilters(vehicles: CachedVehicle[], params: {
  }
  if (params.platePrefix) result = result.filter(v => v.plate.startsWith(params.platePrefix));
  if (params.region) result = result.filter(v => v.region === params.region);
-  if (params.targetName) {
+  if (params.targetNames.length > 0) {
-    const cache = getCache();
+    const selectedTargets = new Set(params.targetNames);
-    const tPlates = cache?.targetPlatesMap.get(params.targetName);
+    result = result.filter(v => v.targetNames.some(targetName => selectedTargets.has(targetName)));
    result = tPlates ? result.filter(v => tPlates.has(v.plate)) : [];
  }
  if (params.mileageMin) result = result.filter(v => v.dailyKm >= Number(params.mileageMin));
  if (params.mileageMax) result = result.filter(v => v.dailyKm <= Number(params.mileageMax));
@@ -53,6 +52,18 @@ function applyFilters(vehicles: CachedVehicle[], params: {
  return result;
 }
 function parseTargetNames(reqUrl: string): string[] {
  const params = new URL(reqUrl).searchParams;
  const raw = [
    ...params.getAll('targetName'),
    ...params.getAll('targetNames'),
  ];
  const names = raw.flatMap(item => item.split(','))
    .map(item => item.trim())
    .filter(Boolean);
  return Array.from(new Set(names));
 }
 app.get('/', async (c) => {
  const sortBy = c.req.query('sortBy') || 'today';
  const sortOrder = c.req.query('sortOrder') || 'desc';
@@ -69,7 +80,7 @@ app.get('/', async (c) => {
    rentStatus: c.req.query('rentStatus') || '',
    plate: c.req.query('plate') || '',
    platePrefix: c.req.query('platePrefix') || '',
-    targetName: c.req.query('targetName') || '',
+    targetNames: parseTargetNames(c.req.url),
    region: c.req.query('region') || '',
    mileageMin: c.req.query('mileageMin') || '',
    mileageMax: c.req.query('mileageMax') || '',
--- a/src/server/routes/mileage/targets.ts
+++ b/src/server/routes/mileage/targets.ts
@@ -1,7 +1,7 @@
 import { Hono } from 'hono';
 import pool from '../../db.js';
 import mileagePool from '../../mileage-db.js';
-import { getCache, queryDateMileage } from './cache.js';
+import { getCache } from './cache.js';
 import { fetchVehicleInfoByPlates } from './vehicle-info.js';
 import { filterByPermission, maskCustomerNames } from '../../auth/permissions.js';
@@ -10,7 +10,7 @@ const app = new Hono();
 app.get('/', async (c) => {
  try {
    const [targets] = await pool.execute(
-      'SELECT * FROM tab_mileage_assessment_target WHERE is_deleted = 0 ORDER BY id'
+      'SELECT * FROM lingniu_prod.tab_mileage_assessment_target WHERE is_deleted = 0 ORDER BY id'
    ) as [any[], unknown];
    const [vehicleStats] = await pool.execute(`
@@ -25,7 +25,7 @@ app.get('/', async (c) => {
        SUM(current_year_mileage_task) as current_year_target,
        SUM(current_year_mileage) as current_year_completed,
        MAX(current_year_assessment_end_date) as year_end_date
-      FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0
+      FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0
      GROUP BY target_id
    `) as [any[], unknown];
@@ -44,8 +44,8 @@ app.get('/', async (c) => {
        SUM(CASE WHEN v.current_mileage >= t.annual_mileage_per_vehicle * 0.5 THEN 1 ELSE 0 END) as first_year_half_qualified_count,
        DATE_FORMAT(MIN(v.assessment_start_date), '%Y-%m-%d') as first_year_start_date,
        DATE_FORMAT(MAX(DATE_SUB(DATE_ADD(v.assessment_start_date, INTERVAL 1 YEAR), INTERVAL 1 DAY)), '%Y-%m-%d') as first_year_end_date
-      FROM tab_mileage_assessment_vehicle v
+      FROM lingniu_prod.tab_mileage_assessment_vehicle v
-      JOIN tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
+      JOIN lingniu_prod.tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
      WHERE v.is_deleted = 0
      GROUP BY v.target_id
    `) as [any[], unknown];
@@ -67,8 +67,8 @@ app.get('/', async (c) => {
        SUM(CASE WHEN v.current_mileage >= t.annual_mileage_per_vehicle * y.year_number * 0.5 THEN 1 ELSE 0 END) as half_qualified_count,
        DATE_FORMAT(MIN(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number - 1 YEAR)), '%Y-%m-%d') as start_date,
        DATE_FORMAT(MAX(DATE_SUB(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number YEAR), INTERVAL 1 DAY)), '%Y-%m-%d') as end_date
-      FROM tab_mileage_assessment_vehicle v
+      FROM lingniu_prod.tab_mileage_assessment_vehicle v
-      JOIN tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
+      JOIN lingniu_prod.tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
      JOIN (
        SELECT 1 as year_number UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
      ) y ON y.year_number <= LEAST(t.assessment_years, v.current_year_number)
@@ -91,8 +91,8 @@ app.get('/', async (c) => {
        DATE_FORMAT(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number - 1 YEAR), '%Y-%m-%d') as start_date,
        DATE_FORMAT(DATE_SUB(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number YEAR), INTERVAL 1 DAY), '%Y-%m-%d') as end_date,
        COUNT(*) as cnt
-      FROM tab_mileage_assessment_vehicle v
+      FROM lingniu_prod.tab_mileage_assessment_vehicle v
-      JOIN tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
+      JOIN lingniu_prod.tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
      JOIN (
        SELECT 1 as year_number UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
      ) y ON y.year_number <= LEAST(t.assessment_years, v.current_year_number)
@@ -114,7 +114,7 @@ app.get('/', async (c) => {
             DATE_FORMAT(assessment_start_date, '%Y-%m-%d') as start_date,
             DATE_FORMAT(assessment_end_date, '%Y-%m-%d') as end_date,
             COUNT(*) as cnt
-      FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0
+      FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0
      GROUP BY target_id, assessment_start_date, assessment_end_date
      ORDER BY target_id, assessment_start_date
    `) as [any[], unknown];
@@ -135,17 +135,8 @@ app.get('/', async (c) => {
    }
    const [targetVehicleRows] = await pool.execute(
-      `SELECT target_id, plate_number, current_mileage, current_year_number,
+      'SELECT target_id, plate_number FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0'
-              DATE_FORMAT(assessment_start_date, '%Y-%m-%d') as assessment_start_date
+    ) as [{ target_id: number; plate_number: string }[], unknown];
       FROM tab_mileage_assessment_vehicle
       WHERE is_deleted = 0`
    ) as [{
      target_id: number;
      plate_number: string;
      current_mileage: string | number | null;
      current_year_number: number;
      assessment_start_date: string;
    }[], unknown];
    const targetIdPlatesMap = new Map<number, string[]>();
    for (const r of targetVehicleRows) {
@@ -154,113 +145,6 @@ app.get('/', async (c) => {
      targetIdPlatesMap.set(r.target_id, list);
    }
    const targetRuleMap = new Map<number, any>();
    for (const t of targets) targetRuleMap.set(t.id, t);
    function formatUtcDate(date: Date): string {
      return `${date.getUTCFullYear()}-${String(date.getUTCMonth() + 1).padStart(2, '0')}-${String(date.getUTCDate()).padStart(2, '0')}`;
    }
    function addYearsMinusOneDay(dateStr: string, years: number): string {
      const date = new Date(`${dateStr}T00:00:00Z`);
      date.setUTCFullYear(date.getUTCFullYear() + years);
      date.setUTCDate(date.getUTCDate() - 1);
      return formatUtcDate(date);
    }
    function round2(value: number): number {
      return Math.round(value * 100) / 100;
    }
    const todayStr = new Intl.DateTimeFormat('en-CA', { timeZone: 'Asia/Shanghai' }).format(new Date());
    const endedPeriodDates: string[] = [];
    for (const row of targetVehicleRows) {
      const target = targetRuleMap.get(row.target_id);
      const maxYear = Math.min(Number(target?.assessment_years) || 0, Number(row.current_year_number) || 0);
      for (let year = 1; year <= maxYear; year++) {
        const endDate = addYearsMinusOneDay(row.assessment_start_date, year);
        if (endDate < todayStr) endedPeriodDates.push(endDate);
      }
    }
    const cutoffMileageMapByDate = new Map<string, Map<string, number>>();
    for (const date of Array.from(new Set(endedPeriodDates))) {
      const vehicles = await queryDateMileage(date);
      const map = new Map<string, number>();
      for (const vehicle of vehicles) {
        if (vehicle.totalKm != null) map.set(vehicle.plate, vehicle.totalKm);
      }
      cutoffMileageMapByDate.set(date, map);
    }
    const currentMileageMap = new Map<string, number>();
    for (const vehicle of await queryDateMileage(todayStr)) {
      if (vehicle.totalKm != null) currentMileageMap.set(vehicle.plate, vehicle.totalKm);
    }
    const yearlyMetricMap = new Map<string, {
      actualMileage: number;
      completed: number;
      remaining: number;
      completionRate: number;
      qualifiedCount: number;
      qualifiedRate: number;
      halfQualifiedCount: number;
    }>();
    const yearlyMetricDraftMap = new Map<string, {
      target: number;
      actualMileage: number;
      completed: number;
      remaining: number;
      vehicleCount: number;
      qualifiedCount: number;
      halfQualifiedCount: number;
    }>();
    for (const row of targetVehicleRows) {
      const target = targetRuleMap.get(row.target_id);
      const annualMileage = Number(target?.annual_mileage_per_vehicle) || 0;
      const maxYear = Math.min(Number(target?.assessment_years) || 0, Number(row.current_year_number) || 0);
      for (let year = 1; year <= maxYear; year++) {
        const key = `${row.target_id}-${year}`;
        const goal = annualMileage * year;
        const endDate = addYearsMinusOneDay(row.assessment_start_date, year);
        const cutoffMap = endDate < todayStr ? cutoffMileageMapByDate.get(endDate) : currentMileageMap;
        const mileageAtCutoff = Math.max(0, cutoffMap?.get(row.plate_number) ?? (Number(row.current_mileage) || 0));
        const completed = Math.min(mileageAtCutoff, goal);
        const draft = yearlyMetricDraftMap.get(key) || {
          target: 0,
          actualMileage: 0,
          completed: 0,
          remaining: 0,
          vehicleCount: 0,
          qualifiedCount: 0,
          halfQualifiedCount: 0,
        };
        draft.target += goal;
        draft.actualMileage += mileageAtCutoff;
        draft.completed += completed;
        draft.remaining += Math.max(goal - mileageAtCutoff, 0);
        draft.vehicleCount += 1;
        if (mileageAtCutoff >= goal) draft.qualifiedCount += 1;
        if (mileageAtCutoff >= goal * 0.5) draft.halfQualifiedCount += 1;
        yearlyMetricDraftMap.set(key, draft);
      }
    }
    for (const [key, draft] of yearlyMetricDraftMap) {
      yearlyMetricMap.set(key, {
        actualMileage: round2(draft.actualMileage),
        completed: round2(draft.completed),
        remaining: round2(draft.remaining),
        completionRate: round2(draft.target > 0 ? (draft.completed / draft.target) * 100 : 0),
        qualifiedCount: draft.qualifiedCount,
        qualifiedRate: round2(draft.vehicleCount > 0 ? (draft.qualifiedCount / draft.vehicleCount) * 100 : 0),
        halfQualifiedCount: draft.halfQualifiedCount,
      });
    }
    const now = new Date();
    const result = targets.map((t: any) => {
      const s = statsMap.get(t.id) || {};
@@ -283,22 +167,20 @@ app.get('/', async (c) => {
        const endDate = row.end_date ? new Date(row.end_date) : now;
        const assessmentDaysLeft = Math.max(0, Math.ceil((endDate.getTime() - now.getTime()) / 86400000));
        const yearNumber = Number(row.year_number) || 0;
        const cutoffMetrics = yearlyMetricMap.get(`${row.target_id}-${row.year_number}`);
        return {
          yearNumber,
          label: `第${yearNumber}年`,
          vehicleCount,
          target: Number(row.target_mileage) || 0,
-          actualMileage: cutoffMetrics?.actualMileage ?? (Number(row.completed_mileage) || 0),
+          completed: Number(row.completed_mileage) || 0,
-          completed: cutoffMetrics?.completed ?? (Number(row.completed_mileage) || 0),
+          remaining: remainingMileage,
-          remaining: cutoffMetrics?.remaining ?? remainingMileage,
+          completionRate: (Number(row.completion_rate) || 0) * 100,
-          completionRate: cutoffMetrics?.completionRate ?? ((Number(row.completion_rate) || 0) * 100),
+          qualifiedCount,
-          qualifiedCount: cutoffMetrics?.qualifiedCount ?? qualifiedCount,
+          qualifiedRate: vehicleCount > 0 ? (qualifiedCount / vehicleCount) * 100 : 0,
-          qualifiedRate: cutoffMetrics?.qualifiedRate ?? (vehicleCount > 0 ? (qualifiedCount / vehicleCount) * 100 : 0),
+          halfQualifiedCount: Number(row.half_qualified_count) || 0,
          halfQualifiedCount: cutoffMetrics?.halfQualifiedCount ?? (Number(row.half_qualified_count) || 0),
          daysLeft: assessmentDaysLeft,
-          dailyTarget: assessmentDaysLeft > 0 ? Math.round(((cutoffMetrics?.remaining ?? remainingMileage) / assessmentDaysLeft) * 10) / 10 : 0,
+          dailyTarget: assessmentDaysLeft > 0 ? Math.round((remainingMileage / assessmentDaysLeft) * 10) / 10 : 0,
          startDate: row.start_date || null,
          endDate: row.end_date || null,
          periods: yearlyPeriodsMap.get(`${row.target_id}-${row.year_number}`) || [],
@@ -363,7 +245,7 @@ app.get('/:id/vehicles', async (c) => {
      `SELECT plate_number, today_mileage, vehicle_total_mileage,
              completion_rate, is_qualified, current_year_is_qualified,
              daily_required_mileage
-       FROM tab_mileage_assessment_vehicle
+       FROM lingniu_prod.tab_mileage_assessment_vehicle
       WHERE target_id = ? AND is_deleted = 0
       ORDER BY today_mileage DESC`,
      [targetId]
--- a/src/server/routes/mileage/trend.ts
+++ b/src/server/routes/mileage/trend.ts
@@ -12,7 +12,7 @@ app.get('/', async (c) => {
    let plates: string[] = [];
    if (targetId) {
      const [vehicleRows] = await pool.execute(
-        'SELECT plate_number FROM tab_mileage_assessment_vehicle WHERE target_id = ? AND is_deleted = 0',
+        'SELECT plate_number FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE target_id = ? AND is_deleted = 0',
        [targetId]
      ) as [{ plate_number: string }[], unknown];
      plates = vehicleRows.map(r => r.plate_number);
--- a/src/server/routes/mileage/types.ts
+++ b/src/server/routes/mileage/types.ts
@@ -15,6 +15,7 @@ export interface CachedVehicle {
  entity: string | null;
  project: string | null;
  region: string | null;
  targetNames: string[];
  yesterdayKm: number;
 }
--- a/src/server/routes/mileage/vehicle-info.ts
+++ b/src/server/routes/mileage/vehicle-info.ts
@@ -3,24 +3,42 @@ import type { VehicleInfoRow } from './types.js';
 /** 车辆关联信息 SQL（客户名、部门、经理、租赁状态、主体、项目） */
 export const VEHICLE_INFO_SQL = `SELECT
-    truck.plate_number AS plate,
+    vi.plate_number AS plate,
-    cus.customer_name AS customer,
+    COALESCE(c.customer_name, vor.customer_name, ci.customer_name) AS customer,
-    dep.dep_name AS department,
+    COALESCE(c.business_department_name, vor.business_dept) AS department,
-    u.user_name AS manager,
+    COALESCE(c.business_manager_name, vor.business_manager) AS manager,
-    CAST(c.bd AS CHAR) AS manager_id,
+    CAST(COALESCE(c.business_manager_id, vi.business_id) AS CHAR) AS manager_id,
-    dic_status.dic_name AS rent_status,
+    CASE vs.operation_status
-    org_truck.org_name AS entity,
+      WHEN '1' THEN '租赁'
-    c.project_name AS project
+      WHEN '2' THEN '自营'
-FROM tab_truck truck
+      WHEN '3' THEN '可运营'
-LEFT JOIN tab_truck_status_info si ON si.truck_id = truck.id AND si.is_deleted = 0
+      WHEN '4' THEN '待运营'
-LEFT JOIN tab_contract c ON c.id = si.contract_id AND c.is_deleted = 0
+      WHEN '5' THEN '退出运营'
-LEFT JOIN tab_customer cus ON cus.id = c.customer_id AND cus.is_deleted = 0
+      ELSE vs.operation_status
-LEFT JOIN tab_user u ON u.id = c.bd AND u.is_deleted = 0
+    END AS rent_status,
-LEFT JOIN tab_department dep ON dep.id = u.dep_id AND dep.is_deleted = 0
+    NULLIF(vi.registered_ownership, '') AS entity,
-LEFT JOIN tab_dic dic_status ON dic_status.parent_code = 'dic_truck_rent_status'
+    COALESCE(c.project_name, vor.project_name) AS project
-      AND dic_status.dic_code = truck.truck_rent_status AND dic_status.is_deleted = 0
+FROM vehicle_info vi
-LEFT JOIN tab_org org_truck ON org_truck.id = truck.org_id AND org_truck.is_deleted = 0
+LEFT JOIN vehicle_status vs
-WHERE truck.is_deleted = 0 AND truck.is_operation = 1`;
+       ON vs.vehicle_id = vi.id
      AND vs.del_flag = 0
 LEFT JOIN vehicle_lease_order_record vor
       ON vor.vehicle_id = vi.id
      AND vor.del_flag = '0'
      AND vor.id = (
        SELECT MAX(vor2.id)
        FROM vehicle_lease_order_record vor2
        WHERE vor2.vehicle_id = vi.id
          AND vor2.del_flag = '0'
      )
 LEFT JOIN vehicle_lease_contract_info c
       ON c.order_id = vor.contract_id
      AND c.del_flag = '0'
 LEFT JOIN customer_info ci
       ON ci.id = vi.customer_id
      AND ci.del_flag = '0'
 WHERE vi.del_flag = '0'
  AND COALESCE(vs.operation_status, '') <> '5'`;
 /** 查询所有车辆关联信息，返回 plate→info 的 Map */
 export async function fetchVehicleInfoMap(): Promise<Map<string, VehicleInfoRow>> {
@@ -36,7 +54,7 @@ export async function fetchVehicleInfoMap(): Promise<Map<string, VehicleInfoRow>
 export async function fetchVehicleInfoByPlates(plates: string[]): Promise<Map<string, VehicleInfoRow>> {
  if (plates.length === 0) return new Map();
  const [rows] = await pool.execute(
-    `${VEHICLE_INFO_SQL} AND truck.plate_number IN (${plates.map(() => '?').join(',')})`,
+    `${VEHICLE_INFO_SQL} AND vi.plate_number IN (${plates.map(() => '?').join(',')})`,
    plates
  ) as [VehicleInfoRow[], unknown];
  const map = new Map<string, VehicleInfoRow>();
--- a/src/server/routes/scheduling/suggestions.ts
+++ b/src/server/routes/scheduling/suggestions.ts
@@ -28,16 +28,17 @@ function inferTypeFromTargetName(targetName: string): string {
 }
 /**
- * Classify vehicle type from dic_type.dic_name (e.g. "4.5吨冷链车", "4.5吨货车", "18吨双飞翼货车").
+ * Classify vehicle type from ln_asset_management.vehicle_model.
- * The typeName is the full label from the dictionary, modelRaw is the numeric dic_code.
+ * modelRaw is vehicle_model.vehicle_type, which is not the old dic_truck_type code.
 */
 function classifyVehicleType(typeName: string, _modelRaw: string): string {
  const t = (typeName || '').trim();
  if (t.includes('4.5') && t.includes('冷链')) return '4.5T冷链';
  if (t.includes('4.5')) return '4.5T普货';
  if (t.includes('18')) return '18T';
  if (t.includes('49') || t.includes('牵引')) return '49T';
  if (t.includes('挂车')) return '挂车';
  if (t.includes('49')) return '49T';
  if (t.includes('35')) return '35T';
  return t || '其他';
 }
@@ -54,7 +55,7 @@ app.get('/', async (c) => {
    // ---- Query 1: Assessment targets ----
    const [targets] = await pool.execute(
-      'SELECT id, target_name, annual_mileage_per_vehicle FROM tab_mileage_assessment_target WHERE is_deleted = 0 ORDER BY id',
+      'SELECT id, target_name, annual_mileage_per_vehicle FROM lingniu_prod.tab_mileage_assessment_target WHERE is_deleted = 0 ORDER BY id',
    ) as [any[], unknown];
    const targetMap = new Map<number, { targetName: string; annualMileage: number }>();
@@ -71,21 +72,20 @@ app.get('/', async (c) => {
             current_mileage, current_year_mileage, current_year_mileage_task,
             completion_rate, is_qualified, current_year_is_qualified,
             daily_required_mileage, current_year_assessment_end_date
-      FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0
+      FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0
    `) as [any[], unknown];
    // ---- Query 3: Vehicle info (customer, dept, manager) ----
    const vehicleInfoMap = await fetchVehicleInfoMap();
-    // ---- Query 4: Vehicle types from tab_truck ----
+    // ---- Query 4: Vehicle types from vehicle_info ----
    // Include soft-deleted trucks: many assessment vehicles have is_deleted=1 in tab_truck
    // but are still active in the assessment. We need their type info.
    const [truckTypeRows] = await pool.execute(`
-      SELECT truck.plate_number, dic_type.dic_name AS type_name, truck.model AS model_raw
+      SELECT vi.plate_number, vm.model AS type_name, vm.vehicle_type AS model_raw
-      FROM tab_truck truck
+      FROM vehicle_info vi
-      LEFT JOIN tab_dic dic_type ON dic_type.parent_code = 'dic_truck_type'
+      LEFT JOIN vehicle_status vs ON vs.vehicle_id = vi.id AND vs.del_flag = 0
-        AND dic_type.dic_code = truck.model AND dic_type.is_deleted = 0
+      LEFT JOIN vehicle_model vm ON vm.id = vi.vehicle_model_id AND vm.del_flag = '0'
-      WHERE truck.is_operation = 1
+      WHERE vi.del_flag = '0'
        AND COALESCE(vs.operation_status, '') <> '5'
    `) as [any[], unknown];
    const truckTypeMap = new Map<string, { typeName: string; modelRaw: string }>();
@@ -161,12 +161,13 @@ app.get('/', async (c) => {
    // ---- Query 7: Inventory vehicles (rent_status = 0) ----
    const [inventoryTruckRows] = await pool.execute(`
-      SELECT truck.plate_number, dic_type.dic_name AS type_name, truck.model AS model_raw
+      SELECT vi.plate_number, vm.model AS type_name, vm.vehicle_type AS model_raw
-      FROM tab_truck truck
+      FROM vehicle_info vi
-      LEFT JOIN tab_dic dic_type ON dic_type.parent_code = 'dic_truck_type'
+      LEFT JOIN vehicle_status vs ON vs.vehicle_id = vi.id AND vs.del_flag = 0
-        AND dic_type.dic_code = truck.model AND dic_type.is_deleted = 0
+      LEFT JOIN vehicle_model vm ON vm.id = vi.vehicle_model_id AND vm.del_flag = '0'
-      WHERE truck.is_deleted = 0 AND truck.is_operation = 1
+      WHERE vi.del_flag = '0'
-        AND truck.truck_rent_status = 0
+        AND COALESCE(vs.operation_status, '') IN ('3','4')
        AND COALESCE(vs.vehicle_status, '') <> '4'
    `) as [any[], unknown];
    // ---- Build assessment vehicle lookup for inventory cross-reference ----
--- a/src/server/routes/vehicles.ts
+++ b/src/server/routes/vehicles.ts
@@ -17,75 +17,101 @@ import type { Context } from 'hono';
 const app = new Hono();
 const MAIN_SQL = `SELECT
-    CAST(truck.id AS CHAR) AS id,
+    CAST(vi.id AS CHAR) AS id,
-    truck.plate_number AS 车牌号,
+    vi.plate_number AS 车牌号,
-    truck.vin AS vin,
+    vi.vin AS vin,
-    truck.brand AS 车辆品牌,
+    vm.brand AS 车辆品牌,
-    truck.model AS 车辆型号,
+    vm.model AS 车辆型号,
-    truck.color AS 车辆颜色,
+    vi.body_color AS 车辆颜色,
-    truck.rent_from_company AS 租赁公司,
+    vi.rental_company AS 租赁公司,
-    dic_ascription_status.dic_name AS 车辆归属状态Label,
+    CASE vi.vehicle_source
-    dic_type.dic_name AS 车辆型号Label,
+      WHEN '0' THEN '自有'
-    truck.stock_area AS 库存区域,
+      WHEN '1' THEN '挂靠'
-    truck.truck_rent_status AS 车辆租赁状态,
+      WHEN '2' THEN '外租'
-    dic_status.dic_name AS 车辆租赁状态Label,
+      WHEN '3' THEN '自有'
-    truck.is_operation AS 是否营运,
+      ELSE vi.actual_ownership
-    info.province AS 省,
+    END AS 车辆归属状态Label,
-    info.city AS 市,
+    vm.model AS 车辆型号Label,
    vm.vehicle_type AS 车辆类型参数,
    vi.operation_city AS 库存区域,
    vs.vehicle_status AS 车辆租赁状态,
    vs.operation_status AS 车辆租赁状态Label,
    CASE WHEN COALESCE(vs.operation_status, '') = '5' THEN 0 ELSE 1 END AS 是否营运,
    COALESCE(info_province.NAME, NULLIF(info.province, ''), vi.province_name, vi_province.NAME, NULLIF(vi.province, '')) AS 省,
    COALESCE(info_city.NAME, NULLIF(info.city, ''), vi.city_name, vi_city.NAME, vi_operation_city.NAME, NULLIF(vi.city, ''), NULLIF(vi.operation_city, '')) AS 市,
    info.lat AS 纬度,
    info.lng AS 经度,
-    dic_brand.dic_name AS 车辆品牌Label,
+    CASE vm.brand
-    si.contract_id AS 合同ID,
+      WHEN 'hyundai' THEN CASE WHEN vm.model LIKE '%帕力安%' OR vm.model LIKE '%冷链%' OR vm.model LIKE '%双飞翼%' THEN '帕力安牌' ELSE '现代' END
-    COALESCE(c.contract_no, si.contract_no) AS 合同编码,
+      WHEN 'yuejin' THEN '跃进'
-    cus.customer_name AS 客户名称,
+      WHEN 'feichi' THEN '飞驰'
-    org.org_name AS 合同归属公司,
+      WHEN 'sulong' THEN '苏龙'
-    dep.dep_name AS 合同归属部门,
+      WHEN 'higer' THEN '海格'
-    org_truck.org_name AS 主体,
+      WHEN 'dongfeng' THEN '东风'
-    c.project_name AS 项目名称,
+      WHEN 'yutong' THEN '宇通'
-    u.user_name AS 客户经理,
+      WHEN 'chufeng' THEN '楚风'
-    CAST(c.bd AS CHAR) AS 经理ID
+      WHEN 'tonghua' THEN '通华'
-FROM tab_truck truck
+      WHEN 'maxus' THEN '大通'
      WHEN 'mingwei' THEN '明威'
      WHEN 'wanfeng' THEN '万风'
      WHEN 'shujie' THEN '舒捷'
      WHEN 'denza' THEN '腾势'
      WHEN 'hongyan' THEN '红岩'
      WHEN 'yuanchang brand' THEN '远程牌'
      WHEN 'others' THEN '其他'
      ELSE vm.brand
    END AS 车辆品牌Label,
    c.id AS 合同ID,
    COALESCE(c.contract_code, vor.contract_code, vi.contract_code) AS 合同编码,
    COALESCE(c.customer_name, vor.customer_name, ci.customer_name) AS 客户名称,
    c.signing_company AS 合同归属公司,
    COALESCE(c.business_department_name, vor.business_dept) AS 合同归属部门,
    NULLIF(vi.registered_ownership, '') AS 主体,
    COALESCE(c.project_name, vor.project_name) AS 项目名称,
    COALESCE(c.business_manager_name, vor.business_manager) AS 客户经理,
    CAST(COALESCE(c.business_manager_id, vi.business_id) AS CHAR) AS 经理ID
 FROM vehicle_info vi
 LEFT JOIN vehicle_status vs
       ON vs.vehicle_id = vi.id
      AND vs.del_flag = 0
 LEFT JOIN vehicle_model vm
       ON vm.id = vi.vehicle_model_id
      AND vm.del_flag = '0'
 LEFT JOIN tab_truck_remote_sync_realtime_info info
-       ON info.id = truck.id
+       ON info.plate_number = vi.plate_number
-LEFT JOIN tab_dic dic_type
+      AND info.is_deleted = 0
-       ON dic_type.parent_code = 'dic_truck_type'
+LEFT JOIN common_district info_province
-      AND dic_type.dic_code = truck.model
+       ON info_province.CODE = info.province COLLATE utf8mb4_unicode_ci
-      AND dic_type.is_deleted = 0
+      AND info_province.STATUS = 'VALID'
-LEFT JOIN tab_dic dic_status
+LEFT JOIN common_district info_city
-       ON dic_status.parent_code = 'dic_truck_rent_status'
+       ON info_city.CODE = info.city COLLATE utf8mb4_unicode_ci
-      AND dic_status.dic_code = truck.truck_rent_status
+      AND info_city.STATUS = 'VALID'
-      AND dic_status.is_deleted = 0
+LEFT JOIN common_district vi_province
-LEFT JOIN tab_dic dic_brand
+       ON vi_province.CODE = vi.province COLLATE utf8mb4_unicode_ci
-       ON dic_brand.parent_code = 'dic_vehicle_brand'
+      AND vi_province.STATUS = 'VALID'
-      AND dic_brand.dic_code = truck.brand
+LEFT JOIN common_district vi_city
-      AND dic_brand.is_deleted = 0
+       ON vi_city.CODE = vi.city COLLATE utf8mb4_unicode_ci
-LEFT JOIN tab_truck_status_info si
+      AND vi_city.STATUS = 'VALID'
-       ON si.truck_id = truck.id
+LEFT JOIN common_district vi_operation_city
-      AND si.is_deleted = 0
+       ON vi_operation_city.CODE = vi.operation_city COLLATE utf8mb4_unicode_ci
-LEFT JOIN tab_contract c
+      AND vi_operation_city.STATUS = 'VALID'
-       ON c.id = si.contract_id
+LEFT JOIN vehicle_lease_order_record vor
-      AND c.is_deleted = 0
+       ON vor.vehicle_id = vi.id
-LEFT JOIN tab_customer cus
+      AND vor.del_flag = '0'
-       ON cus.id = c.customer_id
+      AND vor.id = (
-      AND cus.is_deleted = 0
+        SELECT MAX(vor2.id)
-LEFT JOIN tab_org org
+        FROM vehicle_lease_order_record vor2
-       ON org.id = c.org_id
+        WHERE vor2.vehicle_id = vi.id
-      AND org.is_deleted = 0
+          AND vor2.del_flag = '0'
-LEFT JOIN tab_org org_truck
+      )
-       ON org_truck.id = truck.org_id
+LEFT JOIN vehicle_lease_contract_info c
-      AND org_truck.is_deleted = 0
+       ON c.order_id = vor.contract_id
-LEFT JOIN tab_dic dic_ascription_status
+      AND c.del_flag = '0'
-       ON dic_ascription_status.parent_code = 'dic_truck_ascription_status'
+LEFT JOIN customer_info ci
-      AND dic_ascription_status.dic_code = truck.ascription_status
+       ON ci.id = vi.customer_id
-      AND dic_ascription_status.is_deleted = 0
+      AND ci.del_flag = '0'
-LEFT JOIN tab_user u
+WHERE vi.del_flag = '0'
-       ON u.id = c.bd
+  AND COALESCE(vs.operation_status, '') <> '5'`;
      AND u.is_deleted = 0
 LEFT JOIN tab_department dep
       ON dep.id = u.dep_id
      AND dep.is_deleted = 0
 WHERE truck.is_deleted = 0
  AND truck.is_operation = 1`;
 // Region mapping: province/city -> display region
 const REGIONS = ['嘉兴', '广东', '北京', '新疆', '其他'] as const;
@@ -148,23 +174,33 @@ function countByType(vehicles: Vehicle[]): VehicleTypeCounts {
  return counts;
 }
-// Map rental status to frontend status
+// Map operation status to frontend status.
-// Actual DB values: 在库(0), 自营(1), 租赁(2), 待交车(7), 挂靠(8), 异动(12)
+// ln_asset_management.vehicle_status.operation_status:
-function mapStatus(rentStatus: string | null): 'Operating' | 'Inventory' | 'Pending' | 'Abnormal' {
+//   1=租赁, 2=自营, 3=可运营, 4=待运营, 5=退出运营.
-  if (!rentStatus) return 'Inventory';
+function mapStatus(operationStatus: string | null, vehicleStatus: string | null): 'Operating' | 'Inventory' | 'Pending' | 'Abnormal' {
-  const s = rentStatus.trim();
+  const op = (operationStatus || '').trim();
-  if (s === '租赁' || s === '自营' || s === '挂靠') return 'Operating';
+  const vehicle = (vehicleStatus || '').trim();
-  if (s === '在库') return 'Inventory';
+  if (vehicle === '4') return 'Pending';
-  if (s === '待交车') return 'Pending';
+  if (vehicle === '14') return 'Abnormal';
-  if (s === '异动') return 'Abnormal';
+  if (op === '1' || op === '2') return 'Operating';
  if (op === '3' || op === '4') return 'Inventory';
  if (op === '租赁' || op === '自营') return 'Operating';
  if (op === '可运营' || op === '待运营' || op === '在库') return 'Inventory';
  if (op === '异动') return 'Abnormal';
  return 'Inventory';
 }
-// Map ownership from truck_rent_status (rentStatusLabel)
+// Map ownership from vehicle_info.vehicle_source.
-// DB values: 自营(1), 租赁(2), 挂靠(8) → these are the operating subtypes
+// ln_asset_management vehicle_source values: 1=挂靠, 2=外租, 3=自有. Keep 0=自有 for legacy rows.
 function mapOwnership(rentStatusLabel: string | null): string {
  if (!rentStatusLabel) return 'Unknown';
  const s = rentStatusLabel.trim();
  if (s === '0') return 'Self';
  if (s === '1') return 'Hanging';
  if (s === '2') return 'Leased';
  if (s === '3') return 'Self';
  if (s === '自有') return 'Self';
  if (s === '外租') return 'Leased';
  if (s === '自营') return 'Self';
  if (s === '租赁') return 'Leased';
  if (s === '挂靠') return 'Hanging';
@@ -179,27 +215,41 @@ function resolveCity(city: string | null, province: string | null): string {
  return p || '其他';
 }
-// Derive vehicle type category from model label
+// Derive page category from ln_asset_management.vehicle_model.
-// Actual DB values: 4.5吨冷链车, 4.5吨货车, 18吨双飞翼货车, 18吨厢式货车, 49吨牵引车头, 35吨牵引车头,
+// vehicle_type is a new-system category code, not the old lingniu_prod.dic_truck_type code:
-//   重型集装箱半挂车, 重型平板半挂车, 氢能叉车, SJ型蓄电池观光车, 公务用车/小客车, 挂靠油车
+//   1 = 4.5T, 2 = 18T / other truck-like models, 3 = tractor head, 5/6 = trailers.
-function deriveType(modelLabel: string | null, brandLabel: string | null): string {
+function deriveType(modelLabel: string | null, vehicleTypeCode: string | null): string {
  const label = (modelLabel || '').trim();
  const code = (vehicleTypeCode || '').trim();
  if (label.includes('半挂车') || code === '5' || code === '6') return '挂车';
  if (label.includes('4.5吨')) return '4.5T';
  if (label.includes('18吨')) return '18T';
  if (label.includes('49吨')) return '49T';
  if (label.includes('35吨')) return '35T';
  if (code === '1') return '4.5T';
  if (code === '3') return '49T';
  if (label.includes('叉车')) return '叉车';
  if (label.includes('半挂车')) return '挂车';
  return '其他车型';
 }
 function normalizeModelLabel(modelLabel: string | null): string | null {
  const label = (modelLabel || '').trim();
  if (label === '帕力安牌4.5吨冷链车') return '4.5吨冷链车';
  if (label === '帕力安牌18吨双飞翼货车') return '18吨双飞翼货车';
  if (label === '海格牌18吨双飞翼货车') return '18吨双飞翼货车';
  return label || null;
 }
 // Tag → alias mapping with sort order
 // tag is generated as: brand-modelLabel-color[+rentCompany if 外租]
 // Some tags are merged (e.g. 嘉氢 red + 嘉氢 blue/green → one alias)
 const MODEL_ALIAS_MAP: Record<string, { alias: string; order: number }> = {
  // 4.5T 普货
  '现代-4.5吨货车-白色广州开发区交投氢能运营管理有限公司': { alias: '现代4.5T普货（交投）', order: 101 },
-  '现代-4.5吨货车-白': { alias: '现代4.5T普货（恒运）', order: 102 },
+  '现代-4.5吨货车-白恒运': { alias: '现代4.5T普货（恒运）', order: 102 },
  '现代-4.5吨货车-白色恒运': { alias: '现代4.5T普货（恒运）', order: 102 },
  '现代-4.5吨货车-白色': { alias: '现代4.5T普货', order: 101 },
  '现代-4.5吨货车-白': { alias: '现代4.5T普货', order: 101 },
  // 4.5T 冷链
  '帕力安牌-4.5吨冷链车-白色广州开发区交投氢能运营管理有限公司': { alias: '现代4.5T冷链（交投）', order: 201 },
  '帕力安牌-4.5吨冷链车-白色': { alias: '现代4.5T冷链（羚牛）', order: 202 },
@@ -212,13 +262,16 @@ const MODEL_ALIAS_MAP: Record<string, { alias: string; order: number }> = {
  '苏龙-18吨双飞翼货车-白色': { alias: '苏龙18T飞翼', order: 304 }, // dirty data, merge
  '苏龙-18吨双飞翼货车-白安吉天地物流科技有限公司': { alias: '苏龙18T飞翼（安吉）', order: 305 },
  '帕力安牌-18吨双飞翼货车-白': { alias: '现代18T双飞翼（羚牛）', order: 306 },
  '帕力安牌-18吨双飞翼货车-白/绿': { alias: '现代18T双飞翼（羚牛）', order: 306 },
  // 49T
  '宇通-49吨牵引车头-白': { alias: '49T宇通', order: 401 },
  '飞驰-49吨牵引车头-白/蓝/绿': { alias: '49T飞驰', order: 402 },
  '飞驰-49吨牵引车头-白/蓝/绿嘉兴氢能产业发展股份有限公司': { alias: '49T飞驰（嘉氢）', order: 403 },
  '飞驰-49吨牵引车头-红': { alias: '49T飞驰（红）', order: 402 },
  '飞驰-49吨牵引车头-红嘉兴氢能产业发展股份有限公司': { alias: '49T飞驰（嘉氢）', order: 403 }, // merge with above
  '飞驰-49吨牵引车头-红浙江氢能产业发展有限公司': { alias: '49T飞驰（浙氢-红）', order: 404 },
  '飞驰-49吨牵引车头-白/蓝/绿浙江氢能产业发展有限公司': { alias: '49T飞驰（浙氢-蓝白绿）', order: 405 },
  '楚风-49吨牵引车头-蓝/黑': { alias: '49T楚风', order: 406 },
  '楚风-49吨牵引车头-蓝/黑海珀特科技(北京)有限公司': { alias: '49T楚风（海珀特）', order: 406 },
  // 其他
  '红岩-35吨牵引车头-红色': { alias: '35T油车', order: 501 },
@@ -232,9 +285,11 @@ const MODEL_ALIAS_MAP: Record<string, { alias: string; order: number }> = {
  '万风-重型平板半挂车-红': { alias: '挂车', order: 503 },
  '舒捷-SJ型蓄电池观光车-蓝白': { alias: '观光车', order: 504 },
  '东风-挂靠油车-白色': { alias: '公务车/挂靠车', order: 505 },
  '东风-挂靠油车-白': { alias: '公务车/挂靠车', order: 505 },
  '腾势-公务用车/小客车-黑': { alias: '公务车/挂靠车', order: 505 },
  '腾势-公务用车/小客车-白': { alias: '公务车/挂靠车', order: 505 },
  '其他-公务用车/小客车-蓝色': { alias: '公务车/挂靠车', order: 505 },
  '其他-公务用车/小客车-灰': { alias: '公务车/挂靠车', order: 505 },
  '远程牌-公务用车/小客车-白': { alias: '公务车/挂靠车', order: 505 },
  '大通-公务用车/小客车-灰': { alias: '公务车/挂靠车', order: 505 },
 };
@@ -247,8 +302,9 @@ function deriveModelTag(
  rentCompany: string | null,
 ): string {
  const brand = (brandLabel || '').trim();
-  const model = (modelLabel || '').trim();
+  const model = (normalizeModelLabel(modelLabel) || '').trim();
  const c = (color || '').trim();
  if (model === '公务用车/小客车') return '公务车/挂靠车';
  const isRented = ownershipLabel?.trim() === '外租';
  const company = isRented ? (rentCompany || '').trim() : '';
@@ -272,15 +328,16 @@ function transformRow(row: VehicleRow): Vehicle {
    id: row.id,
    plateNumber: row.车牌号 || '',
    vin: row.vin || '',
-    type: deriveType(row.车辆型号Label, row.车辆品牌Label),
+    type: deriveType(row.车辆型号Label, row.车辆类型参数),
    model: deriveModelTag(row.车辆品牌Label, row.车辆型号Label, row.车辆颜色, row.车辆归属状态Label, row.租赁公司),
    color: row.车辆颜色 || '',
    location: region,
    region,
    province: row.省,
    city: row.市,
-    status: mapStatus(row.车辆租赁状态Label),
+    status: mapStatus(row.车辆租赁状态Label, row.车辆租赁状态),
-    ownership: mapOwnership(row.车辆租赁状态Label),
+    operationStatus: row.车辆租赁状态Label,
    ownership: mapOwnership(row.车辆归属状态Label),
    rentCompany: row.租赁公司 || '',
    contractNo: row.合同编码,
    customerName: row.客户名称,
@@ -318,7 +375,7 @@ async function getVehiclesForUser(c: Context): Promise<Vehicle[]> {
  return maskCustomerNames(list);
 }
-// 归属公司筛选（所属公司 = tab_truck.org_id → org_name, 即 Vehicle.subjectOrg）
+// 归属公司筛选（所属公司 = vehicle_info.registered_ownership, 即 Vehicle.subjectOrg）
 function getSubjectParam(c: Context): string | null {
  const raw = (c.req.query('subject') || '').trim();
  return raw ? raw : null;
@@ -354,24 +411,27 @@ async function getWeeklyTruckIds(): Promise<WeeklyTruckIds> {
  }
  const [[pendingRows], [deliveredRows], [returnedRows], [replacedRows]] = await Promise.all([
-    pool.query<any[]>(`SELECT CAST(id AS CHAR) AS truck_id FROM tab_truck WHERE is_deleted=0 AND is_operation=1 AND truck_rent_status=7`),
+    pool.query<any[]>(`SELECT CAST(vehicle_id AS CHAR) AS truck_id
-    pool.query<any[]>(`SELECT CAST(rent_truck.truck_id AS CHAR) AS truck_id FROM tab_truck_rent_take take
+      FROM vehicle_status
-      LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+      WHERE del_flag=0 AND vehicle_status='4' AND COALESCE(operation_status, '') <> '5'`),
-      LEFT JOIN tab_contract_rent_truck rent_truck ON rent_truck.id = task.contract_rent_truck_id
+    pool.query<any[]>(`SELECT CAST(vehicle_id AS CHAR) AS truck_id
-      WHERE take.is_deleted=0 AND take.take_name IS NOT NULL
+      FROM delivery_vehicle
-        AND task.task_type=1 AND task.task_status=1 AND take.update_time IS NOT NULL
+      WHERE del_flag='0'
-        AND take.handover_date >= ${WEEK_START_SQL} AND take.handover_date < ${WEEK_END_SQL}`),
+        AND vehicle_id IS NOT NULL
-    pool.query<any[]>(`SELECT CAST(rent_truck.truck_id AS CHAR) AS truck_id FROM tab_truck_rent_return r
+        AND delivery_time >= ${WEEK_START_SQL} AND delivery_time < ${WEEK_END_SQL}
-      LEFT JOIN tab_truck_rent_task task ON task.id = r.truck_rent_task_id
+        AND delivery_status IN (2,3,5)`),
-      LEFT JOIN tab_contract_rent_truck rent_truck ON rent_truck.id = task.contract_rent_truck_id
+    pool.query<any[]>(`SELECT CAST(vehicle_id AS CHAR) AS truck_id
-      WHERE r.is_deleted=0 AND r.return_date IS NOT NULL
+      FROM return_vehicle_task
-        AND r.return_date >= ${WEEK_START_SQL} AND r.return_date < ${WEEK_END_SQL}`),
+      WHERE del_flag='0'
-    pool.query<any[]>(`SELECT CAST(rent_truck.truck_id AS CHAR) AS truck_id FROM tab_truck_rent_take take
+        AND vehicle_id IS NOT NULL
-      LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+        AND arrival_time >= ${WEEK_START_SQL} AND arrival_time < ${WEEK_END_SQL}
-      LEFT JOIN tab_contract_rent_truck rent_truck ON rent_truck.id = task.contract_rent_truck_id
+        AND status IN (2,3,5)`),
-      WHERE take.is_deleted=0 AND take.take_name IS NOT NULL
+    pool.query<any[]>(`SELECT CAST(new_vehicle_id AS CHAR) AS truck_id
-        AND task.task_type=3 AND task.task_status=1 AND take.update_time IS NOT NULL
+      FROM vehicle_replacement
-        AND take.handover_date >= ${WEEK_START_SQL} AND take.handover_date < ${WEEK_END_SQL}`),
+      WHERE del_flag='0'
        AND new_vehicle_id IS NOT NULL
        AND replace_time >= ${WEEK_START_SQL} AND replace_time < ${WEEK_END_SQL}
        AND status=20`),
  ]);
  const toSet = (rows: any[]) => new Set((rows as any[]).map((r) => String(r.truck_id)).filter((s) => s && s !== 'null'));
@@ -419,59 +479,54 @@ interface WeeklyStats {
 // 交车单 SQL
 const DELIVERED_SQL = `SELECT
-    take.id, DATE(take.handover_date) AS handover_date,
+    dv.id, DATE(dv.delivery_time) AS handover_date,
-    CAST(truck.id AS CHAR) AS truck_id, truck.plate_number,
+    CAST(dv.vehicle_id AS CHAR) AS truck_id, dv.plate_number,
-    dic_contract_type.dic_name AS contract_type,
+    c.contract_type,
-    customer.customer_name
+    COALESCE(dts.customer_name, c.customer_name) AS customer_name
-FROM tab_truck_rent_take take
+FROM delivery_vehicle dv
-LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+LEFT JOIN delivery_task_subject dts
-LEFT JOIN tab_contract_rent_truck rent_truck ON rent_truck.id = task.contract_rent_truck_id
+       ON dts.id = dv.delivery_task_subject_id
-LEFT JOIN tab_truck truck ON rent_truck.truck_id = truck.id
+      AND dts.del_flag = '0'
-LEFT JOIN tab_contract contract ON task.contract_id = contract.id
+LEFT JOIN vehicle_lease_contract_info c
-LEFT JOIN tab_customer customer ON contract.customer_id = customer.id
+       ON c.order_id = dv.contract_id
-LEFT JOIN tab_dic dic_contract_type
+      AND c.del_flag = '0'
-       ON dic_contract_type.parent_code = 'dic_contract_type'
+WHERE dv.del_flag = '0'
-      AND dic_contract_type.dic_code = contract.contract_type
+  AND dv.vehicle_id IS NOT NULL
-      AND dic_contract_type.is_deleted = 0
+  AND dv.delivery_time IS NOT NULL
-WHERE take.is_deleted = 0 AND take.take_name IS NOT NULL
+  AND dv.delivery_status IN (2,3,5)`;
  AND task.task_type = 1 AND task.task_status = 1 AND take.update_time IS NOT NULL`;
 // 还车单 SQL
 const RETURNED_SQL = `SELECT
-    r.id, DATE(r.return_date) AS handover_date,
+    r.id, DATE(r.arrival_time) AS handover_date,
-    CAST(truck.id AS CHAR) AS truck_id, truck.plate_number,
+    CAST(r.vehicle_id AS CHAR) AS truck_id, r.plate_number,
-    dic_contract_type.dic_name AS contract_type,
+    c.contract_type,
-    customer.customer_name
+    COALESCE(dts.customer_name, c.customer_name) AS customer_name
-FROM tab_truck_rent_return r
+FROM return_vehicle_task r
-LEFT JOIN tab_truck_rent_task task ON task.id = r.truck_rent_task_id
+LEFT JOIN delivery_task_subject dts
-LEFT JOIN tab_contract_rent_truck rent_truck ON rent_truck.id = task.contract_rent_truck_id
+       ON dts.id = r.delivery_task_subject_id
-LEFT JOIN tab_truck truck ON rent_truck.truck_id = truck.id
+      AND dts.del_flag = '0'
-LEFT JOIN tab_contract contract ON task.contract_id = contract.id
+LEFT JOIN vehicle_lease_contract_info c
-LEFT JOIN tab_customer customer ON contract.customer_id = customer.id
+       ON c.order_id = r.contract_id
-LEFT JOIN tab_dic dic_contract_type
+      AND c.del_flag = '0'
-       ON dic_contract_type.parent_code = 'dic_contract_type'
+WHERE r.del_flag = '0'
-      AND dic_contract_type.dic_code = contract.contract_type
+  AND r.vehicle_id IS NOT NULL
-      AND dic_contract_type.is_deleted = 0
+  AND r.arrival_time IS NOT NULL
-WHERE r.is_deleted = 0 AND r.return_date IS NOT NULL`;
+  AND r.status IN (2,3,5)`;
 // 替换车单 SQL
 const REPLACED_SQL = `SELECT
-    take.id, DATE(take.handover_date) AS handover_date,
+    vr.id, DATE(vr.replace_time) AS handover_date,
-    CAST(truck.id AS CHAR) AS truck_id, truck.plate_number,
+    CAST(vr.new_vehicle_id AS CHAR) AS truck_id, vr.new_vehicle_plate AS plate_number,
-    dic_contract_type.dic_name AS contract_type,
+    c.contract_type,
-    customer.customer_name
+    c.customer_name
-FROM tab_truck_rent_take take
+FROM vehicle_replacement vr
-LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+LEFT JOIN vehicle_lease_contract_info c
-LEFT JOIN tab_contract_rent_truck rent_truck ON rent_truck.id = task.contract_rent_truck_id
+       ON c.id = vr.contract_id
-LEFT JOIN tab_truck truck ON rent_truck.truck_id = truck.id
+      AND c.del_flag = '0'
-LEFT JOIN tab_contract contract ON task.contract_id = contract.id
+WHERE vr.del_flag = '0'
-LEFT JOIN tab_customer customer ON contract.customer_id = customer.id
+  AND vr.new_vehicle_id IS NOT NULL
-LEFT JOIN tab_dic dic_contract_type
+  AND vr.replace_time IS NOT NULL
-       ON dic_contract_type.parent_code = 'dic_contract_type'
+  AND vr.status = 20`;
      AND dic_contract_type.dic_code = contract.contract_type
      AND dic_contract_type.is_deleted = 0
 WHERE take.is_deleted = 0 AND take.take_name IS NOT NULL
  AND task.task_type = 3 AND task.task_status = 1 AND take.update_time IS NOT NULL`;
 let cachedWeeklyStats: WeeklyStats | null = null;
 let weeklyStatsLastFetch = 0;
@@ -483,23 +538,18 @@ async function getWeeklyStats(): Promise<WeeklyStats> {
  }
  const [[pendingRows], [newRows], [removedRows], [deliveredRows], [returnedRows], [replacedRows]] = await Promise.all([
-    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck WHERE is_deleted=0 AND is_operation=1 AND truck_rent_status=7`),
+    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM vehicle_status WHERE del_flag=0 AND vehicle_status='4' AND COALESCE(operation_status, '') <> '5'`),
-    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck WHERE is_deleted=0 AND is_operation=1 AND create_time >= ${WEEK_START_SQL} AND create_time < ${WEEK_END_SQL}`),
+    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM vehicle_info WHERE del_flag='0' AND create_time >= ${WEEK_START_SQL} AND create_time < ${WEEK_END_SQL}`),
-    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck WHERE (is_operation=0 OR is_deleted=1) AND update_time >= ${WEEK_START_SQL} AND update_time < ${WEEK_END_SQL}`),
+    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM vehicle_info vi LEFT JOIN vehicle_status vs ON vs.vehicle_id=vi.id AND vs.del_flag=0 WHERE (vi.del_flag='1' OR vs.operation_status='5') AND vi.update_time >= ${WEEK_START_SQL} AND vi.update_time < ${WEEK_END_SQL}`),
-    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck_rent_take take
+    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM delivery_vehicle
-      LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+      WHERE del_flag='0' AND delivery_time IS NOT NULL AND delivery_status IN (2,3,5)
-      WHERE take.is_deleted=0 AND take.take_name IS NOT NULL
+        AND delivery_time >= ${WEEK_START_SQL} AND delivery_time < ${WEEK_END_SQL}`),
-        AND task.task_type=1 AND task.task_status=1 AND take.update_time IS NOT NULL
+    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM return_vehicle_task
-        AND take.handover_date >= ${WEEK_START_SQL} AND take.handover_date < ${WEEK_END_SQL}`),
+      WHERE del_flag='0' AND arrival_time IS NOT NULL AND status IN (2,3,5)
-    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck_rent_return r
+        AND arrival_time >= ${WEEK_START_SQL} AND arrival_time < ${WEEK_END_SQL}`),
-      LEFT JOIN tab_truck_rent_task task ON task.id = r.truck_rent_task_id
+    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM vehicle_replacement
-      WHERE r.is_deleted=0 AND r.return_date IS NOT NULL
+      WHERE del_flag='0' AND replace_time IS NOT NULL AND status=20
-        AND r.return_date >= ${WEEK_START_SQL} AND r.return_date < ${WEEK_END_SQL}`),
+        AND replace_time >= ${WEEK_START_SQL} AND replace_time < ${WEEK_END_SQL}`),
    pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck_rent_take take
      LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
      WHERE take.is_deleted=0 AND take.take_name IS NOT NULL
        AND task.task_type=3 AND task.task_status=1 AND take.update_time IS NOT NULL
        AND take.handover_date >= ${WEEK_START_SQL} AND take.handover_date < ${WEEK_END_SQL}`),
  ]);
  cachedWeeklyStats = {
@@ -520,13 +570,13 @@ app.get('/summary', async (c) => {
  const vehicleIds = new Set(vehicles.map(v => String(v.id)));
  const summary: SummaryData = {
    totalAssets: vehicles.length,
-    operating: {
+	    operating: {
-      total: vehicles.filter((v) => v.status === 'Operating').length,
+	      total: vehicles.filter((v) => v.status === 'Operating' && (v.operationStatus === '1' || v.operationStatus === '2')).length,
-      self: vehicles.filter((v) => v.status === 'Operating' && v.ownership === 'Self').length,
+	      self: vehicles.filter((v) => v.status === 'Operating' && v.operationStatus === '2').length,
-      leased: vehicles.filter((v) => v.status === 'Operating' && v.ownership === 'Leased').length,
+	      leased: vehicles.filter((v) => v.status === 'Operating' && v.operationStatus === '1').length,
-      public: vehicles.filter((v) => v.status === 'Operating' && v.ownership === 'Public').length,
+	      public: vehicles.filter((v) => v.status === 'Operating' && v.ownership === 'Public').length,
-      hanging: vehicles.filter((v) => v.status === 'Operating' && v.ownership === 'Hanging').length,
+	      hanging: 0,
-    },
+	    },
    inventory: {
      total: vehicles.filter((v) => v.status === 'Inventory' || v.status === 'Abnormal').length,
      inStock: vehicles.filter((v) => v.status === 'Inventory').length,
@@ -695,7 +745,8 @@ app.get('/dept-stats', async (c) => {
  const deptMap = new Map<string, Map<string, Vehicle[]>>();
  for (const v of withManager) {
-    const dept = v.departmentName || '公务车';
+    const isPublicServiceVehicle = v.model === '公务车/挂靠车';
    const dept = isPublicServiceVehicle ? '公务车' : (v.departmentName || '未分配部门');
    const mgr = v.customerManager || '未分配';
    if (EXCLUDED_MANAGERS.has(mgr)) continue;
    if (!deptMap.has(dept)) deptMap.set(dept, new Map());
@@ -704,29 +755,6 @@ app.get('/dept-stats', async (c) => {
    mgrMap.get(mgr)!.push(v);
  }
  // 补齐：业务部门内所有在职用户，即使当前无车辆也需显示
  const deptNames = Array.from(deptMap.keys()).filter((d) => d !== '公务车');
  if (deptNames.length > 0) {
    const placeholders = deptNames.map(() => '?').join(',');
    const [userRows] = await pool.query<any[]>(
      `SELECT u.user_name, dep.dep_name
         FROM tab_user u
         LEFT JOIN tab_department dep ON dep.id = u.dep_id AND dep.is_deleted = 0
        WHERE u.is_deleted = 0
          AND dep.dep_name IN (${placeholders})`,
      deptNames,
    );
    for (const r of userRows as any[]) {
      const dept = r.dep_name as string | null;
      const mgr = r.user_name as string | null;
      if (!dept || !mgr) continue;
      if (EXCLUDED_MANAGERS.has(mgr)) continue;
      const mgrMap = deptMap.get(dept);
      if (!mgrMap) continue;
      if (!mgrMap.has(mgr)) mgrMap.set(mgr, []);
    }
  }
  // Compute attendance & avg mileage from realtime data
  const getMileageStats = (vList: Vehicle[]) => {
    const todayActive = vList.filter((v) => (todayMileageMap.get(v.plateNumber) || 0) > 0).length;
@@ -971,7 +999,11 @@ app.get('/list', async (c) => {
    filtered = filtered.filter((v) => customer === '未分配客户' ? !v.customerName : v.customerName === customer);
  }
  if (department) {
-    filtered = filtered.filter((v) => department === '公务车' ? !v.departmentName : v.departmentName === department);
+    filtered = filtered.filter((v) => {
      if (department === '公务车') return v.model === '公务车/挂靠车';
      if (department === '未分配部门') return v.model !== '公务车/挂靠车' && !v.departmentName;
      return v.departmentName === department;
    });
  }
  if (isColdChain !== undefined) {
    const wantCold = isColdChain === 'true';
@@ -992,9 +1024,10 @@ app.get('/list', async (c) => {
      location: v.location,
      province: v.province,
      city: v.city,
-      status: v.status,
+	      status: v.status,
-      ownership: v.ownership,
+	      ownership: v.ownership,
-      contractNo: v.contractNo,
+	      rentCompany: v.rentCompany,
 	      contractNo: v.contractNo,
      customerName: v.customerName,
      subjectOrg: v.subjectOrg,
      departmentName: v.departmentName,
@@ -1049,18 +1082,22 @@ app.get('/weekly-detail', async (c) => {
  const source = c.req.query('source');
  let sql: string;
  if (type === 'delivered') {
-    sql = `${DELIVERED_SQL} AND take.handover_date >= ${WEEK_START_SQL} AND take.handover_date < ${WEEK_END_SQL} ORDER BY take.handover_date DESC`;
+    sql = `${DELIVERED_SQL} AND dv.delivery_time >= ${WEEK_START_SQL} AND dv.delivery_time < ${WEEK_END_SQL} ORDER BY dv.delivery_time DESC`;
  } else if (type === 'returned') {
-    sql = `${RETURNED_SQL} AND r.return_date >= ${WEEK_START_SQL} AND r.return_date < ${WEEK_END_SQL} ORDER BY r.return_date DESC`;
+    sql = `${RETURNED_SQL} AND r.arrival_time >= ${WEEK_START_SQL} AND r.arrival_time < ${WEEK_END_SQL} ORDER BY r.arrival_time DESC`;
  } else if (type === 'replaced') {
-    sql = `${REPLACED_SQL} AND take.handover_date >= ${WEEK_START_SQL} AND take.handover_date < ${WEEK_END_SQL} ORDER BY take.handover_date DESC`;
+    sql = `${REPLACED_SQL} AND vr.replace_time >= ${WEEK_START_SQL} AND vr.replace_time < ${WEEK_END_SQL} ORDER BY vr.replace_time DESC`;
  } else if (type === 'pending') {
-    sql = `SELECT CAST(truck.id AS CHAR) AS truck_id, truck.plate_number, NULL AS handover_date, NULL AS contract_type, NULL AS customer_name
+    sql = `SELECT CAST(vi.id AS CHAR) AS truck_id, vi.plate_number, NULL AS handover_date, NULL AS contract_type, NULL AS customer_name
-           FROM tab_truck truck WHERE truck.is_deleted=0 AND truck.is_operation=1 AND truck.truck_rent_status=7`;
+           FROM vehicle_info vi
           LEFT JOIN vehicle_status vs ON vs.vehicle_id=vi.id AND vs.del_flag=0
           WHERE vi.del_flag='0' AND vs.vehicle_status='4' AND COALESCE(vs.operation_status, '') <> '5'`;
  } else if (type === 'new') {
-    sql = `SELECT CAST(truck.id AS CHAR) AS truck_id, truck.plate_number, truck.create_time AS handover_date, NULL AS contract_type, NULL AS customer_name
+    sql = `SELECT CAST(vi.id AS CHAR) AS truck_id, vi.plate_number, vi.create_time AS handover_date, NULL AS contract_type, NULL AS customer_name
-           FROM tab_truck truck WHERE truck.is_deleted=0 AND truck.is_operation=1
+           FROM vehicle_info vi
-           AND truck.create_time >= ${WEEK_START_SQL} AND truck.create_time < ${WEEK_END_SQL} ORDER BY truck.create_time DESC`;
+           LEFT JOIN vehicle_status vs ON vs.vehicle_id=vi.id AND vs.del_flag=0
           WHERE vi.del_flag='0' AND COALESCE(vs.operation_status, '') <> '5'
           AND vi.create_time >= ${WEEK_START_SQL} AND vi.create_time < ${WEEK_END_SQL} ORDER BY vi.create_time DESC`;
  } else {
    return c.json([]);
  }
@@ -1124,20 +1161,18 @@ app.get('/debug', async (c) => {
    ${WEEK_END_SQL} AS week_end,
    CURDATE() AS today,
    WEEKDAY(CURDATE()) AS weekday`);
-  const [[deliveredAll]] = await pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck_rent_take take
+  const [[deliveredAll]] = await pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM delivery_vehicle
-    LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+    WHERE del_flag='0' AND delivery_time IS NOT NULL AND delivery_status IN (2,3,5)`);
-    WHERE take.is_deleted=0 AND take.take_name IS NOT NULL AND task.task_type=1 AND task.task_status=1`);
+  const [[deliveredRecent]] = await pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM delivery_vehicle
-  const [[deliveredRecent]] = await pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck_rent_take take
+    WHERE del_flag='0' AND delivery_time IS NOT NULL AND delivery_status IN (2,3,5)
-    LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+    AND delivery_time >= ${WEEK_START_SQL} AND delivery_time < ${WEEK_END_SQL}`);
-    WHERE take.is_deleted=0 AND take.take_name IS NOT NULL AND task.task_type=1 AND task.task_status=1
+  const [[latestTake]] = await pool.query<any[]>(`SELECT MAX(delivery_time) AS latest FROM delivery_vehicle
-    AND take.handover_date >= ${WEEK_START_SQL} AND take.handover_date < ${WEEK_END_SQL}`);
+    WHERE del_flag='0' AND delivery_time IS NOT NULL AND delivery_status IN (2,3,5)`);
-  const [[latestTake]] = await pool.query<any[]>(`SELECT MAX(take.handover_date) AS latest FROM tab_truck_rent_take take
+  const [[returnedRecent]] = await pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM return_vehicle_task
-    LEFT JOIN tab_truck_rent_task task ON task.id = take.truck_rent_task_id
+    WHERE del_flag='0' AND arrival_time IS NOT NULL AND status IN (2,3,5)
-    WHERE take.is_deleted=0 AND take.take_name IS NOT NULL AND task.task_type=1 AND task.task_status=1`);
+    AND arrival_time >= ${WEEK_START_SQL} AND arrival_time < ${WEEK_END_SQL}`);
-  const [[returnedRecent]] = await pool.query<any[]>(`SELECT COUNT(*) AS cnt FROM tab_truck_rent_return r
+  const [[latestReturn]] = await pool.query<any[]>(`SELECT MAX(arrival_time) AS latest FROM return_vehicle_task
-    WHERE r.is_deleted=0 AND r.return_date IS NOT NULL
+    WHERE del_flag='0' AND arrival_time IS NOT NULL AND status IN (2,3,5)`);
    AND r.return_date >= ${WEEK_START_SQL} AND r.return_date < ${WEEK_END_SQL}`);
  const [[latestReturn]] = await pool.query<any[]>(`SELECT MAX(r.return_date) AS latest FROM tab_truck_rent_return r WHERE r.is_deleted=0 AND r.return_date IS NOT NULL`);
  return c.json({
    weekRange: dateRange,
--- a/src/server/types.ts
+++ b/src/server/types.ts
@@ -8,6 +8,7 @@ export interface VehicleRow {
  租赁公司: string;
  车辆归属状态Label: string | null;
  车辆型号Label: string | null;
  车辆类型参数: string | null;
  库存区域: string | null;
  车辆租赁状态: string | null;
  车辆租赁状态Label: string | null;
@@ -40,6 +41,7 @@ export interface Vehicle {
  province: string | null;
  city: string | null;
  status: 'Operating' | 'Inventory' | 'Pending' | 'Abnormal';
  operationStatus: string | null;
  ownership: string;
  rentCompany: string;
  contractNo: string | null;
Author	SHA1	Message	Date
kkfluous	654573ac4b	merge palladium 18t color variant All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-23 13:32:29 +08:00
kkfluous	43f94ed1b8	fix asset vehicle source grouping All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-23 13:16:32 +08:00
kkfluous	fb5789d705	update asset refresh status All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-18 14:18:40 +08:00
kkfluous	94a6e0a75e	update asset validation banner All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-18 14:04:27 +08:00
kkfluous	67c5f9d281	support mileage batch multi-select All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-18 10:18:35 +08:00
kkfluous	91202bdf71	fix asset module database migration All checks were successful ci/woodpecker/manual/woodpecker Pipeline was successful Details	2026-06-17 11:53:39 +08:00
kkfluous	c13f341d5e	feat(ui): 页面标题区分能源BI与资产BI，资产页增加OneOS迁移提示滚动条 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-11 15:30:21 +08:00
kkfluous	6962c4ff1c	feat(db): hydrogen 和 mileage 数据库连接支持 Docker 环境变量注入 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details mileage-db.ts 改为从环境变量读取，硬编码值作为 fallback； docker-compose.yml 新增加氢站库和里程库的连接参数。	2026-06-09 17:18:32 +08:00
kkfluous	6b7f0eedd9	Revert "fix(mileage): 已到期年度按期末里程统计" All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details This reverts commit `feb950dd59`.	2026-06-03 15:40:13 +08:00
kkfluous	5bb3ceb47a	fix(mileage): 交投高里程车辆标红 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-03 15:10:36 +08:00
kkfluous	cc778f3701	fix(mileage): 导出保留里程小数 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2026-06-03 14:54:30 +08:00
kkfluous	74d6efe261	Revert "fix(mileage): 区分年度累计里程和计入完成" This reverts commit `3f0edfaaf5`.	2026-06-03 14:53:54 +08:00
kkfluous	a124e31fab	Revert "fix(mileage): 未到期年度累计对齐实时监控" This reverts commit `a3dfe7ab8c`.	2026-06-03 14:53:54 +08:00