From b12d9ad7329ec510528f338013e7642663d5888a Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 21 Jan 2026 11:15:39 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6-=E8=AF=A6=E6=83=85-=E7=82=B9=E6=A3=80=E5=B1=A5?=
 =?UTF-8?q?=E5=8E=86/=E4=BF=9D=E5=85=BB=E5=B1=A5=E5=8E=86/=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E5=B1=A5=E5=8E=86=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/dvrepair/index.ts         |   8 +
 src/api/mes/ticketManagement/index.ts |  16 +
 src/views/mes/deviceledger/index.vue  | 440 ++++++++++++++++++--------
 3 files changed, 336 insertions(+), 128 deletions(-)

diff --git a/src/api/mes/dvrepair/index.ts b/src/api/mes/dvrepair/index.ts
index d5b9e2f3..f3f9c4b7 100644
--- a/src/api/mes/dvrepair/index.ts
+++ b/src/api/mes/dvrepair/index.ts
@@ -63,4 +63,12 @@ export const DvRepairApi = {
   getDvRepairLineListByRepairId: async (repairId) => {
     return await request.get({ url: `/mes/dv-repair/dv-repair-line/list-by-repair-id?repairId=` + repairId })
   },
+
+  getRepairListByDeviceId: async (params: { deviceId: number; startTime?: string; endTime?: string }) => {
+    return await request.get({ url: `/mes/dv-repair/getRepairListByDeviceId`, params })
+  },
+
+  exportRepairExcel: async (params: { deviceId: number; startTime?: string; endTime?: string }) => {
+    return await request.download({ url: `/mes/dv-repair/export-repair-excel`, params })
+  }
 }
diff --git a/src/api/mes/ticketManagement/index.ts b/src/api/mes/ticketManagement/index.ts
index 9786437b..fa89cf8b 100644
--- a/src/api/mes/ticketManagement/index.ts
+++ b/src/api/mes/ticketManagement/index.ts
@@ -47,5 +47,21 @@ export const TicketManagementApi = {
 
   batchUpdateTicketResults: async (data: TicketResultVO[]) => {
     return await request.put({ url: `/mes/ticket-results/batchUpdate`, data })
+  },
+
+  getInspectionByDeviceId: async (params: { deviceId: number; startTime?: string; endTime?: string }) => {
+    return await request.get({ url: `/mes/ticket-management/getInspectionByDeviceId`, params })
+  },
+
+  exportInspection: async (params: { deviceId: number; startTime?: string; endTime?: string }) => {
+    return await request.download({ url: `/mes/ticket-management/export-excel-inspection`, params })
+  },
+
+  getMaintenanceByDeviceId: async (params: { deviceId: number; startTime?: string; endTime?: string }) => {
+    return await request.get({ url: `/mes/ticket-management/getMaintenanceByDeviceId`, params })
+  },
+
+  exportMaintenance: async (params: { deviceId: number; startTime?: string; endTime?: string }) => {
+    return await request.download({ url: `/mes/ticket-management/export-excel-maintenance`, params })
   }
 }
diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue
index 712bdaae..f05a40a2 100644
--- a/src/views/mes/deviceledger/index.vue
+++ b/src/views/mes/deviceledger/index.vue
@@ -56,8 +56,8 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
               {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column label="编码" align="center" prop="deviceCode" min-width="110px"/>
-          <el-table-column label="名称" align="center" prop="deviceName" min-width="120px"/>
+          <el-table-column label="编码" align="center" prop="deviceCode" min-width="110px" />
+          <el-table-column label="名称" align="center" prop="deviceName" min-width="120px" />
           <el-table-column label="类型" align="center" prop="deviceType" min-width="110px">
             <template #default="scope">
               <el-tag effect="light">
@@ -86,7 +86,7 @@ label="入厂日期" align="center" prop="factoryEntryDate" :formatter="dateForm
             width="140px" />
           <!-- <el-table-column label="供应商" align="center" prop="supplier" width="110px" /> -->
           <!-- <el-table-column label="所属车间" align="center" prop="workshop" width="110px" /> -->
-          <el-table-column label="位置" align="center" prop="deviceLocation" min-width="150px"/>
+          <el-table-column label="位置" align="center" prop="deviceLocation" min-width="150px" />
           <!-- <el-table-column label="使用部门" align="center" prop="systemOrg" width="110px" /> -->
           <el-table-column label="责任人" align="center" prop="deviceManagerName" width="150px" />
           <el-table-column label="备注" align="center" prop="remark" />
@@ -148,9 +148,24 @@ link type="danger" @click="handleDelete(scope.row.id)"
 
         <el-tabs v-model="detailActiveTab" class="mt-12px">
           <el-tab-pane label="点检履历" name="check">
+            <div style="margin-bottom: 16px;">
+              <el-date-picker
+v-model="inspectionDateRange" type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
+                start-placeholder="开始时间" end-placeholder="结束时间" range-separator="至" :unlink-panels="true"
+                class="mr-10px" />
+              <el-button type="primary" plain @click="handleQueryInspection">查询</el-button>
+              <el-button @click="handleResetInspection">重置</el-button>
+              <el-button
+type="success" plain :loading="inspectionExportLoading" @click="handleExportInspection"
+                v-hasPermi="['mes:device-ledger:export']">
+                <Icon icon="ep:download" class="mr-5px" /> 导出
+              </el-button>
+            </div>
             <el-empty v-if="!inspectionStepGroups.length" />
-            <el-steps v-else direction="vertical" :active="inspectionStepGroups.length" class="device-ledger-history-steps">
-              <el-step v-for="group in inspectionStepGroups" :key="group.key">
+            <el-steps
+v-else direction="vertical" :active="inspectionStepGroups.length"
+              class="device-ledger-history-steps">
+              <el-step v-for="group in inspectionStepGroups" :key="group.key" style="margin-top:8px">
                 <template #title>
                   <div class="device-ledger-history-title">
                     <span class="device-ledger-history-time">[{{ group.time }}]</span>
@@ -167,7 +182,9 @@ link type="danger" @click="handleDelete(scope.row.id)"
                       <div class="device-ledger-history-item-body">
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">点检方式</span>
-                          <span class="device-ledger-history-item-value">{{ item.method ?? '-' }}</span>
+                          <span class="device-ledger-history-item-value">
+                            <dict-tag type="Inspection_method" :value="item.method" />
+                          </span>
                         </div>
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">判定标准</span>
@@ -175,7 +192,8 @@ link type="danger" @click="handleDelete(scope.row.id)"
                         </div>
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">点检时间</span>
-                          <span class="device-ledger-history-item-value">{{ formatHistoryTime(item.inspectionTime) }}</span>
+                          <span class="device-ledger-history-item-value">{{ formatHistoryTime(item.taskTime)
+                          }}</span>
                         </div>
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">创建时间</span>
@@ -187,14 +205,8 @@ link type="danger" @click="handleDelete(scope.row.id)"
                         </div>
                         <div v-if="item.images?.length" class="device-ledger-history-item-images">
                           <el-image
-                            v-for="img in item.images"
-                            :key="img"
-                            :src="img"
-                            :preview-src-list="item.images"
-                            preview-teleported
-                            fit="cover"
-                            class="device-ledger-history-item-image"
-                          >
+v-for="img in item.images" :key="img" :src="img" :preview-src-list="item.images"
+                            preview-teleported fit="cover" class="device-ledger-history-item-image">
                             <template #error>
                               <div class="device-ledger-history-image-error">图片加载失败</div>
                             </template>
@@ -208,9 +220,24 @@ link type="danger" @click="handleDelete(scope.row.id)"
             </el-steps>
           </el-tab-pane>
           <el-tab-pane label="保养履历" name="maintain">
+            <div style="margin-bottom: 16px;">
+              <el-date-picker
+v-model="maintainDateRange" type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
+                start-placeholder="开始时间" end-placeholder="结束时间" range-separator="至" :unlink-panels="true"
+                class="mr-10px" />
+              <el-button type="primary" plain @click="handleQueryMaintain">查询</el-button>
+              <el-button @click="handleResetMaintain">重置</el-button>
+              <el-button
+type="success" plain :loading="maintainExportLoading" @click="handleExportMaintain"
+                v-hasPermi="['mes:device-ledger:export']">
+                <Icon icon="ep:download" class="mr-5px" /> 导出
+              </el-button>
+            </div>
             <el-empty v-if="!maintainStepGroups.length" />
-            <el-steps v-else direction="vertical" class="device-ledger-history-steps" :active="maintainStepGroups.length">
-              <el-step v-for="group in maintainStepGroups" :key="group.key">
+            <el-steps
+v-else direction="vertical" class="device-ledger-history-steps"
+              :active="maintainStepGroups.length">
+              <el-step v-for="group in maintainStepGroups" :key="group.key" style="margin-top:8px">
                 <template #title>
                   <div class="device-ledger-history-title">
                     <span class="device-ledger-history-time">[{{ group.time }}]</span>
@@ -227,7 +254,9 @@ link type="danger" @click="handleDelete(scope.row.id)"
                       <div class="device-ledger-history-item-body">
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">保养方式</span>
-                          <span class="device-ledger-history-item-value">{{ item.method ?? '-' }}</span>
+                          <span class="device-ledger-history-item-value">
+                            <dict-tag type="Inspection_method" :value="item.method" />
+                          </span>
                         </div>
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">判定标准</span>
@@ -235,7 +264,9 @@ link type="danger" @click="handleDelete(scope.row.id)"
                         </div>
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">保养时间</span>
-                          <span class="device-ledger-history-item-value">{{ formatHistoryTime(item.inspectionTime) }}</span>
+                          <span class="device-ledger-history-item-value">
+                            {{ String(formatHistoryTime(item.taskTime)).split(' ')[0] }}
+                          </span>
                         </div>
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">创建时间</span>
@@ -247,14 +278,8 @@ link type="danger" @click="handleDelete(scope.row.id)"
                         </div>
                         <div v-if="item.images?.length" class="device-ledger-history-item-images">
                           <el-image
-                            v-for="img in item.images"
-                            :key="img"
-                            :src="img"
-                            :preview-src-list="item.images"
-                            preview-teleported
-                            fit="cover"
-                            class="device-ledger-history-item-image"
-                          >
+v-for="img in item.images" :key="img" :src="img" :preview-src-list="item.images"
+                            preview-teleported fit="cover" class="device-ledger-history-item-image">
                             <template #error>
                               <div class="device-ledger-history-image-error">图片加载失败</div>
                             </template>
@@ -268,6 +293,19 @@ link type="danger" @click="handleDelete(scope.row.id)"
             </el-steps>
           </el-tab-pane>
           <el-tab-pane label="维修履历" name="repair">
+            <div style="margin-bottom: 16px;">
+              <el-date-picker
+v-model="repairDateRange" type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
+                start-placeholder="开始时间" end-placeholder="结束时间" range-separator="至" :unlink-panels="true"
+                class="mr-10px" />
+              <el-button type="primary" plain @click="handleQueryRepair">查询</el-button>
+              <el-button @click="handleResetRepair">重置</el-button>
+              <el-button
+type="success" plain :loading="repairExportLoading" @click="handleExportRepair"
+                v-hasPermi="['mes:device-ledger:export']">
+                <Icon icon="ep:download" class="mr-5px" /> 导出
+              </el-button>
+            </div>
             <el-empty v-if="!repairGroups.length" />
             <el-collapse v-else v-model="repairActiveNames" class="device-ledger-repair-collapse">
               <el-collapse-item v-for="group in repairGroups" :key="group.key" :name="group.key">
@@ -278,50 +316,40 @@ link type="danger" @click="handleDelete(scope.row.id)"
                   </div>
                 </template>
                 <div class="device-ledger-history-items">
-                  <div v-for="row in group.items" :key="String(row.id ?? row.subjectId ?? row.subjectCode)" class="device-ledger-history-item">
+                  <div
+v-for="row in group.items" :key="String(row.id ?? row.subjectId ?? row.subjectCode)"
+                    class="device-ledger-history-item">
                     <div class="device-ledger-history-item-head">
                       <el-tag type="info" effect="light">{{ row.subjectCode ?? '-' }}</el-tag>
                       <span class="device-ledger-history-item-text">{{ row.subjectName ?? '-' }}</span>
                     </div>
                     <div class="device-ledger-history-item-body">
-                      <div class="device-ledger-history-item-row">
-                        <span class="device-ledger-history-item-label">维修单ID</span>
-                        <span class="device-ledger-history-item-value">{{ row.repairId ?? '-' }}</span>
-                      </div>
                       <div class="device-ledger-history-item-row">
                         <span class="device-ledger-history-item-label">项目内容</span>
                         <span class="device-ledger-history-item-value">{{ row.subjectContent ?? '-' }}</span>
                       </div>
                       <div class="device-ledger-history-item-row">
-                        <span class="device-ledger-history-item-label">判定标准</span>
-                        <span class="device-ledger-history-item-value">{{ row.subjectStandard ?? '-' }}</span>
-                      </div>
-                      <div class="device-ledger-history-item-row">
-                        <span class="device-ledger-history-item-label">故障描述</span>
-                        <span class="device-ledger-history-item-value">{{ row.malfunction ?? '-' }}</span>
-                      </div>
-                      <div class="device-ledger-history-item-row">
-                        <span class="device-ledger-history-item-label">维修描述</span>
-                        <span class="device-ledger-history-item-value">{{ row.repairDes ?? '-' }}</span>
+                        <span class="device-ledger-history-item-label">维修结果</span>
+                        <span class="device-ledger-history-item-value">
+                          <el-tag :type="getResultTagType(row.result ?? row.repairResult)">
+                            {{ getResultLabel(row.repairResult ?? row.result) }}
+                          </el-tag>
+                        </span>
                       </div>
                       <div class="device-ledger-history-item-row">
                         <span class="device-ledger-history-item-label">备注</span>
                         <span class="device-ledger-history-item-value">{{ row.remark ?? '-' }}</span>
                       </div>
                       <div class="device-ledger-history-item-row">
-                        <span class="device-ledger-history-item-label">创建时间</span>
-                        <span class="device-ledger-history-item-value">{{ formatHistoryTime(row.createTime) }}</span>
+                        <span class="device-ledger-history-item-label">完成日期</span>
+                        <span class="device-ledger-history-item-value">{{
+                          String(formatHistoryTime(row.finishDate)).split(' ')[0] }}</span>
                       </div>
                       <div v-if="row.malfunctionImages?.length" class="device-ledger-history-item-images">
                         <el-image
-                          v-for="img in row.malfunctionImages"
-                          :key="img"
-                          :src="img"
-                          :preview-src-list="row.malfunctionImages"
-                          preview-teleported
-                          fit="cover"
-                          class="device-ledger-history-item-image"
-                        >
+v-for="img in row.malfunctionImages" :key="img" :src="img"
+                          :preview-src-list="row.malfunctionImages" preview-teleported fit="cover"
+                          class="device-ledger-history-item-image">
                           <template #error>
                             <div class="device-ledger-history-image-error">图片加载失败</div>
                           </template>
@@ -336,73 +364,47 @@ link type="danger" @click="handleDelete(scope.row.id)"
           <el-tab-pane label="关键件" name="criticalComponent">
             <div class="device-ledger-tab-toolbar">
               <el-button
-                type="success"
-                plain
-                :loading="criticalExportLoading"
-                @click="handleExportCriticalComponent"
-                v-hasPermi="['mes:device-ledger:export']"
-              >
+type="success" plain :loading="criticalExportLoading" @click="handleExportCriticalComponent"
+                v-hasPermi="['mes:device-ledger:export']">
                 <Icon icon="ep:download" class="mr-5px" /> 导出
               </el-button>
             </div>
             <el-table
-              v-loading="loading"
-              :data="detailData?.componentList"
-              :stripe="true"
-              :show-overflow-tooltip="true"
-            >
+v-loading="loading" :data="detailData?.componentList" :stripe="true"
+              :show-overflow-tooltip="true">
               <el-table-column label="编码" align="center" prop="code" min-width="140" />
               <el-table-column label="名称" align="center" prop="name" min-width="140" />
               <el-table-column label="描述" align="center" prop="description" min-width="180" />
               <el-table-column label="备注" align="center" prop="remark" min-width="180" />
-              <el-table-column
-                label="创建时间"
-                align="center"
-                prop="createTime"
-                :formatter="dateFormatter"
-                width="180"
-              />
+              <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="备件" name="component">
             <div class="device-ledger-tab-toolbar">
               <el-button
-                type="success"
-                plain
-                :loading="spareExportLoading"
-                @click="handleExportSpareBased"
-                v-hasPermi="['mes:device-ledger:export']"
-              >
+type="success" plain :loading="spareExportLoading" @click="handleExportSpareBased"
+                v-hasPermi="['mes:device-ledger:export']">
                 <Icon icon="ep:download" class="mr-5px" /> 导出
               </el-button>
             </div>
-            <el-table
-              v-loading="loading"
-              :data="detailData?.beijianList"
-              :stripe="true"
-              :show-overflow-tooltip="true"
-            >
+            <el-table v-loading="loading" :data="detailData?.beijianList" :stripe="true" :show-overflow-tooltip="true">
               <el-table-column label="备件编码" align="center" prop="barCode" />
               <el-table-column label="备件名称" align="left" prop="name" width="220px" />
               <el-table-column label="分类" align="center" prop="categoryName" />
               <el-table-column label="单位" align="center" prop="unitName" />
-              <el-table-column
-                label="创建时间"
-                align="center"
-                prop="createTime"
-                :formatter="dateFormatter"
-                width="180px"
-              />
+              <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="模具" name="mold">
             <el-table v-loading="loading" :data="detailData?.moldList" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="编码" align="center" prop="code" min-width="140" />
-      <el-table-column label="名称" align="center" prop="name" min-width="140" />
-      <el-table-column label="备注" align="center" prop="remark" min-width="180" />
-      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
-    </el-table>
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
+              <el-table-column label="编码" align="center" prop="code" min-width="140" />
+              <el-table-column label="名称" align="center" prop="name" min-width="140" />
+              <el-table-column label="备注" align="center" prop="remark" min-width="180" />
+              <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
+            </el-table>
+            <Pagination
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+              @pagination="getList" />
           </el-tab-pane>
         </el-tabs>
       </ContentWrap>
@@ -419,6 +421,8 @@ import download from '@/utils/download'
 import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
 import { DeviceTypeApi, DeviceTypeTreeVO } from '@/api/mes/devicetype'
 import { CriticalComponentApi } from '@/api/mes/criticalComponent'
+import { TicketManagementApi } from '@/api/mes/ticketManagement'
+import { DvRepairApi } from '@/api/mes/dvrepair'
 import DeviceLedgerForm from './DeviceLedgerForm.vue'
 import { getIntDictOptions } from '@/utils/dict'
 import { isHexColor } from '@/utils/color'
@@ -445,6 +449,12 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const criticalExportLoading = ref(false)
 const spareExportLoading = ref(false)
+const inspectionExportLoading = ref(false)
+const inspectionDateRange = ref<string[] | undefined>(undefined)
+const maintainExportLoading = ref(false)
+const maintainDateRange = ref<string[] | undefined>(undefined)
+const repairExportLoading = ref(false)
+const repairDateRange = ref<string[] | undefined>(undefined)
 
 const tableRef = ref()
 const selectedIds = ref<number[]>([])
@@ -455,14 +465,8 @@ const handleSelectionChange = (rows: any[]) => {
 const dictStore = useDictStoreWithOut()
 const dictReady = ref(false)
 
-const inspectionHistory = computed(() => {
-  return (detailData.value as any)?.inspectionList ?? []
-})
-
-const maintainHistory = computed(() => {
-  const list = (detailData.value as any)?.maintainList
-  return Array.isArray(list) ? list : []
-})
+const inspectionHistory = ref<any[]>([])
+const maintainHistory = ref<any[]>([])
 
 const formatHistoryTime = (value: any) => {
   const raw = value ?? '-'
@@ -472,21 +476,43 @@ const formatHistoryTime = (value: any) => {
     if (hh !== undefined) return `${y}-${pad(m)}-${pad(d)} ${pad(hh)}:${pad(mm)}:${pad(ss)}`
     return `${y}-${pad(m)}-${pad(d)}`
   }
+  const tryDateFromNumber = (v: any) => {
+    const num = Number(v)
+    if (!Number.isFinite(num)) return undefined
+    const s = String(v).trim()
+    const ms = s.length === 10 ? num * 1000 : num
+    const d = new Date(ms)
+    if (Number.isNaN(d.getTime())) return undefined
+    return d
+  }
+  const tryDateFromString = (v: any) => {
+    const s = String(v).trim()
+    if (!s) return undefined
+    const d = new Date(s)
+    if (Number.isNaN(d.getTime())) return undefined
+    return d
+  }
+  const d = typeof raw === 'number' ? tryDateFromNumber(raw) : tryDateFromNumber(raw) ?? tryDateFromString(raw)
+  if (d) return formatDate(d, 'YYYY-MM-DD HH:mm:ss')
   return String(raw)
 }
 
 const getResultLabel = (value: any) => {
   const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (!v) return '-'
+  const upper = v.toUpperCase()
   if (v === '0') return '待检测'
-  if (v === '1') return 'OK'
-  if (v === '2') return 'NG'
-  return '-'
+  if (v === '1' || upper === 'OK') return '通过'
+  if (v === '2' || upper === 'NG') return '不通过'
+  return v
 }
 
 const getResultTagType = (value: any) => {
   const v = value === '' || value === null || value === undefined ? undefined : String(value)
-  if (v === '1') return 'success'
-  if (v === '2') return 'danger'
+  if (!v) return 'info'
+  const upper = v.toUpperCase()
+  if (v === '1' || upper === 'OK') return 'success'
+  if (v === '2' || upper === 'NG') return 'danger'
   if (v === '0') return 'info'
   return 'info'
 }
@@ -509,7 +535,7 @@ const buildStepGroups = (rows: any[], options: { timeField: string; nameFieldCan
 
   for (const row of rows ?? []) {
     const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime)
-    const operator = String(row?.creatorName ?? row?.creator ?? '-')
+    const operator = String(row?.operator ?? row?.creatorName ?? row?.creator ?? '-')
     const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
 
     const name =
@@ -525,7 +551,7 @@ const buildStepGroups = (rows: any[], options: { timeField: string; nameFieldCan
       criteria: row?.judgmentCriteria,
       images: parseImages(row?.images),
       remark: row?.remark,
-      inspectionTime: row?.inspectionTime,
+      taskTime: row?.taskTime,
       createTime: row?.createTime
     }
 
@@ -558,6 +584,8 @@ const maintainStepGroups = computed<HistoryStepGroup[]>(() => {
 type RepairHistoryRow = {
   id?: any
   repairId?: any
+  repairCode?: any
+  repairName?: any
   subjectId?: any
   subjectCode?: any
   subjectName?: any
@@ -568,38 +596,128 @@ type RepairHistoryRow = {
   repairDes?: any
   remark?: any
   createTime?: any
+  finishDate?: any
+  result?: any
+  repairResult?: any
   malfunctionImages?: string[]
 }
 
 type RepairHistoryGroup = { key: string; name: string; items: RepairHistoryRow[] }
 
 const repairActiveNames = ref<string[]>([])
+const repairList = ref<RepairHistoryRow[]>([])
 
 const repairGroups = computed<RepairHistoryGroup[]>(() => {
-  const raw = (detailData.value as any)?.repairList
-  if (!raw || typeof raw !== 'object') return []
-  const entries = Object.entries(raw as Record<string, any>)
-  const groups = entries
-    .map(([name, rows]) => {
-      const list = Array.isArray(rows) ? rows : []
-      return {
-        key: String(name),
-        name: String(name),
-        items: list.map((row: any) => ({
-          ...row,
-          malfunctionImages: parseImages(row?.malfunctionUrl)
-        }))
-      } as RepairHistoryGroup
+  const groupsMap = new Map<string, RepairHistoryGroup>()
+  for (const row of repairList.value ?? []) {
+    const key = String(row.repairCode ?? row.repairId ?? row.subjectName ?? '-')
+    if (!groupsMap.has(key)) {
+      groupsMap.set(key, {
+        key,
+        name: String(row.repairName ?? row.repairCode ?? key),
+        items: []
+      })
+    }
+    const group = groupsMap.get(key)!
+    group.items.push({
+      ...row,
+      malfunctionImages: parseImages(row?.malfunctionUrl)
     })
-    .filter((g) => g.items.length)
+  }
+
+  const groups = Array.from(groupsMap.values()).filter((g) => g.items.length)
 
   return groups.sort((a, b) => {
-    const at = formatHistoryTime(a.items?.[0]?.createTime)
-    const bt = formatHistoryTime(b.items?.[0]?.createTime)
+    const at = formatHistoryTime(a.items?.[0]?.finishDate ?? a.items?.[0]?.createTime)
+    const bt = formatHistoryTime(b.items?.[0]?.finishDate ?? b.items?.[0]?.createTime)
     return String(bt).localeCompare(String(at))
   })
 })
 
+const fetchInspectionHistory = async () => {
+  if (!selectedDetailId.value) return
+  const params: any = { deviceId: selectedDetailId.value }
+  if (inspectionDateRange.value && inspectionDateRange.value.length === 2) {
+    params.startTime = inspectionDateRange.value[0]
+    params.endTime = inspectionDateRange.value[1]
+  }
+  const data = await TicketManagementApi.getInspectionByDeviceId(params)
+  inspectionHistory.value = Array.isArray(data) ? data : []
+}
+
+const handleQueryInspection = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  await fetchInspectionHistory()
+}
+
+const handleResetInspection = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  inspectionDateRange.value = undefined
+  await fetchInspectionHistory()
+}
+
+const fetchMaintainHistory = async () => {
+  if (!selectedDetailId.value) return
+  const params: any = { deviceId: selectedDetailId.value }
+  if (maintainDateRange.value && maintainDateRange.value.length === 2) {
+    params.startTime = maintainDateRange.value[0]
+    params.endTime = maintainDateRange.value[1]
+  }
+  const data = await TicketManagementApi.getMaintenanceByDeviceId(params)
+  maintainHistory.value = Array.isArray(data) ? data : []
+}
+
+const handleQueryMaintain = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  await fetchMaintainHistory()
+}
+
+const handleResetMaintain = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  maintainDateRange.value = undefined
+  await fetchMaintainHistory()
+}
+
+const fetchRepairHistory = async () => {
+  if (!selectedDetailId.value) return
+  const params: any = { deviceId: selectedDetailId.value }
+  if (repairDateRange.value && repairDateRange.value.length === 2) {
+    params.startTime = repairDateRange.value[0]
+    params.endTime = repairDateRange.value[1]
+  }
+  const data = await DvRepairApi.getRepairListByDeviceId(params)
+  repairList.value = Array.isArray(data) ? data : []
+}
+
+const handleQueryRepair = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  await fetchRepairHistory()
+}
+
+const handleResetRepair = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  repairDateRange.value = undefined
+  await fetchRepairHistory()
+}
+
 const tzStatusOptions = computed(() => {
   if (!dictReady.value) return []
   const options = getIntDictOptions('mes_tz_status')
@@ -712,7 +830,10 @@ const handleDetail = async (id: number) => {
   detailLoading.value = true
   try {
     detailData.value = await DeviceLedgerApi.getDeviceLedger(id)
-    const keys = Object.keys(((detailData.value as any)?.repairList ?? {}) as any)
+    await fetchInspectionHistory()
+    await fetchMaintainHistory()
+    await fetchRepairHistory()
+    const keys = repairGroups.value.map((g) => g.key)
     repairActiveNames.value = keys.length ? [keys[0]] : []
   } finally {
     detailLoading.value = false
@@ -841,6 +962,69 @@ const handleExportSpareBased = async () => {
   }
 }
 
+const handleExportInspection = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  try {
+    await message.exportConfirm()
+    inspectionExportLoading.value = true
+    const params: any = { deviceId: selectedDetailId.value }
+    if (inspectionDateRange.value && inspectionDateRange.value.length === 2) {
+      params.startTime = inspectionDateRange.value[0]
+      params.endTime = inspectionDateRange.value[1]
+    }
+    const data = await TicketManagementApi.exportInspection(params)
+    download.excel(data, '点检履历.xls')
+  } catch {
+  } finally {
+    inspectionExportLoading.value = false
+  }
+}
+
+const handleExportMaintain = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  try {
+    await message.exportConfirm()
+    maintainExportLoading.value = true
+    const params: any = { deviceId: selectedDetailId.value }
+    if (maintainDateRange.value && maintainDateRange.value.length === 2) {
+      params.startTime = maintainDateRange.value[0]
+      params.endTime = maintainDateRange.value[1]
+    }
+    const data = await TicketManagementApi.exportMaintenance(params)
+    download.excel(data, '保养履历.xls')
+  } catch {
+  } finally {
+    maintainExportLoading.value = false
+  }
+}
+
+const handleExportRepair = async () => {
+  if (!selectedDetailId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  try {
+    await message.exportConfirm()
+    repairExportLoading.value = true
+    const params: any = { deviceId: selectedDetailId.value }
+    if (repairDateRange.value && repairDateRange.value.length === 2) {
+      params.startTime = repairDateRange.value[0]
+      params.endTime = repairDateRange.value[1]
+    }
+    const data = await DvRepairApi.exportRepairExcel(params)
+    download.excel(data, '维修履历.xls')
+  } catch {
+  } finally {
+    repairExportLoading.value = false
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   await dictStore.setDictMap()