diff --git a/src/views/dms/prodBaseMachineInfo/index.vue b/src/views/dms/prodBaseMachineInfo/index.vue
index 49f7b36..6ae93fe 100644
--- a/src/views/dms/prodBaseMachineInfo/index.vue
+++ b/src/views/dms/prodBaseMachineInfo/index.vue
@@ -48,33 +48,6 @@
       </div>
     </div>
 
-    <!-- 统计仪表盘 -->
-    <div class="statistics-dashboard">
-      <div v-for="stat in statistics" :key="stat.type"
-           :class="['stat-item', `stat-${stat.type}`]">
-        <div class="stat-bg-effect"></div>
-        <div class="stat-inner">
-          <div class="stat-icon-wrapper">
-            <el-icon :size="32">
-              <component :is="stat.icon" />
-            </el-icon>
-          </div>
-          <div class="stat-info">
-            <div class="stat-number">
-              <span class="value-animate">{{ stat.value }}</span>
-              <span class="unit">{{ stat.unit }}</span>
-            </div>
-            <div class="stat-title">{{ stat.label }}</div>
-          </div>
-        </div>
-        <div class="stat-chart">
-          <svg viewBox="0 0 100 40">
-            <polyline :points="stat.trend" fill="none" stroke="currentColor" stroke-width="2"/>
-          </svg>
-        </div>
-      </div>
-    </div>
-
     <!-- 功能操作区 -->
     <div class="action-toolbar">
       <div class="toolbar-left">
@@ -91,12 +64,27 @@
           </el-button>
         </el-button-group>
       </div>
-<!--      <div class="toolbar-right">-->
-<!--        <el-button type="primary" @click="exportData">-->
-<!--          <el-icon><Download /></el-icon>-->
-<!--          导出数据-->
-<!--        </el-button>-->
-<!--      </div>-->
+      <div class="toolbar-right">
+        <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseMachineInfo:add']">
+          新增设备
+        </el-button>
+        <el-button type="success" icon="Edit" :disabled="single" @click="handleUpdate()"
+                   v-hasPermi="['dms:dmsBaseMachineInfo:edit']">
+          修改设备
+        </el-button>
+        <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()"
+                   v-hasPermi="['dms:dmsBaseMachineInfo:remove']">
+          删除设备
+        </el-button>
+        <el-button type="warning" icon="Download" @click="handleExport"
+                   v-hasPermi="['dms:dmsBaseMachineInfo:export']">
+          导出数据
+        </el-button>
+        <el-button text @click="showSearch = !showSearch">
+          <el-icon><Filter /></el-icon>
+          {{ showSearch ? '隐藏' : '显示' }}筛选
+        </el-button>
+      </div>
     </div>
 
     <!-- 查询过滤器 -->
@@ -128,8 +116,8 @@
                        :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="设备类型" prop="deviceType">
-          <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable>
+        <el-form-item label="设备类型" prop="machineType">
+          <el-select v-model="queryParams.machineType" placeholder="请选择设备类型" clearable>
             <el-option v-for="type in deviceTypes" :key="type.deviceTypeId"
                        :label="type.deviceTypeName" :value="type.deviceTypeId" />
           </el-select>
@@ -156,11 +144,19 @@
 
               <!-- 设备图标区 -->
               <div class="machine-visual">
-                <div class="machine-icon-bg">
+                <div class="machine-icon-bg" v-if="!machine.photoAddress">
                   <el-icon :size="40">
-                    <component :is="getMachineIcon(machine.deviceType)" />
+                    <component :is="getMachineIcon(machine.machineType)" />
                   </el-icon>
                 </div>
+                <div class="machine-photo" v-else>
+                  <ImagePreview
+                    :width="40"
+                    :height="40"
+                    :src="machine.photoAddress"
+                    :preview-src-list="[machine.photoAddress]"
+                  />
+                </div>
                 <div class="machine-number">{{ machine.machineCode }}</div>
               </div>
 
@@ -174,7 +170,7 @@
                   </div>
                   <div class="meta-item">
                     <el-icon><Memo /></el-icon>
-                    <span>{{ getDeviceTypeName(machine.deviceType) }}</span>
+                    <span>{{ getDeviceTypeName(machine.machineType) }}</span>
                   </div>
                   <div class="meta-item">
                     <el-icon><Timer /></el-icon>
@@ -185,22 +181,29 @@
 
               <!-- 快捷操作 -->
               <div class="quick-actions">
+                <el-button size="small" @click.stop="handleUpdate(machine)" v-hasPermi="['dms:dmsBaseMachineInfo:edit']">编辑</el-button>
                 <el-button size="small" @click.stop="viewLifecycle(machine)">生命周期</el-button>
                 <el-button size="small" @click.stop="viewDetails(machine)">详情</el-button>
               </div>
             </div>
           </div>
         </transition-group>
+
+        <!-- 网格视图分页 -->
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                    v-model:limit="queryParams.pageSize" @pagination="getList" />
       </div>
 
       <!-- 列表视图 -->
       <div v-else-if="viewMode === 'list'" class="list-view">
-        <el-table v-loading="loading" :data="machineList" :row-class-name="tableRowClassName">
+        <el-table v-loading="loading" :data="machineList" :row-class-name="tableRowClassName"
+                  @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="设备编号" align="center" prop="machineCode" />
           <el-table-column label="设备名称" align="center" prop="machineName" />
-          <el-table-column label="设备类型" align="center" prop="deviceType">
+          <el-table-column label="设备类型" align="center" prop="machineType">
             <template #default="scope">
-              {{ getDeviceTypeName(scope.row.deviceType) }}
+              {{ getDeviceTypeName(scope.row.machineType) }}
             </template>
           </el-table-column>
           <el-table-column label="设备位置" align="center" prop="machineLocation" />
@@ -208,21 +211,33 @@
             <template #default="scope">
               <div class="status-cell">
                 <span :class="['status-badge', `status-${scope.row.machineStatus}`]"></span>
-                <el-tag :type="getStatusType(scope.row.machineStatus)" effect="plain">
-                  {{ getStatusLabel(scope.row.machineStatus) }}
-                </el-tag>
+                <dict-tag :options="machine_status" :value="String(scope.row.machineStatus)" />
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="设备图片" align="center" prop="photoAddress" width="100">
+            <template #default="scope">
+              <ImagePreview
+                v-if="scope.row.photoAddress && checkFileSuffix(scope.row.photoAddress)"
+                :width="50"
+                :height="50"
+                :src="scope.row.photoAddress"
+                :preview-src-list="[scope.row.photoAddress]"
+              />
+              <span v-else>无图片</span>
+            </template>
+          </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
             <template #default="scope">
               <span class="date-text">{{ formatDate(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="200">
+          <el-table-column label="操作" align="center" width="240">
             <template #default="scope">
-              <el-button type="primary" size="small" @click="viewLifecycle(scope.row)">生命周期</el-button>
+              <el-button type="primary" size="small" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseMachineInfo:edit']">编辑</el-button>
+              <el-button size="small" @click="viewLifecycle(scope.row)">生命周期</el-button>
               <el-button size="small" @click="viewDetails(scope.row)">详情</el-button>
+              <el-button type="danger" size="small" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseMachineInfo:remove']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -232,7 +247,207 @@
       </div>
     </div>
 
-    <!-- 生命周期抽履 -->
+    <!-- 添加或修改设备信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+      <el-form ref="machineFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="设备编号" prop="machineCode">
+              <el-input v-model="form.machineCode" placeholder="请输入设备编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="machineName">
+              <el-input v-model="form.machineName" placeholder="请输入设备名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+<!--         <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="资产编号" prop="assetNumber">
+              <el-input v-model="form.assetNumber" placeholder="请输入资产编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备位置" prop="machineLocation">
+              <el-input v-model="form.machineLocation" placeholder="请输入设备位置" />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="设备类型" prop="machineType">
+              <el-select v-model="form.machineType" placeholder="请选择设备类型" style="width: 100%;">
+                <el-option
+                  v-for="item in deviceTypes"
+                  :key="item.deviceTypeId"
+                  :label="item.deviceTypeName"
+                  :value="item.deviceTypeId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备规格" prop="machineSpec">
+              <el-input v-model="form.machineSpec" placeholder="请输入设备规格" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="供应商" prop="supplierId">
+              <el-input v-model="form.supplierId" placeholder="请输入供应商" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备状态" prop="machineStatus">
+              <el-select v-model="form.machineStatus" placeholder="请选择设备状态" style="width: 100%;">
+                <el-option
+                  v-for="dict in machine_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+<!--         <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属车间" prop="workshopId">
+              <el-select v-model="form.workshopId" placeholder="请选择所属车间" style="width: 100%;">
+                <el-option
+                  v-for="item in workshopInfoList"
+                  :key="item.workshopId"
+                  :label="item.workshopName"
+                  :value="item.workshopId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备模型" prop="deviceModeId">
+              <el-select v-model="form.deviceModeId" placeholder="请选择设备模型" style="width: 100%;">
+                <el-option
+                  v-for="item in deviceModeList"
+                  :key="item.deviceModeId"
+                  :label="item.deviceModeName"
+                  :value="item.deviceModeId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+<!--         <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="设备IP地址" prop="machineIp">
+              <el-input v-model="form.machineIp" placeholder="请输入设备IP地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备端口" prop="machinePort">
+              <el-input v-model="form.machinePort" placeholder="请输入设备端口" />
+            </el-form-item>
+          </el-col>
+        </el-row>-->
+<!--        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="设备协议" prop="accessProtocol">
+              <el-input v-model="form.accessProtocol" placeholder="请输入设备协议" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="寄存器地址" prop="registerAddress">
+              <el-input v-model="form.registerAddress" placeholder="请输入寄存器地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>-->
+<!--        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="数据类型" prop="dataType">
+              <el-select v-model="form.dataType" placeholder="请选择数据类型" style="width: 100%;">
+                <el-option
+                  v-for="dict in machine_data_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="数据长度" prop="dataLength">
+              <el-input-number v-model="form.dataLength" placeholder="请输入数据长度" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>-->
+<!--        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="数据编码格式" prop="dataEncoding">
+              <el-select v-model="form.dataEncoding" placeholder="请选择数据编码格式" style="width: 100%;">
+                <el-option
+                  v-for="dict in machine_data_encoding"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="请求间隔(毫秒)" prop="requestInterval">
+              <el-input-number v-model="form.requestInterval" placeholder="请输入请求间隔" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>-->
+<!--        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="班制类型" prop="classType">
+              <el-radio-group v-model="form.classType">
+                <el-radio
+                  v-for="dict in mes_class_type"
+                  :key="dict.value"
+                  :value="dict.value"
+                >{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库类型" prop="instockType">
+              <el-radio-group v-model="form.instockType">
+                <el-radio
+                  v-for="dict in mes_instock_type"
+                  :key="dict.value"
+                  :value="dict.value"
+                >{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="设备图片" prop="photoAddress">
+              <imageUpload v-model="form.file" :limit="1" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 生命周期抽屉 -->
     <el-drawer v-model="lifecycleDrawer" :title="`设备生命周期 - ${selectedMachine?.machineName || ''}`"
                size="60%" class="lifecycle-drawer">
       <div class="lifecycle-container" v-loading="lifecycleLoading">
@@ -241,7 +456,7 @@
           <div class="overview-header">
             <div class="device-avatar">
               <el-icon :size="40">
-                <component :is="getMachineIcon(selectedMachine.deviceType)" />
+                <component :is="getMachineIcon(selectedMachine.machineType)" />
               </el-icon>
             </div>
             <div class="device-basic">
@@ -307,13 +522,18 @@
                 <div class="event-tags">
                   <el-tag v-for="tag in event.tags" :key="tag" size="small">{{ tag }}</el-tag>
                 </div>
-                <div class="event-details" v-if="event.details">
+                <div class="event-details" v-if="event.details && event.details.length">
                   <el-collapse>
                     <el-collapse-item title="查看详情">
                       <el-descriptions :column="2" border>
-                        <el-descriptions-item v-for="(value, key) in event.details"
-                                              :key="key" :label="key">
-                          {{ value || '-' }}
+                        <el-descriptions-item v-for="item in event.details"
+                                              :key="item.label" :label="item.label">
+                          <template v-if="item.dictOptions">
+                            <dict-tag :options="item.dictOptions" :value="String(item.value)" />
+                          </template>
+                          <template v-else>
+                            {{ item.value ?? '-' }}
+                          </template>
                         </el-descriptions-item>
                       </el-descriptions>
                     </el-collapse-item>
@@ -346,12 +566,10 @@
                   <el-descriptions :column="1" border>
                     <el-descriptions-item label="设备编号">{{ selectedMachine?.machineCode }}</el-descriptions-item>
                     <el-descriptions-item label="设备名称">{{ selectedMachine?.machineName }}</el-descriptions-item>
-                    <el-descriptions-item label="设备类型">{{ getDeviceTypeName(selectedMachine?.deviceType) }}</el-descriptions-item>
+                    <el-descriptions-item label="设备类型">{{ getDeviceTypeName(selectedMachine?.machineType) }}</el-descriptions-item>
                     <el-descriptions-item label="设备位置">{{ selectedMachine?.machineLocation || '-' }}</el-descriptions-item>
                     <el-descriptions-item label="设备状态">
-                      <el-tag :type="getStatusType(selectedMachine?.machineStatus)">
-                        {{ getStatusLabel(selectedMachine?.machineStatus) }}
-                      </el-tag>
+                      <dict-tag :options="machine_status" :value="String(selectedMachine?.machineStatus ?? '')" />
                     </el-descriptions-item>
                     <el-descriptions-item label="创建时间">{{ formatDateTime(selectedMachine?.createTime) }}</el-descriptions-item>
                   </el-descriptions>
@@ -385,15 +603,15 @@
                     <el-col :span="6">
                       <el-statistic title="计划保养次数" :value="maintenanceStats.planned" />
                     </el-col>
-<!--                    <el-col :span="6">-->
-<!--                      <el-statistic title="临时保养次数" :value="maintenanceStats.temporary" />-->
-<!--                    </el-col>-->
-<!--                    <el-col :span="6">-->
-<!--                      <el-statistic title="平均保养间隔" :value="maintenanceStats.avgInterval" suffix="天" />-->
-<!--                    </el-col>-->
-<!--                    <el-col :span="6">-->
-<!--                      <el-statistic title="下次保养时间" :value="maintenanceStats.nextDate || '未计划'" />-->
-<!--                    </el-col>-->
+                    <el-col :span="6">
+                      <el-statistic title="临时保养次数" :value="maintenanceStats.temporary" />
+                    </el-col>
+                    <el-col :span="6">
+                      <el-statistic title="平均间隔(天)" :value="maintenanceStats.avgInterval" />
+                    </el-col>
+                    <el-col :span="6">
+                      <el-statistic title="下次保养日期" :value="maintenanceStats.nextDate || '-'" />
+                    </el-col>
                   </el-row>
                 </el-card>
               </el-col>
@@ -404,17 +622,19 @@
                   </template>
                   <el-table :data="maintenanceRecords" max-height="400">
                     <el-table-column prop="maintCode" label="保养单号" />
-                    <el-table-column prop="maintType" label="保养类型" />
+                    <el-table-column prop="maintType" label="保养类型">
+                      <template #default="scope">
+                        <dict-tag :options="maint_type" :value="String(scope.row.maintType)" />
+                      </template>
+                    </el-table-column>
                     <el-table-column prop="maintDate" label="保养日期" />
                     <el-table-column prop="maintPerson" label="保养人员" />
                     <el-table-column prop="maintContent" label="保养内容" show-overflow-tooltip />
-<!--                    <el-table-column prop="maintResult" label="保养结果">-->
-<!--                      <template #default="scope">-->
-<!--                        <el-tag :type="scope.row.maintResult === '合格' ? 'success' : 'warning'">-->
-<!--                          {{ scope.row.maintResult }}-->
-<!--                        </el-tag>-->
-<!--                      </template>-->
-<!--                    </el-table-column>-->
+                    <el-table-column prop="maintStatus" label="保养结果">
+                      <template #default="scope">
+                        <dict-tag :options="maint_status" :value="String(scope.row.maintStatus)" />
+                      </template>
+                    </el-table-column>
                   </el-table>
                 </el-card>
               </el-col>
@@ -428,24 +648,29 @@
 
 <script setup name="ProdBaseMachineInfo" lang="ts">
 import { ref, reactive, toRefs, getCurrentInstance, onMounted, onUnmounted, shallowRef, markRaw, watch } from 'vue';
-import { listDmsBaseMachineInfo, getDmsBaseMachineInfoList, getDmsBaseMachineInfo } from '@/api/dms/dmsBaseMachineInfo';
-import { listBaseDeviceType, getBaseDeviceTypeList } from '@/api/dms/baseDeviceType';
-import { listDmsBaseDevicePurchase, getDmsBaseDevicePurchaseList } from '@/api/dms/dmsBaseDevicePurchase';
-import { listDmsBaseDeviceInstall, getDmsBaseDeviceInstallList } from '@/api/dms/dmsBaseDeviceInstall';
-import { listDmsBaseDeviceDebugging, getDmsBaseDeviceDebuggingList } from '@/api/dms/dmsBaseDeviceDebugging';
-import { getDmsBaseDeviceDepreciationList } from '@/api/dms/dmsBaseDeviceDepreciation';
-import { getDmsBaseTransferInfoList } from '@/api/dms/dmsBaseTransferInfo';
-import { getDmsBillsFaultInstanceList } from '@/api/dms/dmsBillsFaultInstance';
-import { getDmsBillsMaintInstanceList } from '@/api/dms/dmsBillsMaintInstance';
-import { getDmsBillsLubeInstanceList } from '@/api/dms/dmsBillsLubeInstance';
-import { getDmsBillsInspectInstanceList } from '@/api/dms/dmsBillsInspectInstance';
-import { getDmsRepairInstanceList } from '@/api/dms/dmsRepairInstance';
-import { getDmsRecordShutDownList } from '@/api/dms/dmsRecordShutDown';
-import { getDmsBaseDeviceFilesList } from '@/api/dms/dmsBaseDeviceFiles';
-import { listDmsBaseDeviceBom } from '@/api/dms/dmsBaseDeviceBom';
-import { listDmsBaseDeviceSupplies } from '@/api/dms/dmsBaseDeviceSupplies';
-import { getBaseAlarmInfoList } from '@/api/dms/baseAlarmInfo';
-import { listDmsBaseSpecialdeviceParam, getDmsBaseSpecialdeviceParamList } from '@/api/dms/dmsBaseSpecialdeviceParam';
+import type { ComponentInternalInstance } from 'vue';
+import {
+  listDmsBaseMachineInfo,
+  getDmsBaseMachineInfo,
+  addProdBaseMachineInfo,
+  updateProdBaseMachineInfo,
+  delDmsBaseMachineInfo
+} from '@/api/dms/dmsBaseMachineInfo';
+import { getBaseDeviceTypeList } from '@/api/dms/baseDeviceType';
+import { getDmsBaseDevicePurchaseList, getPurchaseCount } from '@/api/dms/dmsBaseDevicePurchase';
+import { getDmsBaseDeviceInstallList, getInstallCount } from '@/api/dms/dmsBaseDeviceInstall';
+import { getDmsBaseDeviceDebuggingList, getDebuggingCount } from '@/api/dms/dmsBaseDeviceDebugging';
+import { getDmsBillsFaultInstanceList, getFaultInstanceCount } from '@/api/dms/dmsBillsFaultInstance';
+import { getDmsBillsMaintDetailList, getMaintInstancesByMachineId, countMaintInstancesByMachineId } from '@/api/dms/dmsBillsMaintDetail';
+import { getDmsInspectInstanceDetailList, getInspectInstancesByMachineId, countInspectInstancesByMachineId } from '@/api/dms/dmsInspectInstanceDetail';
+import { getBaseAlarmInfoList, getAlarmInfoCount } from '@/api/dms/baseAlarmInfo';
+import { getDmsBaseSpecialdeviceParamList } from '@/api/dms/dmsBaseSpecialdeviceParam';
+import { getWorkshopList } from '@/api/mes/baseWorkshopInfo';
+import { getDmsDeviceModeList } from '@/api/dms/deviceMode';
+import { ProdBaseMachineInfoVO, ProdBaseMachineInfoForm } from '@/api/dms/dmsBaseMachineInfo/types';
+import imageUpload from '@/components/ImageUpload/index.vue';
+import ImagePreview from '@/components/ImagePreview/index.vue';
+import request from '@/utils/request';
 
 // 图标导入
 import {
@@ -453,25 +678,45 @@ import {
   Location, Memo, Timer, InfoFilled, Calendar, DataAnalysis, TrendCharts,
   Download, Search, Refresh, Document, Files, Box, Setting,
   Tools, Notification, TurnOff, Warning, Money, Switch, View,
-  ShoppingCart, CircleCheck, Position, MagicStick
+  ShoppingCart, CircleCheck, Position, MagicStick, Plus, Edit, Delete
 } from '@element-plus/icons-vue';
 
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-// TODO: 需要引入完整的字典数据
-const { machine_status, debug_status, fault_status, maint_level, maint_status, handle_status, bills_status, active_flag } = toRefs(proxy.useDict(
-  'machine_status', 'debug_status', 'fault_status', 'maint_level', 'maint_status', 'handle_status', 'bills_status', 'active_flag'
+// 设备台账页面实际使用到的核心字典集合
+const {
+  machine_status,
+  debug_status,
+  fault_status,
+  maint_level,
+  maint_status,
+  handle_status,
+  bills_status,
+  active_flag,
+  machine_data_type,
+  machine_data_encoding,
+  mes_class_type,
+  mes_instock_type
+} = toRefs<any>(proxy?.useDict(
+  'machine_status',
+  'debug_status',
+  'fault_status',
+  'maint_level',
+  'maint_status',
+  'handle_status',
+  'bills_status',
+  'active_flag',
+  'machine_data_type',
+  'machine_data_encoding',
+  'mes_class_type',
+  'mes_instock_type'
 ));
-// TODO: 需要补充以下字典
-// const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
-// const { maint_type } = toRefs<any>(proxy?.useDict('maint_type'));
-// const { alarm_level } = toRefs<any>(proxy?.useDict('alarm_level'));
-// const { handle_status } = toRefs<any>(proxy?.useDict('handle_status'));
-// const { bills_status } = toRefs<any>(proxy?.useDict('bills_status'));
-// const { device_status } = toRefs<any>(proxy?.useDict('device_status'));
+// 本页还需要的其它字典（用于详情/统计处标签显示）
+const { maint_type, alarm_level } = toRefs<any>(proxy?.useDict('maint_type', 'alarm_level'));
 
 // 响应式数据
 const loading = ref(false);
+const buttonLoading = ref(false);
 const showSearch = ref(true);
 const machineList = ref([]);
 const total = ref(0);
@@ -483,8 +728,24 @@ const activeTab = ref('basic');
 const lifecycleLoading = ref(false);
 const selectedLifecycleTypes = ref([]);
 const lifecycleEvents = ref([]);
+// 防抖/竞态控制：仅应用最近一次生命周期数据请求的结果
+const lifecycleRequestId = ref(0);
 const currentTime = ref('');
 const deviceTypes = ref([]);
+const workshopInfoList = ref([]);
+const deviceModeList = ref([]);
+
+// 表单相关
+const queryFormRef = ref<ElFormInstance>();
+const machineFormRef = ref<ElFormInstance>();
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
 
 // 查询参数
 const queryParams = ref({
@@ -494,44 +755,52 @@ const queryParams = ref({
   machineName: undefined,
   machineLocation: undefined,
   machineStatus: undefined,
-  deviceType: undefined
+  machineType: undefined
 });
 
-// 统计数据
-const statistics = ref([
-  {
-    type: 'total',
-    label: '设备总数',
-    value: 0,
-    unit: '台',
-    icon: markRaw(Monitor),
-    trend: '0,40 20,30 40,35 60,25 80,30 100,20'
-  },
-  {
-    type: 'running',
-    label: '运行中',
-    value: 0,
-    unit: '台',
-    icon: markRaw(Setting),
-    trend: '0,30 20,25 40,35 60,20 80,28 100,25'
-  },
-  {
-    type: 'maintenance',
-    label: '维护中',
-    value: 0,
-    unit: '台',
-    icon: markRaw(Tools),
-    trend: '0,20 20,25 40,22 60,28 80,25 100,30'
-  },
-  {
-    type: 'alarm',
-    label: '报警数',
-    value: 0,
-    unit: '个',
-    icon: markRaw(Warning),
-    trend: '0,35 20,30 40,25 60,30 80,20 100,25'
-  }
-]);
+// 表单数据
+const initFormData: ProdBaseMachineInfoForm = {
+  machineId: undefined,
+  machineCode: undefined,
+  machineName: undefined,
+  assetNumber: undefined,
+  machineLocation: undefined,
+  machineType: undefined,
+  machineSpec: undefined,
+  supplierId: undefined,
+  machineStatus: '1',
+  remark: undefined,
+  photoAddress: undefined,
+  ossId: undefined,
+  // workshopId: undefined,
+  // deviceModeId: undefined,
+  // machineIp: undefined,
+  // machinePort: undefined,
+  // accessProtocol: undefined,
+  // registerAddress: undefined,
+  // dataType: undefined,
+  // dataLength: undefined,
+  // dataEncoding: undefined,
+  // requestInterval: undefined,
+  // classType: undefined,
+  // instockType: undefined,
+  file: undefined
+};
+
+const form = ref<ProdBaseMachineInfoForm>({ ...initFormData });
+
+// 表单验证规则
+const rules = reactive({
+  machineCode: [
+    { required: true, message: '设备编号不能为空', trigger: 'blur' }
+  ],
+  machineName: [
+    { required: true, message: '设备名称不能为空', trigger: 'blur' }
+  ],
+  machineStatus: [
+    { required: true, message: '设备状态不能为空', trigger: 'change' }
+  ]
+});
 
 // 生命周期类型配置
 const lifecycleTypes = ref([
@@ -600,6 +869,14 @@ const maintenanceStats = ref({
 // 维护记录
 const maintenanceRecords = ref([]);
 
+// 检查文件后缀是否为图片
+const checkFileSuffix = (fileSuffix: string | string[]) => {
+  if (!fileSuffix) return false;
+  const arr = ['.png', '.jpg', '.jpeg', '.gif'];
+  const suffix = typeof fileSuffix === 'string' ? fileSuffix.toLowerCase() : '';
+  return arr.some(item => suffix.endsWith(item));
+};
+
 // 更新时间
 const updateCurrentTime = () => {
   const now = new Date();
@@ -621,10 +898,9 @@ const getList = async () => {
     const res = await listDmsBaseMachineInfo(queryParams.value);
     machineList.value = res.rows || [];
     total.value = res.total || 0;
-
-    updateStatistics();
   } catch (error) {
     console.error('获取设备列表失败:', error);
+    proxy?.$modal.msgError('获取设备列表失败');
     machineList.value = [];
     total.value = 0;
   } finally {
@@ -635,33 +911,33 @@ const getList = async () => {
 // 获取设备类型列表
 const getDeviceTypes = async () => {
   try {
-    const res = await getBaseDeviceTypeList({ pageNum: 1, pageSize: 100 });
+    const res = await getBaseDeviceTypeList(null);
     deviceTypes.value = res.data;
   } catch (error) {
     console.error('获取设备类型失败:', error);
+    proxy?.$modal.msgError('获取设备类型失败');
   }
 };
 
-// 更新统计数据
-const updateStatistics = async () => {
-  const machines = machineList.value;
-  statistics.value[0].value = machines.length;
-  statistics.value[1].value = machines.filter(m => m.machineStatus === '1').length;
-  statistics.value[2].value = machines.filter(m => m.machineStatus === '2').length;
+// 获取车间列表
+// const getWorkshopListSelect = async () => {
+//   try {
+//     const res = await getWorkshopList(null);
+//     workshopInfoList.value = res.data;
+//   } catch (error) {
+//     console.error('获取车间列表失败:', error);
+//     proxy?.$modal.msgError('获取车间列表失败');
+//   }
+// };
 
-  // TODO: 需要统计接口 - 获取各类统计数据
-  // 建议创建统一的统计接口：getDmsDeviceStatistics()
-  // 返回：{ totalCount, runningCount, maintenanceCount, alarmCount, faultCount }
-
-  // 从真实API获取报警数
+// 获取设备模型列表
+const getDmsDeviceModeListSelect = async () => {
   try {
-    const alarmRes = await getBaseAlarmInfoList({
-      alarmStatus: '0' // 未处理的报警
-    });
-    statistics.value[3].value = alarmRes.rows?.length || 0;
+    const res = await getDmsDeviceModeList(null);
+    deviceModeList.value = res.data;
   } catch (error) {
-    console.error('获取报警统计失败:', error);
-    statistics.value[3].value = 0;
+    console.error('获取设备模型列表失败:', error);
+    proxy?.$modal.msgError('获取设备模型列表失败');
   }
 };
 
@@ -676,30 +952,24 @@ const getMachineIcon = (type) => {
   return iconMap[type] || markRaw(Monitor);
 };
 
-// 获取状态类型
-const getStatusType = (status) => {
-  const typeMap = {
-    '0': 'danger',
-    '1': 'success',
-    '2': 'warning',
-    '3': 'info'
-  };
-  return typeMap[status] || 'info';
-};
-
-// 获取状态标签
-const getStatusLabel = (status) => {
-  if (!machine_status.value) return status;
-  const dict = machine_status.value.find(d => d.value === status);
-  return dict?.label || status;
-};
-
 // 获取设备类型名称
 const getDeviceTypeName = (typeId) => {
   const type = deviceTypes.value.find(t => t.deviceTypeId === typeId);
   return type?.deviceTypeName || '-';
 };
 
+// 获取保养级别标签
+const getMaintLevelLabel = (level) => {
+  const dict = maint_level?.value?.find(d => d.value === level);
+  return dict?.label || level;
+};
+
+// 获取故障状态标签
+const getFaultStatusLabel = (status) => {
+  const dict = bills_status?.value?.find(d => d.value === status);
+  return dict?.label || status;
+};
+
 // 表格行样式
 const tableRowClassName = ({ row }) => {
   if (row.machineStatus === '0') return 'danger-row';
@@ -724,7 +994,7 @@ const calculateRunDays = (startDate) => {
   if (!startDate) return 0;
   const start = new Date(startDate);
   const now = new Date();
-  const diff = now - start;
+  const diff = now.getTime() - start.getTime();
   return Math.floor(diff / (1000 * 60 * 60 * 24));
 };
 
@@ -736,7 +1006,7 @@ const handleQuery = () => {
 
 // 重置
 const resetQuery = () => {
-  proxy.resetForm("queryFormRef");
+  (proxy as any)?.resetForm?.("queryFormRef");
   handleQuery();
 };
 
@@ -745,6 +1015,116 @@ const selectMachine = (machine) => {
   selectedMachine.value = machine;
 };
 
+// 多选框选中数据
+const handleSelectionChange = (selection: ProdBaseMachineInfoVO[]) => {
+  ids.value = selection.map(item => item.machineId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+// 新增按钮操作
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加设备信息';
+};
+
+// 修改按钮操作
+const handleUpdate = async (row?: ProdBaseMachineInfoVO) => {
+  reset();
+  const _machineId = row?.machineId || ids.value[0];
+  try {
+    const res = await getDmsBaseMachineInfo(_machineId);
+    Object.assign(form.value, res.data);
+
+    // 处理图片数据 - 只取第一张图片
+    if (res.data.ossId && res.data.photoAddress) {
+      const ossIdArray = res.data.ossId.split(',');
+      const urlArray = res.data.photoAddress.split(',');
+      if (ossIdArray.length > 0 && urlArray.length > 0) {
+        form.value.file = [{
+          ossId: ossIdArray[0].trim(),
+          url: urlArray[0].trim()
+        }];
+      }
+    }
+
+    dialog.visible = true;
+    dialog.title = '修改设备信息';
+  } catch (error) {
+    console.error('获取设备信息失败:', error);
+    proxy?.$modal.msgError('获取设备信息失败');
+  }
+};
+
+// 提交按钮
+const submitForm = () => {
+  machineFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        // 处理图片上传 - 只处理第一张图片
+        if (form.value.file && form.value.file.length > 0) {
+          form.value.ossId = form.value.file[0].ossId;
+          form.value.photoAddress = form.value.file[0].url;
+        } else {
+          form.value.ossId = undefined;
+          form.value.photoAddress = undefined;
+        }
+
+        if (form.value.machineId) {
+          await updateProdBaseMachineInfo(form.value);
+        } else {
+          await addProdBaseMachineInfo(form.value);
+        }
+        proxy?.$modal.msgSuccess('操作成功');
+        dialog.visible = false;
+        await getList();
+      } catch (error) {
+        console.error('保存设备信息失败:', error);
+        proxy?.$modal.msgError('保存设备信息失败');
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+// 删除按钮操作
+const handleDelete = async (row?: ProdBaseMachineInfoVO) => {
+  const _machineIds = row?.machineId || ids.value;
+  try {
+    await proxy?.$modal.confirm('是否确认删除设备信息编号为"' + _machineIds + '"的数据项？');
+    await delDmsBaseMachineInfo(_machineIds);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  } catch (error) {
+    console.error('删除设备信息失败:', error);
+    if (error !== 'cancel') {
+      proxy?.$modal.msgError('删除设备信息失败');
+    }
+  }
+};
+
+// 导出按钮操作
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseMachineInfo/export', {
+    ...queryParams.value
+  }, `machineInfo_${new Date().getTime()}.xlsx`);
+};
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+// 表单重置
+const reset = () => {
+  form.value = { ...initFormData };
+  machineFormRef.value?.resetFields();
+};
+
 // 切换生命周期类型
 const toggleLifecycleType = (type) => {
   const index = selectedLifecycleTypes.value.indexOf(type);
@@ -753,7 +1133,6 @@ const toggleLifecycleType = (type) => {
   } else {
     selectedLifecycleTypes.value.push(type);
   }
-  loadLifecycleData();
 };
 
 // 查看生命周期
@@ -764,69 +1143,7 @@ const viewLifecycle = async (machine) => {
   lifecycleEvents.value = [];
 
   // 预加载统计数据
-  await loadLifecycleStats();
-};
-
-// 加载生命周期统计
-const loadLifecycleStats = async () => {
-  if (!selectedMachine.value) return;
-
-  try {
-    const machineId = selectedMachine.value.machineId;
-
-    // 并行请求统计数据
-    const [
-      purchaseRes,
-      installRes,
-      debugRes,
-      faultRes,
-      maintRes,
-      inspectRes,
-      alarmRes
-    ] = await Promise.all([
-      getDmsBaseDevicePurchaseList({ machineId }).catch(() => ({ rows: [] })),
-      getDmsBaseDeviceInstallList({ machineId }).catch(() => ({ rows: [] })),
-      getDmsBaseDeviceDebuggingList({ machineId }).catch(() => ({ rows: [] })),
-      getDmsBillsFaultInstanceList({ machineId }).catch(() => ({ rows: [] })),
-      getDmsBillsMaintInstanceList({ machineId }).catch(() => ({ rows: [] })),
-      getDmsBillsInspectInstanceList({ machineId }).catch(() => ({ rows: [] })),
-      getBaseAlarmInfoList({ machineId }).catch(() => ({ rows: [] }))
-    ]);
-
-    lifecycleStats.value = {
-      faultCount: faultRes.rows?.length || 0,
-      maintCount: maintRes.rows?.length || 0,
-      alarmCount: alarmRes.rows?.length || 0
-    };
-
-    // 更新类型计数
-    lifecycleTypes.value.forEach(type => {
-      switch (type.value) {
-        case 'purchase':
-          type.count = purchaseRes.rows?.length || 0;
-          break;
-        case 'install':
-          type.count = (installRes.rows?.length || 0) + (debugRes.rows?.length || 0);
-          break;
-        case 'maintenance':
-          type.count = lifecycleStats.value.maintCount;
-          break;
-        case 'fault':
-          type.count = lifecycleStats.value.faultCount;
-          break;
-        case 'inspection':
-          type.count = inspectRes.rows?.length || 0;
-          break;
-        case 'alarm':
-          type.count = lifecycleStats.value.alarmCount;
-          break;
-        default:
-          type.count = 0;
-      }
-    });
-  } catch (error) {
-    console.error('加载生命周期统计失败:', error);
-  }
+  await loadLifecycleTypes();
 };
 
 // 加载生命周期数据
@@ -836,18 +1153,24 @@ const loadLifecycleData = async () => {
     return;
   }
 
+  // 标记本次请求序列，后续仅应用最后一次请求的结果
+  const reqId = ++lifecycleRequestId.value;
   lifecycleLoading.value = true;
   const events = [];
   const machineId = selectedMachine.value.machineId;
 
+  // 兼容不同接口返回结构（data 或 rows）
+  const getListData = (res) => (res && (res.data ?? res.rows)) || [];
+
   try {
     const promises = selectedLifecycleTypes.value.map(async (type) => {
       switch (type) {
         case 'purchase':
           try {
             const purchaseRes = await getDmsBaseDevicePurchaseList({ machineId:machineId });
-            if (purchaseRes.data && purchaseRes.data.length > 0) {
-              purchaseRes.data.forEach(purchase => {
+            const purchases = getListData(purchaseRes);
+            if (purchases.length > 0) {
+              purchases.forEach(purchase => {
                 events.push({
                   id: `purchase-${purchase.devicePurchaseId}`,
                   type: 'purchase',
@@ -857,25 +1180,27 @@ const loadLifecycleData = async () => {
                   icon: markRaw(ShoppingCart),
                   color: '#667eea',
                   tags: ['采购'],
-                  details: {
-                    '计划编号': purchase.workOrder,
-                    '采购地点': purchase.purchasePosition,
-                    '采购价格': purchase.purchasePrice || '-',
-                    '备注': purchase.remark || '-'
-                  }
+                  details: [
+                    { label: '计划编号', value: purchase.workOrder },
+                    { label: '采购地点', value: purchase.purchasePosition },
+                    { label: '采购价格', value: purchase.purchasePrice || '-' },
+                    { label: '备注', value: purchase.remark || '-' }
+                  ]
                 });
               });
             }
           } catch (error) {
             console.error('获取采购信息失败:', error);
+            proxy?.$modal.msgError('获取采购信息失败');
           }
           break;
 
         case 'install':
           try {
             const installRes = await getDmsBaseDeviceInstallList({ machineId:machineId });
-            if (installRes.data && installRes.data.length > 0) {
-              installRes.data.forEach(install => {
+            const installs = getListData(installRes);
+            if (installs.length > 0) {
+              installs.forEach(install => {
                 events.push({
                   id: `install-${install.deviceInstallId}`,
                   type: 'install',
@@ -885,18 +1210,18 @@ const loadLifecycleData = async () => {
                   icon: markRaw(Setting),
                   color: '#f093fb',
                   tags: ['安装'],
-                  details: {
-                    '安装地点': install.installPosition,
-                    // TODO: 使用字典 - '状态': getActiveFlagLabel(install.activeFlag)
-                    '状态': install.activeFlag === '1' ? '有效' : '无效'
-                  }
+                  details: [
+                    { label: '安装地点', value: install.installPosition },
+                    { label: '状态', value: install.activeFlag, dictOptions: active_flag?.value }
+                  ]
                 });
               });
             }
 
             const debugRes = await getDmsBaseDeviceDebuggingList({ machineId:machineId });
-            if (debugRes.data && debugRes.data.length > 0) {
-              debugRes.data.forEach(debug => {
+            const debugs = getListData(debugRes);
+            if (debugs.length > 0) {
+              debugs.forEach(debug => {
                 events.push({
                   id: `debug-${debug.deviceDebuggingId}`,
                   type: 'debugging',
@@ -906,53 +1231,57 @@ const loadLifecycleData = async () => {
                   icon: markRaw(Tools),
                   color: '#f5576c',
                   tags: ['调试'],
-                  details: {
-                    '调试单号': debug.workOrder,
-                    '调试状态': getDebugStatusLabel(debug.status),
-                    '备注': debug.remark || '-'
-                  }
+                  details: [
+                    { label: '调试单号', value: debug.workOrder },
+                    { label: '调试状态', value: debug.status, dictOptions: debug_status?.value },
+                    { label: '备注', value: debug.remark || '-' }
+                  ]
                 });
               });
             }
           } catch (error) {
             console.error('获取安装调试信息失败:', error);
+            proxy?.$modal.msgError('获取安装调试信息失败');
           }
           break;
 
         case 'maintenance':
           try {
-            const res = await getDmsBillsMaintInstanceList({ machineId:machineId });
-            if (res.data && res.data.length > 0) {
-              res.data.forEach(maint => {
-                events.push({
-                  id: `maint-${maint.maintInstanceId}`,
-                  type: 'maintenance',
-                  title: '保养记录',
-                  description: `保养单号: ${maint.billsMaintCode}`,
-                  time: maint.planBeginTime,
-                  icon: markRaw(Tools),
-                  color: '#4facfe',
-                  tags: ['保养', getMaintLevelLabel(maint.maintLevel)],
-                  details: {
-                    '保养级别': getMaintLevelLabel(maint.maintLevel),
-                    '保养负责人': maint.maintSupervisor,
-                    '保养状态': getMaintStatusLabel(maint.maintStatus),
-                    // TODO: 使用字典 - '保养类型': getMaintTypeLabel(maint.maintType)
-                    '计划结束时间': formatDateTime(maint.planEndTime)
-                  }
-                });
+            // 使用新的后端接口，直接获取维保工单列表
+            const res = await getMaintInstancesByMachineId(machineId);
+            const maintInstances = getListData(res);
+
+            maintInstances.forEach(maint => {
+              events.push({
+                id: `maint-${maint.maintInstanceId}`,
+                type: 'maintenance',
+                title: '保养记录',
+                description: `保养单号: ${maint.billsMaintCode}`,
+                time: maint.planBeginTime || maint.createTime,
+                icon: markRaw(Tools),
+                color: '#4facfe',
+                tags: ['保养', getMaintLevelLabel(maint.maintLevel)],
+                details: [
+                  { label: '保养单号', value: maint.billsMaintCode },
+                  { label: '保养级别', value: maint.maintLevel, dictOptions: maint_level?.value },
+                  { label: '保养状态', value: maint.maintStatus, dictOptions: maint_status?.value },
+                  { label: '计划开始时间', value: formatDateTime(maint.planBeginTime) },
+                  // { label: '计划结束时间', value: formatDateTime(maint.planEndTime) }
+                ]
               });
-            }
+            });
           } catch (error) {
             console.error('获取保养记录失败:', error);
+            proxy?.$modal.msgError('获取保养记录失败');
           }
           break;
 
         case 'fault':
           try {
             const res = await getDmsBillsFaultInstanceList({ machineId:machineId });
-            if (res.data && res.data.length > 0) {
-              res.data.forEach(fault => {
+            const faults = getListData(res);
+            if (faults.length > 0) {
+              faults.forEach(fault => {
                 events.push({
                   id: `fault-${fault.repairInstanceId}`,
                   type: 'fault',
@@ -962,51 +1291,58 @@ const loadLifecycleData = async () => {
                   icon: markRaw(Warning),
                   color: '#fa709a',
                   tags: ['故障', getFaultStatusLabel(fault.billsStatus)],
-                  details: {
-                    '申请人': fault.applyUser,
-                    '工单状态': getFaultStatusLabel(fault.billsStatus),
-                    '故障描述': fault.faultDescription || '-',
-                    '备注': fault.remark || '-'
-                  }
+                  details: [
+                    { label: '申请人', value: fault.applyUser },
+                    { label: '工单状态', value: fault.billsStatus, dictOptions: bills_status?.value },
+                    { label: '故障描述', value: fault.faultDescription || '-' },
+                    { label: '备注', value: fault.remark || '-' }
+                  ]
                 });
               });
             }
           } catch (error) {
             console.error('获取故障记录失败:', error);
+            proxy?.$modal.msgError('获取故障记录失败');
           }
           break;
 
         case 'inspection':
           try {
-            const res = await getDmsBillsInspectInstanceList({ machineId:machineId });
-            if (res.data && res.data.length > 0) {
-              res.data.forEach(inspect => {
-                events.push({
-                  id: `inspect-${inspect.inspectInstanceId}`,
-                  type: 'inspection',
-                  title: '巡检记录',
-                  description: `巡检单号: ${inspect.billsInspectCode}`,
-                  time: inspect.createTime,
-                  icon: markRaw(View),
-                  color: '#30cfd0',
-                  tags: ['巡检'],
-                  details: {
-                    '巡检人': inspect.createBy,
-                    '巡检结果': inspect.inspectResult || '-'
-                  }
-                });
+            // 使用新的后端接口，直接获取巡检工单列表
+            const res = await getInspectInstancesByMachineId(machineId);
+            const inspectInstances = getListData(res);
+
+            inspectInstances.forEach(inspect => {
+              events.push({
+                id: `inspect-${inspect.inspectInstanceId}`,
+                type: 'inspection',
+                title: '巡检记录',
+                description: `巡检单号: ${inspect.billsInspectCode}`,
+                time: inspect.planBeginTime || inspect.createTime,
+                icon: markRaw(View),
+                color: '#30cfd0',
+                tags: ['巡检'],
+                details: [
+                  { label: '巡检单号', value: inspect.billsInspectCode },
+                  { label: '巡检类型', value: inspect.inspectType === '1' ? '巡检' : '点检' },
+                  { label: '巡检状态', value: inspect.inspectStatus || '-' },
+                  { label: '计划开始时间', value: formatDateTime(inspect.planBeginTime) },
+                  // { label: '计划结束时间', value: formatDateTime(inspect.planEndTime) }
+                ]
               });
-            }
+            });
           } catch (error) {
             console.error('获取巡检记录失败:', error);
+            proxy?.$modal.msgError('获取巡检记录失败');
           }
           break;
 
         case 'alarm':
           try {
             const res = await getBaseAlarmInfoList({ machineId:machineId  });
-            if (res.data && res.data.length > 0) {
-              res.data.slice(0, 10).forEach(alarm => {
+            const alarms = getListData(res);
+            if (alarms.length > 0) {
+              alarms.slice(0, 10).forEach(alarm => {
                 events.push({
                   id: `alarm-${alarm.alarmId}`,
                   type: 'alarm',
@@ -1016,18 +1352,17 @@ const loadLifecycleData = async () => {
                   icon: markRaw(Notification),
                   color: '#a8edea',
                   tags: ['报警', alarm.alarmLevelName],
-                  details: {
-                    // TODO: 使用字典 - '报警级别': getAlarmLevelLabel(alarm.alarmLevel)
-                    '报警级别': alarm.alarmLevelName,
-                    '报警内容': alarm.alarmContent,
-                    // TODO: 使用字典 - '处理状态': getHandleStatusLabel(alarm.handleStatus)
-                    '处理状态': alarm.handleStatus === '1' ? '已处理' : '未处理'
-                  }
+                  details: [
+                    { label: '报警级别', value: alarm.alarmLevel ?? alarm.alarmLevelName, dictOptions: alarm_level?.value },
+                    { label: '报警内容', value: alarm.alarmContent },
+                    { label: '处理状态', value: alarm.handleStatus, dictOptions: handle_status?.value }
+                  ]
                 });
               });
             }
           } catch (error) {
             console.error('获取报警信息失败:', error);
+            proxy?.$modal.msgError('获取报警信息失败');
           }
           break;
       }
@@ -1035,67 +1370,23 @@ const loadLifecycleData = async () => {
 
     await Promise.all(promises);
 
-    // 按时间排序
-    lifecycleEvents.value = events.sort((a, b) => {
-      const timeA = new Date(a.time).getTime();
-      const timeB = new Date(b.time).getTime();
-      return timeB - timeA;
-    });
-  } finally {
-    lifecycleLoading.value = false;
+    // 仅当本次请求仍是最新请求时，应用结果
+    if (reqId === lifecycleRequestId.value) {
+      lifecycleEvents.value = events.sort((a, b) => {
+        const timeA = new Date(a.time).getTime();
+        const timeB = new Date(b.time).getTime();
+        return timeB - timeA;
+      });
+      lifecycleLoading.value = false;
+    }
+  } catch (e) {
+    if (reqId === lifecycleRequestId.value) {
+      lifecycleLoading.value = false;
+    }
+    proxy?.$modal.msgError('加载生命周期数据失败');
   }
 };
 
-// 状态标签辅助函数
-const getDebugStatusLabel = (status) => {
-  if (!debug_status.value) return status;
-  const dict = debug_status.value.find(d => d.value === status);
-  return dict?.label || status;
-};
-
-const getFaultStatusLabel = (status) => {
-  if (!fault_status.value) return status;
-  const dict = fault_status.value.find(d => d.value === status);
-  return dict?.label || status;
-};
-
-const getMaintLevelLabel = (level) => {
-  if (!maint_level.value) return level;
-  const dict = maint_level.value.find(d => d.value === level);
-  return dict?.label || level;
-};
-
-const getMaintStatusLabel = (status) => {
-  if (!maint_status.value) return status;
-  const dict = maint_status.value.find(d => d.value === status);
-  return dict?.label || status;
-};
-
-// TODO: 需要补充更多字典标签函数
-// const getActiveFlagLabel = (flag) => {
-//   if (!active_flag.value) return flag;
-//   const dict = active_flag.value.find(d => d.value === flag);
-//   return dict?.label || flag;
-// };
-//
-// const getMaintTypeLabel = (type) => {
-//   if (!maint_type.value) return type;
-//   const dict = maint_type.value.find(d => d.value === type);
-//   return dict?.label || type;
-// };
-//
-// const getAlarmLevelLabel = (level) => {
-//   if (!alarm_level.value) return level;
-//   const dict = alarm_level.value.find(d => d.value === level);
-//   return dict?.label || level;
-// };
-//
-// const getHandleStatusLabel = (status) => {
-//   if (!handle_status.value) return status;
-//   const dict = handle_status.value.find(d => d.value === status);
-//   return dict?.label || status;
-// };
-
 // 查看详情
 const viewDetails = async (machine) => {
   selectedMachine.value = machine;
@@ -1109,44 +1400,6 @@ const viewDetails = async (machine) => {
   ]);
 };
 
-// // 导出数据
-// const exportData = () => {
-//   proxy.$modal.msgInfo('导出功能开发中...');
-// };
-
-// 定时更新
-let timer = null;
-onMounted(() => {
-  getList();
-  getDeviceTypes();
-  updateCurrentTime();
-  timer = setInterval(updateCurrentTime, 1000);
-});
-
-onUnmounted(() => {
-  if (timer) {
-    clearInterval(timer);
-  }
-});
-
-// 监听生命周期类型变化，自动加载数据
-watch(selectedLifecycleTypes, (newTypes) => {
-  if (newTypes.length > 0 && selectedMachine.value) {
-    loadLifecycleData();
-  } else {
-    lifecycleEvents.value = [];
-  }
-}, { deep: true });
-
-// 监听选中设备变化，重置生命周期选择和数据
-watch(selectedMachine, (newMachine) => {
-  if (newMachine) {
-    selectedLifecycleTypes.value = [];
-    lifecycleEvents.value = [];
-    loadLifecycleTypes();
-  }
-});
-
 // 加载技术参数
 const loadTechnicalParams = async (machineId) => {
   try {
@@ -1161,66 +1414,50 @@ const loadTechnicalParams = async (machineId) => {
   } catch (error) {
     console.error('获取技术参数失败:', error);
     technicalParams.value = [];
+    proxy?.$modal.msgError('获取技术参数失败');
   }
 };
 
 // 加载维护统计
 const loadMaintenanceStats = async (machineId) => {
   try {
-    // TODO: 需要统计接口 - 获取设备维护统计
-    // 建议创建接口：getDmsDeviceMaintenanceStats(machineId)
-    // 返回：{ plannedCount, temporaryCount, avgInterval, nextMaintenanceDate }
-
-    // 获取保养记录统计
-    const maintRes = await getDmsBillsMaintInstanceList({ machineId });
-    const maintRecords = maintRes.data || [];
-
-    // 计算统计数据
-    const planned = maintRecords.filter(r => r.maintType === '1').length;
-    const temporary = maintRecords.filter(r => r.maintType === '2').length;
-
-    // 计算平均间隔
-    let avgInterval = 0;
-    if (maintRecords.length > 1) {
-      const sortedRecords = maintRecords
-        .filter(r => r.planBeginTime)
-        .sort((a, b) => new Date(a.planBeginTime).getTime() - new Date(b.planBeginTime).getTime());
-
-      if (sortedRecords.length > 1) {
-        const totalDays = (new Date(sortedRecords[sortedRecords.length - 1].planBeginTime).getTime() -
-                          new Date(sortedRecords[0].planBeginTime).getTime()) / (1000 * 60 * 60 * 24);
-        avgInterval = Math.round(totalDays / (sortedRecords.length - 1));
-      }
-    }
-
-    // 查找下次计划保养时间
-    const futureMaint = maintRecords.find(r =>
-      r.planBeginTime && new Date(r.planBeginTime) > new Date()
-    );
+    const statsRes = await getDmsDeviceMaintenanceStats({ machineId });
+    const statsData = statsRes.data || {};
 
     maintenanceStats.value = {
-      planned,
-      temporary,
-      avgInterval,
-      nextDate: futureMaint ? formatDate(futureMaint.planBeginTime) : null
+      planned: statsData.plannedCount || 0,
+      temporary: statsData.temporaryCount || 0,
+      avgInterval: statsData.avgInterval || 0,
+      nextDate: statsData.nextMaintenanceDate ? formatDate(statsData.nextMaintenanceDate) : null
     };
 
-    // 加载维护记录详情
-    maintenanceRecords.value = maintRecords.slice(0, 10).map(record => ({
-      maintCode: record.billsMaintCode,
-      // TODO: 使用字典 - maintType: getMaintTypeLabel(record.maintType)
-      maintType: record.maintType === '1' ? '计划保养' : '临时保养',
-      maintDate: formatDate(record.planBeginTime),
-      maintPerson: record.maintSupervisor || '-',
-      maintContent: record.maintContent || '-',
-      // TODO: 使用字典 - maintResult: getMaintStatusLabel(record.maintStatus)
-      maintResult: record.maintStatus === '3' ? '合格' : record.maintStatus === '2' ? '待验收' : '进行中'
-    }));
+    // 修复：通过维保明细表查询维护记录
+    const maintDetailRes = await getDmsBillsMaintDetailList({ machineId, pageNum: 1, pageSize: 10 });
+    const maintDetails = (maintDetailRes.data || maintDetailRes.rows || []);
+
+    // 从维保明细中提取维护记录，按工单去重处理
+    const maintInstanceMap = new Map();
+    maintDetails.forEach(detail => {
+      const maintInstanceId = detail.maintInstanceId;
+      if (!maintInstanceMap.has(maintInstanceId)) {
+        maintInstanceMap.set(maintInstanceId, {
+          maintCode: detail.billsMaintCode || `MAINT-${detail.maintInstanceId}`,
+          maintType: detail.maintLevel || 1, // 保养级别对应保养类型
+          maintDate: formatDate(detail.beginTime || detail.createTime),
+          maintPerson: detail.maintSupervisor || '-',
+          maintContent: detail.operationDescription || '-',
+          maintStatus: detail.maintStatus || 1
+        });
+      }
+    });
+
+    maintenanceRecords.value = Array.from(maintInstanceMap.values());
 
   } catch (error) {
     console.error('获取维护统计失败:', error);
     maintenanceStats.value = { planned: 0, temporary: 0, avgInterval: 0, nextDate: null };
     maintenanceRecords.value = [];
+    proxy?.$modal.msgError('获取维护统计失败');
   }
 };
 
@@ -1231,59 +1468,93 @@ const loadLifecycleTypes = async () => {
   const machineId = selectedMachine.value.machineId;
 
   try {
-    // 并行获取各类型数据的数量，使用不分页的API
     const [
-      purchaseRes,
-      installRes,
-      debugRes,
-      maintRes,
-      faultRes,
-      inspectRes,
-      alarmRes
+      purchaseCount,
+      installCount,
+      debuggingCount,
+      maintCount,  // 使用新的后端接口
+      faultCount,
+      inspectCount,  // 使用新的后端接口
+      alarmCount
     ] = await Promise.all([
-      getDmsBaseDevicePurchaseList({ machineId }).catch(() => ({ data: [] })),
-      getDmsBaseDeviceInstallList({ machineId }).catch(() => ({ data: [] })),
-      getDmsBaseDeviceDebuggingList({ machineId }).catch(() => ({ data: [] })),
-      getDmsBillsMaintInstanceList({ machineId }).catch(() => ({ data: [] })),
-      getDmsBillsFaultInstanceList({ machineId }).catch(() => ({ data: [] })),
-      getDmsBillsInspectInstanceList({ machineId }).catch(() => ({ data: [] })),
-      getBaseAlarmInfoList({ machineId }).catch(() => ({ data: [] }))
+      getPurchaseCount({ machineId }).catch(() => ({ data: 0 })),
+      getInstallCount({ machineId }).catch(() => ({ data: 0 })),
+      getDebuggingCount({ machineId }).catch(() => ({ data: 0 })),
+      countMaintInstancesByMachineId(machineId).catch(() => ({ data: 0 })),
+      getFaultInstanceCount({ machineId }).catch(() => ({ data: 0 })),
+      countInspectInstancesByMachineId(machineId).catch(() => ({ data: 0 })),
+      getAlarmInfoCount({ machineId }).catch(() => ({ data: 0 }))
     ]);
 
     // 更新类型计数
     lifecycleTypes.value.forEach(type => {
       switch (type.value) {
         case 'purchase':
-          type.count = purchaseRes.data?.length || 0;
+          type.count = purchaseCount.data || 0;
           break;
         case 'install':
-          type.count = (installRes.data?.length || 0) + (debugRes.data?.length || 0);
+          type.count = (installCount.data || 0) + (debuggingCount.data || 0);
           break;
         case 'maintenance':
-          type.count = maintRes.data?.length || 0;
+          type.count = maintCount.data || 0;
           break;
         case 'fault':
-          type.count = faultRes.data?.length || 0;
+          type.count = faultCount.data || 0;
           break;
         case 'inspection':
-          type.count = inspectRes.data?.length || 0;
+          type.count = inspectCount.data || 0;
           break;
         case 'alarm':
-          type.count = Math.min(alarmRes.data?.length || 0, 10); // 最多显示10条报警
+          type.count = alarmCount.data || 0;
           break;
+        default:
+          type.count = 0;
       }
     });
 
-    // 同时更新生命周期统计
-    lifecycleStats.value = {
-      faultCount: faultRes.data?.length || 0,
-      maintCount: maintRes.data?.length || 0,
-      alarmCount: alarmRes.data?.length || 0
-    };
   } catch (error) {
-    console.error('加载生命周期统计失败:', error);
+    console.error('加载生命周期类型统计失败:', error);
+    proxy?.$modal.msgError('加载生命周期类型统计失败');
   }
 };
+
+// 定时更新
+let timer = null;
+onMounted(() => {
+  getList();
+  getDeviceTypes();
+  // getWorkshopListSelect();
+  getDmsDeviceModeListSelect();
+  updateCurrentTime();
+  timer = setInterval(updateCurrentTime, 1000);
+});
+
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+  }
+});
+
+// 监听生命周期类型变化，自动加载数据
+watch(selectedLifecycleTypes, (newTypes) => {
+  if (newTypes.length > 0 && selectedMachine.value) {
+    loadLifecycleData();
+  } else {
+    // 作废在途请求，防止已发起的请求在清空选择后回填数据
+    lifecycleRequestId.value++;
+    lifecycleEvents.value = [];
+    lifecycleLoading.value = false;
+  }
+}, { deep: true });
+
+// 监听选中设备变化，重置生命周期选择和数据
+watch(selectedMachine, (newMachine) => {
+  if (newMachine) {
+    selectedLifecycleTypes.value = [];
+    lifecycleEvents.value = [];
+    loadLifecycleTypes();
+  }
+});
 </script>
 
 <style lang="scss" scoped>
@@ -1351,119 +1622,6 @@ const loadLifecycleTypes = async () => {
   }
 }
 
-.statistics-dashboard {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-  gap: 8px;
-  margin-bottom: 8px;
-
-  .stat-item {
-    position: relative;
-    background: #fff;
-    border-radius: 6px;
-    padding: 12px;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-    transition: all 0.3s ease;
-    overflow: hidden;
-
-    &:hover {
-      transform: translateY(-1px);
-      box-shadow: 0 3px 12px rgba(0, 0, 0, 0.15);
-    }
-
-    .stat-bg-effect {
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 50px;
-      height: 50px;
-      border-radius: 50%;
-      opacity: 0.1;
-      transform: translate(25px, -25px);
-    }
-
-    .stat-inner {
-      position: relative;
-      z-index: 2;
-      display: flex;
-      align-items: center;
-      gap: 10px;
-    }
-
-    .stat-icon-wrapper {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 40px;
-      height: 40px;
-      border-radius: 6px;
-      color: #fff;
-    }
-
-    .stat-info {
-      flex: 1;
-
-      .stat-number {
-        display: flex;
-        align-items: baseline;
-        gap: 3px;
-
-        .value-animate {
-          font-size: 20px;
-          font-weight: 700;
-          color: #2c3e50;
-        }
-
-        .unit {
-          font-size: 11px;
-          color: #7f8c8d;
-          font-weight: 500;
-        }
-      }
-
-      .stat-title {
-        font-size: 12px;
-        color: #7f8c8d;
-        margin-top: 1px;
-      }
-    }
-
-    .stat-chart {
-      position: absolute;
-      bottom: 6px;
-      right: 10px;
-      width: 50px;
-      height: 20px;
-      opacity: 0.3;
-
-      svg {
-        width: 100%;
-        height: 100%;
-      }
-    }
-
-    &.stat-total {
-      .stat-icon-wrapper { background: linear-gradient(45deg, #667eea, #764ba2); }
-      .stat-bg-effect { background: #667eea; }
-    }
-
-    &.stat-running {
-      .stat-icon-wrapper { background: linear-gradient(45deg, #56ab2f, #a8e6cf); }
-      .stat-bg-effect { background: #56ab2f; }
-    }
-
-    &.stat-maintenance {
-      .stat-icon-wrapper { background: linear-gradient(45deg, #f093fb, #f5576c); }
-      .stat-bg-effect { background: #f093fb; }
-    }
-
-    &.stat-alarm {
-      .stat-icon-wrapper { background: linear-gradient(45deg, #fa709a, #fee140); }
-      .stat-bg-effect { background: #fa709a; }
-    }
-  }
-}
-
 .action-toolbar {
   display: flex;
   justify-content: space-between;
@@ -1507,8 +1665,9 @@ const loadLifecycleTypes = async () => {
   .grid-view {
     .machine-grid {
       display: grid;
-      grid-template-columns: repeat(3, 1fr);
+      grid-template-columns: repeat(5, 1fr); // 修改为一行5个
       gap: 8px;
+      margin-bottom: 16px;
     }
 
     .machine-card-wrapper {
@@ -1559,14 +1718,25 @@ const loadLifecycleTypes = async () => {
             display: inline-flex;
             align-items: center;
             justify-content: center;
-            width: 36px;
-            height: 36px;
+            width: 40px;
+            height: 40px;
             background: linear-gradient(45deg, #667eea, #764ba2);
             border-radius: 6px;
             color: #fff;
             margin-bottom: 4px;
           }
 
+          .machine-photo {
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            width: 40px;
+            height: 40px;
+            margin-bottom: 4px;
+            border-radius: 6px;
+            overflow: hidden;
+          }
+
           .machine-number {
             font-size: 11px;
             font-weight: 600;