diff --git a/.env.development b/.env.development
index f7ff9da..f9304df 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源场站智慧运维平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.149:18899'
+VITE_APP_BASE_API = 'http://192.168.110.210:18899'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'
diff --git a/src/api/zhinengxunjian/baoxiou/index.ts b/src/api/zhinengxunjian/baoxiou/index.ts
index 4c0c107..0a680e3 100644
--- a/src/api/zhinengxunjian/baoxiou/index.ts
+++ b/src/api/zhinengxunjian/baoxiou/index.ts
@@ -47,3 +47,11 @@ export const uploadbaoxiu = (data) => {
     data: data
   });
 };
+
+export const baoxiuRecord = (data) => {
+  return request({
+    url: '/ops/report/record',
+    method: 'get',
+    params: data
+  });
+};
diff --git a/src/api/zhinengxunjian/gongdan/index.ts b/src/api/zhinengxunjian/gongdan/index.ts
new file mode 100644
index 0000000..781d8d2
--- /dev/null
+++ b/src/api/zhinengxunjian/gongdan/index.ts
@@ -0,0 +1,57 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+//查询列表
+export const gongdanlist = (query) => {
+  return request({
+    url: '/ops/order/list',
+    method: 'get',
+    params: query
+  });
+};
+//新增待办事项
+export const addgongdan = (data) => {
+  return request({
+    url: '/ops/order',
+    method: 'post',
+    data: data
+  });
+};
+//修改待办事项
+export const updategongdan = (data) => {
+  return request({
+    url: '/ops/order',
+    method: 'put',
+    data: data
+  });
+};
+//删除待办事项
+
+export function delgongdan(ids) {
+  return request({
+    url: `/ops/order/${ids}`, // 拼接ids作为路径参数
+    method: 'delete'
+  });
+}
+
+export const gongdanDetail = (id) => {
+  return request({
+    url: `/ops/order/${id}`,
+    method: 'get'
+  });
+};
+
+export const uploadgongdan = (data) => {
+  return request({
+    url: '/resource/oss/upload',
+    method: 'post',
+    data: data
+  });
+};
+
+export const gongdanRecord = (data) => {
+  return request({
+    url: '/ops/order/record',
+    method: 'get',
+    params: data
+  });
+};
diff --git a/src/api/zhinengxunjian/jiedian/index.ts b/src/api/zhinengxunjian/jiedian/index.ts
new file mode 100644
index 0000000..c38b3ec
--- /dev/null
+++ b/src/api/zhinengxunjian/jiedian/index.ts
@@ -0,0 +1,57 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+//查询列表
+export const jiedianlist = (query) => {
+  return request({
+    url: '/ops/node/list',
+    method: 'get',
+    params: query
+  });
+};
+//新增待办事项
+export const addjiedian = (data) => {
+  return request({
+    url: '/ops/node',
+    method: 'post',
+    data: data
+  });
+};
+//修改待办事项
+export const updatejiedian = (data) => {
+  return request({
+    url: '/ops/node',
+    method: 'put',
+    data: data
+  });
+};
+//删除待办事项
+
+export function deljiedian(ids) {
+  return request({
+    url: `/ops/node/${ids}`, // 拼接ids作为路径参数
+    method: 'delete'
+  });
+}
+
+export const jiedianDetail = (id) => {
+  return request({
+    url: `/ops/node/${id}`,
+    method: 'get'
+  });
+};
+
+export const uploadjiedian = (data) => {
+  return request({
+    url: '/resource/oss/upload',
+    method: 'post',
+    data: data
+  });
+};
+
+export const jiedianRecord = (data) => {
+  return request({
+    url: '/ops/node/record',
+    method: 'get',
+    params: data
+  });
+};
diff --git a/src/api/zhinengxunjian/qiangxiu/index.ts b/src/api/zhinengxunjian/qiangxiu/index.ts
new file mode 100644
index 0000000..bb717c0
--- /dev/null
+++ b/src/api/zhinengxunjian/qiangxiu/index.ts
@@ -0,0 +1,57 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+//查询列表
+export const qiangxiulist = (query) => {
+  return request({
+    url: '/ops/repair/list',
+    method: 'get',
+    params: query
+  });
+};
+//新增待办事项
+export const addqiangxiu = (data) => {
+  return request({
+    url: '/ops/repair',
+    method: 'post',
+    data: data
+  });
+};
+//修改待办事项
+export const updateqiangxiu = (data) => {
+  return request({
+    url: '/ops/repair',
+    method: 'put',
+    data: data
+  });
+};
+//删除待办事项
+
+export function delqiangxiu(ids) {
+  return request({
+    url: `/ops/repair/${ids}`, // 拼接ids作为路径参数
+    method: 'delete'
+  });
+}
+
+export const qiangxiuDetail = (id) => {
+  return request({
+    url: `/ops/repair/${id}`,
+    method: 'get'
+  });
+};
+
+export const uploadqiangxiu = (data) => {
+  return request({
+    url: '/resource/oss/upload',
+    method: 'post',
+    data: data
+  });
+};
+
+export const qiangxiuRecord = (data) => {
+  return request({
+    url: '/ops/repair/record',
+    method: 'get',
+    params: data
+  });
+};
diff --git a/src/api/zhinengxunjian/shiyan/renwu.ts b/src/api/zhinengxunjian/shiyan/renwu.ts
index bb49cb1..64e60ec 100644
--- a/src/api/zhinengxunjian/shiyan/renwu.ts
+++ b/src/api/zhinengxunjian/shiyan/renwu.ts
@@ -39,3 +39,11 @@ export const syrenwuDetail = (id) => {
     method: 'get'
   });
 };
+
+export const syrenwujilu = (data) => {
+  return request({
+    url: '/ops/testTask/record',
+    method: 'get',
+    params: data
+  });
+};
diff --git a/src/api/zhinengxunjian/xunjian/index.ts b/src/api/zhinengxunjian/xunjian/index.ts
index 353b0bb..e60b9c7 100644
--- a/src/api/zhinengxunjian/xunjian/index.ts
+++ b/src/api/zhinengxunjian/xunjian/index.ts
@@ -34,7 +34,7 @@ export const delxunjian = (ids) => {
 //查询人员
 export const xunjianUserlist = (query) => {
   return request({
-    url: '/ops/constructionUser/list',
+    url: '/system/user/list',
     method: 'get',
     params: query
   });
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2b0aad5..9ddb698 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -316,3 +316,58 @@ export const removeClass = (ele: HTMLElement, cls: string) => {
 export const isExternal = (path: string) => {
   return /^(https?:|http?:|mailto:|tel:)/.test(path);
 };
+
+/**
+ * 获取步骤状态对应的样式类
+ * @param {string|number} status - 步骤状态码
+ * @returns {string} 样式类名
+ */
+export const getStatusClass = (status: string | number): string => {
+  // 处理可能的数字输入
+  const statusStr = status?.toString() || '';
+  const statusClassMap: Record<string, string> = {
+    '1': 'status-pending',
+    '2': 'status-executing',
+    '3': 'status-completed',
+    '4': 'status-delayed',
+    '5': 'status-failed'
+  };
+  return statusClassMap[statusStr] || 'status-unknown';
+};
+
+/**
+ * 格式化日期时间（用于步骤条）
+ * @param {string} dateTime - 日期时间字符串
+ * @returns {string} 格式化后的日期时间
+ */
+export const formatDateTime = (dateTime: string): string => {
+  if (!dateTime) return '-';
+  try {
+    const date = new Date(dateTime);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } catch (error) {
+    return dateTime;
+  }
+};
+
+/**
+ * 获取步骤状态文本
+ * @param {string|number} status - 步骤状态码
+ * @returns {string} 状态文本
+ */
+export const getStepStatusText = (status: string | number): string => {
+  const statusStr = status?.toString() || '';
+  const statusMap: Record<string, string> = {
+    '1': '待执行',
+    '2': '执行中',
+    '3': '已完成',
+    '4': '已延期',
+    '5': '失败'
+  };
+  return statusMap[statusStr] || '未知状态';
+};
diff --git a/src/utils/request.ts b/src/utils/request.ts
index f3b06ad..ca0e341 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -23,12 +23,18 @@ export const globalHeaders = () => {
   };
 };
 
+// 设置默认请求头
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
+axios.defaults.headers['Accept'] = 'application/json, text/plain, */*';
 axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
-  timeout: 50000
+  timeout: 50000,
+  headers: {
+    'Content-Type': 'application/json;charset=utf-8',
+    'Accept': 'application/json, text/plain, */*'
+  }
 });
 
 // 请求拦截器
diff --git a/src/views/zhinengxunjian/InspectionManagement.vue b/src/views/zhinengxunjian/InspectionManagement.vue
index 8ab639d..599b96b 100644
--- a/src/views/zhinengxunjian/InspectionManagement.vue
+++ b/src/views/zhinengxunjian/InspectionManagement.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="operation-inspection">
       <!-- 导航标签 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab active" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,7 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
+      </div> -->
 
       <!-- 子选项卡 -->
       <div class="tabs-wrapper">
@@ -48,8 +48,8 @@
           </el-select>
         </div>
         <div class="filter-actions">
-          <el-button type="primary" class="search-btn" @click="handleSearch">搜索</el-button>
-          <el-button type="primary" icon="el-icon-plus" class="create-btn" @click="handleCreate">手动创建计划</el-button>
+          <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+          <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreate">手动创建计划</el-button>
         </div>
       </div>
 
@@ -312,43 +312,101 @@
       v-model="detailDialogVisible"
       title="巡检计划详情"
       width="800px"
-      class="detail-dialog"
-      center
-      :show-close="true"
-      custom-class="beautified-detail-dialog"
+      :before-close="handleCloseDetailDialog"
+      class="custom-experiment-dialog"
     >
-      <div class="detail-content">
-        <div class="detail-header">
-          <h3 class="detail-title">{{ detailData.planName || '巡检计划' }}</h3>
-          <el-tag :type="detailData.status === '1' ? 'success' : 'info'" class="detail-status-tag">
-            {{ detailData.status === '1' ? '启用' : detailData.status === '2' ? '停用' : '-' }}
-          </el-tag>
+      <div class="task-detail-container">
+        <!-- 基础信息区 -->
+        <div class="detail-card">
+          <h3 class="card-title">基础信息</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">计划名称：</span>
+                <span class="info-value">{{ detailData.planName || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">状态：</span>
+                <span class="info-value task-status">
+                  <el-tag :type="detailData.status === '1' ? 'success' : 'info'">
+                    {{ detailData.status === '1' ? '启用' : detailData.status === '2' ? '停用' : '-' }}
+                  </el-tag>
+                </span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">计划类型：</span>
+                <span class="info-value">{{ getPlanTypeText(detailData.planType) || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">巡检对象：</span>
+                <span class="info-value">{{ getObjectTypeText(detailData.objectType) || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">巡检频率：</span>
+                <span class="info-value">{{ detailData.inspectionFrequency || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">负责人：</span>
+                <span class="info-value">{{ detailData.nickName || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">开始日期：</span>
+                <span class="info-value">{{ formatDate(detailData.beginTime) || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">结束日期：</span>
+                <span class="info-value">{{ formatDate(detailData.endTime) || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">计划开始时间：</span>
+                <span class="info-value">{{ detailData.planBeginTime || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">持续时间：</span>
+                <span class="info-value">{{ detailData.duration || '-' }}分钟</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">巡检项：</span>
+                <div class="info-value">
+                  <span v-for="(item, index) in detailData.itemVoList" :key="item.id" class="inspection-item-tag">
+                    {{ item.name }}
+                    <span v-if="index < detailData.itemVoList.length - 1" class="item-separator">、</span>
+                  </span>
+                  <span v-if="!detailData.itemVoList || detailData.itemVoList.length === 0">-</span>
+                </div>
+              </div>
+              <div class="info-item">
+                <span class="info-label">电站ID：</span>
+                <span class="info-value">{{ detailData.projectId || '-' }}</span>
+              </div>
+            </div>
+          </div>
         </div>
 
-        <div class="detail-main">
-          <el-descriptions :column="{ xs: 1, sm: 1, md: 2, lg: 2 }" class="detail-descriptions" border>
-            <el-descriptions-item label="计划类型" class="detail-item">{{ getPlanTypeText(detailData.planType) || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="巡检对象" class="detail-item">{{ getObjectTypeText(detailData.objectType) || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="巡检频率" class="detail-item">{{ detailData.inspectionFrequency || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="负责人" class="detail-item">{{ detailData.nickName || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="开始日期" class="detail-item">{{ formatDate(detailData.beginTime) || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="结束日期" class="detail-item">{{ formatDate(detailData.endTime) || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="计划开始时间" class="detail-item">{{ detailData.planBeginTime || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="持续时间" class="detail-item">{{ detailData.duration || '-' }}分钟</el-descriptions-item>
-            <el-descriptions-item label="巡检项ID" class="detail-item">{{ detailData.inspectionItemId || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="电站ID" class="detail-item">{{ detailData.projectId || '-' }}</el-descriptions-item>
-          </el-descriptions>
-        </div>
-
-        <div v-if="detailData.remark" class="detail-remark">
-          <h4 class="remark-title">备注信息</h4>
-          <p class="remark-content">{{ detailData.remark }}</p>
+        <!-- 备注信息 -->
+        <div v-if="detailData.remark" class="detail-card">
+          <h3 class="card-title">备注信息</h3>
+          <div class="card-content">
+            <div class="description-content">
+              {{ detailData.remark }}
+            </div>
+          </div>
         </div>
       </div>
 
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="closeDetailDialog" class="close-btn">关闭</el-button>
+          <el-button @click="closeDetailDialog">关闭</el-button>
         </span>
       </template>
     </el-dialog>
@@ -605,13 +663,14 @@ const formatDate = (dateString) => {
 const getUsersList = async () => {
   try {
     const response = await xunjianUserlist();
-    const userRows = response?.data?.rows || response?.rows || [];
+    // 适配新接口格式：检查code为200且rows为数组
+    const userRows = response.code === 200 && response.rows && Array.isArray(response.rows) ? response.rows : [];
 
     userList.value = userRows
       .filter((item) => item && typeof item === 'object')
-      .map((item, index) => ({
-        label: item.userName || `用户${index + 1}`,
-        value: item.id || `id_${index}`
+      .map((item) => ({
+        label: item.userName || '未知用户',
+        value: String(item.userId || '') // 使用userId作为唯一标识
       }));
 
     if (userList.value.length === 0) {
@@ -979,6 +1038,8 @@ const handleInspectionManagement3 = () => {
 </script>
 
 <style scoped>
+@import url('./css/detail-dialog.css');
+@import url('./css/step-bars.css');
 .operation-inspection {
   padding: 20px;
   background-color: #f5f7fa;
@@ -1122,47 +1183,127 @@ const handleInspectionManagement3 = () => {
   color: #f56c6c;
 }
 
-.detail-dialog .el-dialog__body {
+/* 弹窗样式 */
+.create-plan-dialog .el-dialog__body {
   padding: 24px;
 }
 
-.detail-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+/* 详情弹窗样式 - 与工单列表页面保持一致 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
+}
+
+.task-detail-container {
+  padding: 10px 0;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
   margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
 }
 
-.detail-title {
-  font-size: 18px;
-  font-weight: bold;
-  color: #303133;
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
 }
 
-.detail-status-tag {
-  padding: 4px 12px;
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
   font-size: 14px;
 }
 
-.detail-descriptions {
-  margin-bottom: 20px;
+/* 骨架屏样式 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
 }
 
-.detail-item .el-descriptions__label {
+.skeleton-card {
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.skeleton-header {
+  height: 20px;
+  width: 30%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 12px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-row {
+  height: 16px;
+  width: 100%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+/* 优先级标签样式 */
+.task-status {
+  padding: 4px 10px;
+  border-radius: 6px;
+  font-size: 12px;
   font-weight: 500;
-  color: #606266;
+  border: 1px solid transparent;
 }
 
-.remark-title {
-  font-weight: 500;
-  margin-bottom: 8px;
-  color: #303133;
-}
-
-.remark-content {
+.description-content {
   padding: 12px;
-  background-color: #f5f7fa;
+  background-color: #f9f9f9;
   border-radius: 4px;
   line-height: 1.6;
+  color: #4e5969;
+  font-size: 13px;
 }
 </style>
diff --git a/src/views/zhinengxunjian/banzhuzhuangtai.vue b/src/views/zhinengxunjian/banzhuzhuangtai.vue
index c86cef4..a594c3a 100644
--- a/src/views/zhinengxunjian/banzhuzhuangtai.vue
+++ b/src/views/zhinengxunjian/banzhuzhuangtai.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="execution-records">
       <!-- 顶部导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,10 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab active" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <!-- 页面标题 -->
-      <TitleComponent title="运维组织模块" subtitle="实时监控人员状态、车辆状态和班组状态"></TitleComponent>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -182,7 +179,6 @@
 <script setup>
 import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
 import * as echarts from 'echarts'; // 导入ECharts
 import renwuImage from '@/assets/images/renwu.png';
 
diff --git a/src/views/zhinengxunjian/baoxiuguanli.vue b/src/views/zhinengxunjian/baoxiuguanli.vue
index 58c6ad7..207bdca 100644
--- a/src/views/zhinengxunjian/baoxiuguanli.vue
+++ b/src/views/zhinengxunjian/baoxiuguanli.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="inspection-tasks">
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -9,9 +9,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
-      <!-- 页面标题 -->
-      <TitleComponent title="报修管理模块" subtitle="创建报修任务，跟进报修记录，管理维修进度"></TitleComponent>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -34,24 +32,21 @@
           </div>
           <div class="filter-item">
             <el-select v-model="planType" placeholder="全部计划">
-              <el-option label="全部计划" value="all"></el-option>
               <el-option label="每日巡检计划" value="daily"></el-option>
               <el-option label="每周巡检计划" value="weekly"></el-option>
               <el-option label="每月巡检计划" value="monthly"></el-option>
-              <el-option label="每季度巡检计划" value="quarterly"></el-option>
             </el-select>
           </div>
           <div class="filter-item">
             <el-select v-model="executor" placeholder="执行人">
-              <el-option label="全部人员" value="all"></el-option>
               <el-option label="张明" value="zhangming"></el-option>
               <el-option label="李华" value="lihua"></el-option>
               <el-option label="王强" value="wangqiang"></el-option>
             </el-select>
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch"> 搜索 </el-button>
-            <el-button type="primary" icon="el-icon-plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
       </div>
@@ -72,7 +67,7 @@
           <div class="task-details">
             <div class="detail-item">
               <span class="detail-label">报修时间</span>
-              <span class="detail-value">{{ task.reportTime }}</span>
+              <span class="detail-value">{{ task.createTime }}</span>
             </div>
             <div class="detail-item">
               <span class="detail-label">报修人</span>
@@ -82,11 +77,7 @@
               <span class="detail-label">维修人</span>
               <span class="detail-value">{{ task.maintainer }}</span>
             </div>
-            <!-- 恢复预计完成时间字段 -->
-            <div class="detail-item">
-              <span class="detail-label">预计完成</span>
-              <span class="detail-value">{{ task.expectedCompleteTime }}</span>
-            </div>
+
             <div class="detail-item">
               <span class="detail-label">状态</span>
               <span class="detail-value">{{ task.statusText }}</span>
@@ -95,7 +86,7 @@
             <!-- 已完成状态的额外信息 -->
             <div v-if="task.status === 'completed'" class="task-result">
               <span class="detail-label">完成时间</span>
-              <span class="detail-value">{{ task.completeTime }}</span>
+              <span class="detail-value">{{ task.reportFinishTime }}</span>
             </div>
           </div>
 
@@ -159,12 +150,6 @@
             </el-col>
           </el-row>
 
-          <el-form-item label="指派维修人*" prop="sendPerson">
-            <el-select v-model="createTaskForm.sendPerson" placeholder="请选择维修人" :loading="loadingUsers">
-              <el-option v-for="user in usersList" :key="user.id" :label="user.name" :value="user.id" />
-            </el-select>
-          </el-form-item>
-
           <el-form-item label="详细描述*" prop="detailedDescription">
             <el-input v-model="createTaskForm.detailedDescription" type="textarea" :rows="4" placeholder="详细描述故障现象、发生时间、位置等信息" />
           </el-form-item>
@@ -173,29 +158,9 @@
             <el-input v-model="createTaskForm.faultLocation" placeholder="例如：A区102" />
           </el-form-item>
 
-          <el-form-item label="上传图片(可选)" width="100%">
-            <file-upload v-model="createTaskForm.file" :fileType="['png', 'jpg', 'jpeg']">
-              <div class="upload-container">
-                <div class="upload-box">
-                  <i class="el-icon-plus avatar-uploader-icon"></i>
-                  <div class="upload-text">点击或拖拽图片至此处上传</div>
-                  <div class="upload-hint">支持JPG、PNG格式，最多3张</div>
-                </div>
-              </div>
-            </file-upload>
-            <!-- <el-upload
-              class="avatar-uploader"
-              :file-list="createTaskForm.fileList"
-              :on-change="handleFileChange"
-              :before-remove="beforeRemove"
-              :on-remove="handleRemove"
-              :auto-upload="false"
-              multiple
-              :limit="3"
-              :on-exceed="handleExceed"
-            >
+          <el-form-item label="上传图片(可选)" width="100%" prop="file">
+            <image-upload v-model="createTaskForm.file" />
 
-            </el-upload> -->
             <div v-if="createTaskForm.fileList && createTaskForm.fileList.length > 0" class="upload-tip">
               <span style="color: #1989fa">已选择{{ createTaskForm.fileList.length }}张图片，将在提交时上传</span>
             </div>
@@ -222,17 +187,206 @@
           </span>
         </template>
       </el-dialog>
+      <!-- 任务详情弹窗 -->
+      <el-dialog
+        v-model="detailDialogVisible"
+        title="报修任务详情"
+        width="800px"
+        :before-close="handleCloseDetailDialog"
+        class="custom-experiment-dialog"
+      >
+        <div v-if="detailData" class="task-detail-container">
+          <!-- 加载状态骨架屏 -->
+          <div v-if="isDetailLoading" class="skeleton-loading">
+            <div class="skeleton-card">
+              <div class="skeleton-header"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+              </div>
+            </div>
+            <div class="skeleton-card">
+              <div class="skeleton-header"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+              </div>
+            </div>
+            <div class="skeleton-card">
+              <div class="skeleton-header"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 任务基本信息卡片 -->
+          <div class="detail-card">
+            <h3 class="card-title">任务基本信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">任务ID：</span>
+                  <span class="info-value">{{ detailData.id || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">任务名称：</span>
+                  <span class="info-value">{{ detailData.name || '未命名' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">任务状态：</span>
+                  <span class="info-value">{{ getStatusText(detailData.status) }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">任务等级：</span>
+                  <span class="info-value">{{ getPriorityText(detailData.level) }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">任务类型：</span>
+                  <span class="info-value">{{ detailData.type === '1' ? '硬件故障' : detailData.type === '2' ? '软件故障' : '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">报修时间：</span>
+                  <span class="info-value">{{ formatDate(detailData.createTime) }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 报修人信息卡片 -->
+          <div class="detail-card">
+            <h3 class="card-title">报修人信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">报修人：</span>
+                  <span class="info-value">{{ detailData.reportName || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">联系人：</span>
+                  <span class="info-value">{{ detailData.reportName || '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">联系电话：</span>
+                  <span class="info-value">{{ detailData.reportPhone || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">维修人：</span>
+                  <span class="info-value">{{ detailData.sendPersonVo?.userName || '-' }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 报修详情信息卡片 -->
+          <div class="detail-card">
+            <h3 class="card-title">报修详情</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item full-width">
+                  <span class="info-label">故障位置：</span>
+                  <span class="info-value">{{ detailData.position || '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item full-width">
+                  <span class="info-label">详细描述：</span>
+                  <span class="info-value">{{ detailData.reportInfo || '-' }}</span>
+                </div>
+              </div>
+              <!-- 已完成状态的额外信息 -->
+              <div v-if="detailData.status === '3'" class="info-row">
+                <div class="info-item">
+                  <span class="info-label">完成时间：</span>
+                  <span class="info-value">{{ formatDate(detailData.reportFinishTime) }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 故障图片 -->
+          <div v-if="detailData.fileUrl && detailData.fileUrl.length > 0" class="detail-card">
+            <h3 class="card-title">故障图片</h3>
+            <div class="card-content">
+              <div class="images-container">
+                <!-- 将逗号分隔的URL字符串拆分为数组并循环展示 -->
+                <div v-for="(url, index) in splitImageUrls(detailData.fileUrl)" :key="index" class="image-item">
+                  <img
+                    :src="url"
+                    :alt="`故障图片 ${index + 1}`"
+                    class="detail-image"
+                    @error="handleImageError($event, index)"
+                    style="max-width: 100%; max-height: 200px; border-radius: 4px"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-else class="loading-state">
+          <i class="el-icon-loading el-icon--loading"></i>
+          <span>加载中...</span>
+        </div>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="handleCloseDetailDialog">关闭</el-button>
+          </span>
+        </template>
+      </el-dialog>
+
+      <!-- 处理结果输入弹窗 -->
+      <el-dialog v-model="resultDialogVisible" title="处理结果输入" class="beautiful-dialog">
+        <div class="result-dialog-content">
+          <el-form ref="resultFormRef" :model="{ reportFinal: reportFinal }" :rules="resultFormRules" label-width="80px">
+            <el-form-item label="处理结果" prop="reportFinal">
+              <el-input v-model="reportFinal" type="textarea" :rows="6" placeholder="请输入处理结果详情" />
+            </el-form-item>
+          </el-form>
+        </div>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button @click="resultDialogVisible = false">取消</el-button>
+            <el-button type="primary" @click="handleSaveResult">保存</el-button>
+          </div>
+        </template>
+      </el-dialog>
     </div>
+
+    <!-- 分配任务弹窗 -->
+    <el-dialog title="分配报修任务" v-model="assignDialogVisible" width="400px" :before-close="handleCloseAssign">
+      <el-form ref="assignTaskFormRef" :model="assignTaskForm" :rules="assignTaskRules" label-width="100px">
+        <el-form-item label="维修人员" prop="sendPerson">
+          <el-select v-model="assignTaskForm.sendPerson" placeholder="请选择维修人" :loading="loadingUsers">
+            <el-option v-for="user in usersList" :key="user.id" :label="user.name" :value="user.id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseAssign">取消</el-button>
+          <el-button type="primary" @click="handleSubmitAssign">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
-import { baoxiulist, baoxiuDetail, delbaoxiu, updatebaoxiu, addbaoxiu, uploadbaoxiu } from '@/api/zhinengxunjian/baoxiou/index';
+
+import { baoxiulist, baoxiuDetail, updatebaoxiu, addbaoxiu } from '@/api/zhinengxunjian/baoxiou/index';
 import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 // 激活的选项卡
 const activeTab = ref('task');
 
@@ -241,6 +395,17 @@ const taskStatus = ref('');
 const planType = ref('');
 const executor = ref('');
 
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const isDetailLoading = ref(false);
+
+// 关闭详情弹窗
+const handleCloseDetailDialog = () => {
+  detailDialogVisible.value = false;
+  detailData.value = null;
+};
+
 // 任务数据 - 初始为空数组
 const tasks = ref([]);
 
@@ -250,6 +415,14 @@ const pageSize = ref(8);
 const total = ref(0);
 const loading = ref(false);
 
+// 分配任务弹窗相关
+const assignDialogVisible = ref(false);
+const assignTaskForm = ref({ taskId: '', sendPerson: '' });
+const assignTaskRules = {
+  sendPerson: [{ required: true, message: '请选择维修人', trigger: 'change' }]
+};
+const assignTaskFormRef = ref(null);
+
 // 获取报修任务列表
 defineExpose({ getTaskList });
 async function getTaskList() {
@@ -274,16 +447,27 @@ async function getTaskList() {
         leftLineClass: getLeftLineClass(item.status, item.level),
         priorityClass: getPriorityClass(item.level),
         priority: getPriorityText(item.level),
-        reportTime: formatDate(item.reportTime),
+        // 修复报修时间字段名，使用与模板一致的createTime
+        createTime: formatDate(item.createTime || item.reportTime),
+        // 修复报修人字段，使用reportName
         reporter: item.reportName || '未知报修人',
-        maintainer: item.sendPerson ? `维修人ID: ${item.sendPerson}` : '未分配',
-        expectedCompleteTime: getExpectedCompleteTime(item.status),
-        completeTime: item.completeTime ? formatDate(item.completeTime) : '',
+        // 修复维修人字段，从sendPersonVo对象中获取用户名
+        maintainer: item.sendPersonVo?.userName || '未分配',
+
+        // 尝试从多个可能的字段中获取完成时间，确保有值时能正确显示
+        completeTime: item.completeTime ? formatDate(item.completeTime) : item.finishTime ? formatDate(item.finishTime) : '',
+        // 直接使用并格式化reportFinishTime字段
+        reportFinishTime: item.reportFinishTime ? formatDate(item.reportFinishTime) : '',
         actionText: getActionText(item.status),
         actionClass: getActionClass(item.status),
         reportInfo: item.reportInfo,
         position: item.position,
-        fileUrl: item.fileUrl
+        fileUrl: item.fileUrl,
+
+        reportPhone: item.reportPhone || '',
+        type: item.type || '',
+        // 保留原始数据用于详情查看
+        sendPersonVo: item.sendPersonVo
       }));
     } else {
       tasks.value = [];
@@ -371,20 +555,6 @@ function getActionClass(status) {
   return actionMap[status] || 'view-btn';
 }
 
-// 获取预计完成时间（根据状态和优先级估算）
-function getExpectedCompleteTime(status) {
-  if (status === '3') return ''; // 已完成任务不需要显示预计时间
-
-  const now = new Date();
-  // 简单估算：待处理任务默认当天18:00前完成，处理中任务默认2小时内完成
-  if (status === '1') {
-    now.setHours(18, 0, 0, 0);
-  } else {
-    now.setHours(now.getHours() + 2);
-  }
-  return formatDate(now);
-}
-
 // 格式化日期时间
 function formatDate(date) {
   if (!date) return '';
@@ -438,7 +608,7 @@ const createTaskForm = ref({
   faultLocation: '',
   contactPerson: '',
   contactPhone: '',
-  sendPerson: '', // 指派维修人
+  sendPerson: '未分配维修人', // 指派维修人
   file: '' // 上传的文件列表
 });
 
@@ -449,8 +619,7 @@ const createTaskRules = {
   detailedDescription: [{ required: true, message: '请输入详细描述', trigger: 'blur' }],
   faultLocation: [{ required: true, message: '请输入故障位置', trigger: 'blur' }],
   contactPerson: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-  contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
-  sendPerson: [{ required: true, message: '请选择维修人', trigger: 'change' }]
+  contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'blur' }]
 };
 
 // 用户列表（维修人）
@@ -464,10 +633,10 @@ const getUsersList = async () => {
     const res = await xunjianUserlist();
     // 根据接口返回格式，成功码是200，用户数据在rows数组中
     if (res.code === 200 && res.rows && Array.isArray(res.rows)) {
-      // 映射用户数据，使用id作为value，userName作为显示名称
+      // 映射用户数据，使用userId字段作为唯一标识并转换为字符串以避免大整数精度问题
       usersList.value = res.rows.map((user) => ({
-        id: user.id,
-        name: user.userName
+        id: String(user.userId || ''),
+        name: user.userName || '未知用户'
       }));
     } else {
       usersList.value = [];
@@ -481,86 +650,7 @@ const getUsersList = async () => {
   }
 };
 const isSubmitting = ref(false); // 防止重复提交的状态标记
-const isUploading = ref(false); // 防止重复上传的状态标记
-// 上传文件方法
-const uploadFiles = async (files) => {
-  // 防止重复上传
-  if (isUploading.value) {
-    ElMessage.warning('数据正在处理中，请稍候...');
-    return [];
-  }
 
-  try {
-    isUploading.value = true;
-    const formData = new FormData();
-
-    // 关键修复：将字段名从'files'改为'file'，匹配后端要求的'file'字段
-    files.forEach((file) => {
-      formData.append('file', file.raw); // 这里将'files'改为'file'
-    });
-
-    const res = await uploadbaoxiu(formData);
-
-    if (res.code === 200 && res.data && Array.isArray(res.data)) {
-      return res.data.map((item) => ({
-        fileId: item.ossId,
-        fileUrl: item.url
-      }));
-    } else {
-      console.error('文件上传失败:', res.msg);
-      throw new Error(res.msg || '文件上传失败');
-    }
-  } catch (error) {
-    console.error('文件上传异常:', error);
-    if (error.message.includes('重复提交')) {
-      throw new Error('操作过于频繁，请稍后再试');
-    }
-    throw error;
-  } finally {
-    isUploading.value = false;
-  }
-};
-
-const handleFileChange = (file, fileList) => {
-  // 只处理刚添加的文件
-  if (file.status === 'ready') {
-    // 验证文件格式和大小
-    const isJPG = file.raw.type === 'image/jpeg' || file.raw.type === 'image/jpg';
-    const isPNG = file.raw.type === 'image/png';
-    const isLt2M = file.size / 1024 / 1024 < 2;
-
-    if (!isJPG && !isPNG) {
-      ElMessage.error('上传图片只能是 JPG/JPEG 或 PNG 格式!');
-      // 从文件列表中移除不符合要求的文件
-      createTaskForm.value.fileList = fileList.filter((f) => f.uid !== file.uid);
-      return;
-    }
-
-    if (!isLt2M) {
-      ElMessage.error('上传图片大小不能超过 2MB!');
-      // 从文件列表中移除不符合要求的文件
-      createTaskForm.value.fileList = fileList.filter((f) => f.uid !== file.uid);
-      return;
-    }
-
-    // 保存验证通过的文件到表单
-    createTaskForm.value.fileList = fileList;
-  }
-};
-const handleExceed = (files, fileList) => {
-  ElMessage.warning(`当前限制选择 3 张图片，本次选择了 ${files.length} 张，共选择了 ${files.length + fileList.length} 张`);
-};
-
-// 文件移除前的钩子
-const beforeRemove = (file, fileList) => {
-  return window.confirm(`确定移除 ${file.name}？`);
-};
-
-// 文件移除时的钩子
-const handleRemove = (file, fileList) => {
-  createTaskForm.value.fileList = fileList;
-  ElMessage.info(`已移除 ${file.name}`);
-};
 // 创建任务
 const handleCreateTask = async () => {
   createTaskDialogVisible.value = true;
@@ -580,21 +670,6 @@ const handleSaveTask = async () => {
 
     // 先验证表单
     await createTaskFormRef.value.validate();
-    // 上传选中的文件
-    let fileIds = [];
-    let fileUrls = [];
-
-    if (createTaskForm.value.fileList && createTaskForm.value.fileList.length > 0) {
-      ElMessage.info(`开始上传 ${createTaskForm.value.fileList.length} 张图片...`);
-      const uploadResults = await uploadFiles(createTaskForm.value.fileList);
-
-      // 提取上传结果
-      fileIds = uploadResults.map((result) => result.fileId);
-      fileUrls = uploadResults.map((result) => result.fileUrl);
-
-      ElMessage.success(`图片上传成功，共 ${uploadResults.length} 张`);
-    }
-
     // 准备请求数据
     const requestData = {
       projectId: 1,
@@ -602,11 +677,10 @@ const handleSaveTask = async () => {
       type: mapRepairType(createTaskForm.value.repairType),
       status: '1', // 默认为待处理状态
       level: mapPriorityLevel(createTaskForm.value.priority),
-      sendPerson: parseInt(createTaskForm.value.sendPerson),
+
       reportInfo: createTaskForm.value.detailedDescription,
       position: createTaskForm.value.faultLocation,
-      fileId: fileIds.join(','), // 用逗号分隔多个文件ID
-      fileUrl: fileUrls.join(','), // 用逗号分隔多个文件URL
+      fileId: createTaskForm.value.file,
       reportName: createTaskForm.value.contactPerson,
       reportPhone: createTaskForm.value.contactPhone
     };
@@ -683,52 +757,6 @@ function mapPriorityLevel(priority) {
   return levelMap[priority] || '2';
 }
 
-// 文件上传前的校验
-async function beforeUpload(file) {
-  const isJPG = file.type === 'image/jpeg' || file.type === 'image/jpg';
-  const isPNG = file.type === 'image/png';
-  const isLt2M = file.size / 1024 / 1024 < 2;
-
-  if (!isJPG && !isPNG) {
-    ElMessage.error('上传图片只能是 JPG/JPEG 或 PNG 格式!');
-    return false;
-  }
-  if (!isLt2M) {
-    ElMessage.error('上传图片大小不能超过 2MB!');
-    return false;
-  }
-
-  try {
-    // 直接上传文件
-    const uploadResult = await uploadFile(file);
-    // 存储文件信息到表单
-    createTaskForm.value.fileList = [
-      {
-        ...file,
-        fileId: uploadResult.fileId,
-        fileUrl: uploadResult.fileUrl
-      }
-    ];
-    ElMessage.success('图片上传成功');
-  } catch (error) {
-    ElMessage.error('图片上传失败，请重试');
-  }
-
-  // 阻止自动上传
-  return false;
-}
-
-// 文件上传成功处理
-function handleUploadSuccess(response, file, fileList) {
-  // 这个函数实际上不会被调用，因为auto-upload=false
-  // 真正的上传逻辑在beforeUpload函数中处理
-}
-
-// 文件上传失败处理
-function handleUploadError(err, file, fileList) {
-  ElMessage.error('上传失败，请稍后重试');
-}
-
 // 取消创建报修任务
 const handleCancelCreateTask = () => {
   createTaskDialogVisible.value = false;
@@ -749,15 +777,275 @@ const handleCurrentChange = (val) => {
 };
 
 // 查看任务详情
-const handleView = (task) => {
-  console.log('查看任务详情:', task);
+const handleView = async (task) => {
+  try {
+    if (!task || !task.id) {
+      ElMessage.warning('任务ID不存在，请刷新页面重试');
+      console.error('任务缺少有效id，任务数据：', task);
+      return;
+    }
+
+    isDetailLoading.value = true;
+    detailData.value = null;
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载详情中...',
+      background: 'rgba(255, 255, 255, 0.7)'
+    });
+
+    try {
+      const response = await baoxiuDetail(task.id);
+
+      // 注意：这里使用code === 200判断成功，与项目中其他详情接口保持一致
+      if (response.code === 200 && response.data) {
+        detailData.value = response.data;
+        detailDialogVisible.value = true;
+      } else {
+        const errorMsg = response.msg || '未知错误';
+        console.error(`获取任务详情失败: ${errorMsg}`);
+        ElMessage.error(`获取任务详情失败：${errorMsg}`);
+      }
+    } finally {
+      loading.close();
+      isDetailLoading.value = false;
+    }
+  } catch (error) {
+    console.error('获取任务详情出错:', error);
+    ElMessage.error('获取任务详情出错，请重试');
+  }
+};
+// 拆分逗号分隔的图片URL为数组
+const splitImageUrls = (urlString) => {
+  if (!urlString) return [];
+  // 拆分并过滤空字符串（处理可能的首尾逗号或连续逗号）
+  return urlString.split(',').filter((url) => url.trim().length > 0);
 };
 
-// 处理选项卡点击
-const handleTabClick = () => {
-  currentPage.value = 1;
+// 处理图片加载失败
+const handleImageError = (event, index) => {
+  // 可以设置一个默认图片占位符
+  event.target.src = '';
+  console.error(`图片加载失败: 索引 ${index}`);
 };
 
+// 处理任务操作按钮点击事件
+const handleAction = async (task) => {
+  try {
+    if (!task || !task.id) {
+      ElMessage.warning('任务ID不存在，请刷新页面重试');
+      console.error('任务缺少有效id，任务数据：', task);
+      return;
+    }
+
+    // 点击分配按钮：打开分配弹窗
+    if (task.actionText === '分配') {
+      // 重置表单并设置任务ID
+      assignTaskForm.value = { taskId: task.id, sendPerson: '' };
+      assignDialogVisible.value = true;
+
+      // 打开弹窗时获取用户列表
+      if (usersList.value.length === 0) {
+        await getUsersList();
+      }
+      if (usersList.value.length === 0) {
+        ElMessage.error('无可用维修人员，请先配置维修人员信息');
+        assignDialogVisible.value = false;
+      }
+    }
+
+    // 点击跟进按钮：原有逻辑
+    else if (task.actionText === '跟进') {
+      resultDialogVisible.value = true;
+      currentTaskId.value = task.id;
+    }
+
+    // 其他操作（如评价）
+    else {
+      console.log('其他操作:', task.actionText);
+    }
+  } catch (error) {
+    console.error('任务操作失败:', error, '当前任务数据:', task);
+    ElMessage.error('操作失败，请联系技术支持');
+  }
+};
+
+// 提交分配任务
+const handleSubmitAssign = async () => {
+  if (!assignTaskFormRef.value) return;
+
+  try {
+    await assignTaskFormRef.value.validate();
+
+    // 找到原始任务数据
+    const originalTask = tasks.value.find((t) => t.id === assignTaskForm.value.taskId);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      return;
+    }
+
+    // 找到选中的维修人员
+    const selectedUser = usersList.value.find((u) => u.id === assignTaskForm.value.sendPerson);
+    if (!selectedUser) {
+      ElMessage.error('未找到选中的维修人员');
+      return;
+    }
+
+    // 构造更新参数
+    const updateData = {
+      id: assignTaskForm.value.taskId,
+      status: '2', // 处理中状态
+      sendPerson: selectedUser.id,
+      sendPersonName: selectedUser.name,
+      sendPersonVo: {
+        id: selectedUser.id,
+        userName: selectedUser.name
+      },
+      // 包含后端所需的其他必要字段
+      name: originalTask.title,
+      type: mapRepairType(originalTask.type || 'all'),
+      level: mapPriorityLevel(originalTask.priority),
+      reportName: originalTask.reporter,
+      reportPhone: originalTask.reportPhone || '',
+      position: originalTask.position || '',
+      reportInfo: originalTask.reportInfo || '',
+      projectId: 1
+    };
+
+    // 调用接口更新
+    const response = await updatebaoxiu(updateData);
+    if (response.code === 200) {
+      ElMessage.success(`任务已分配给【${selectedUser.name}】，状态更新为处理中`);
+      assignDialogVisible.value = false;
+      getTaskList(); // 刷新列表
+    } else {
+      const errorMsg = response.msg || '未知错误';
+      console.error(`任务分配失败：${errorMsg}，请求参数：`, updateData);
+      ElMessage.error(`分配失败：${errorMsg}`);
+    }
+  } catch (error) {
+    if (error instanceof Error) {
+      ElMessage.error(`操作失败：${error.message}`);
+    } else if (error !== false) {
+      ElMessage.error('操作失败：未知错误');
+    }
+  }
+};
+
+// 关闭分配弹窗
+const handleCloseAssign = () => {
+  assignDialogVisible.value = false;
+  if (assignTaskFormRef.value) {
+    assignTaskFormRef.value.clearValidate();
+  }
+};
+
+// 结果输入弹窗相关状态
+const resultDialogVisible = ref(false);
+const currentTaskId = ref('');
+const reportFinal = ref('');
+
+// 处理结果表单验证规则
+const resultFormRules = {
+  reportFinal: [
+    {
+      required: true,
+      message: '请输入处理结果',
+      trigger: 'blur'
+    },
+    {
+      min: 5,
+      max: 500,
+      message: '处理结果长度在 5 到 500 个字符之间',
+      trigger: 'blur'
+    }
+  ]
+};
+
+// 表单引用
+const resultFormRef = ref(null);
+
+// 保存结果
+const handleSaveResult = async () => {
+  try {
+    if (!currentTaskId.value) {
+      ElMessage.warning('任务ID不存在');
+      return;
+    }
+
+    if (!reportFinal.value.trim()) {
+      ElMessage.warning('请输入处理结果');
+      return;
+    }
+
+    // 1. 查找当前任务的完整数据
+    const originalTask = tasks.value.find((t) => t.id === currentTaskId.value);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      console.error('未找到任务完整数据，任务ID：', currentTaskId.value);
+      return;
+    }
+
+    // 2. 生成当前时间作为完成时间
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, '0');
+    const day = String(now.getDate()).padStart(2, '0');
+    const hours = String(now.getHours()).padStart(2, '0');
+    const minutes = String(now.getMinutes()).padStart(2, '0');
+    const seconds = String(now.getSeconds()).padStart(2, '0');
+    const reportFinishTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+
+    // 3. 构造完整的更新参数（与任务分配时使用相同的参数集）
+    const updateData = {
+      // ① 任务基础标识（必传）
+      id: currentTaskId.value, // 任务ID（核心主键）
+
+      // ② 状态流转参数（必传）
+      status: '3', // 状态：3=已完成
+      statusText: '已完成', // 状态文本
+      reportFinal: reportFinal.value, // 处理结果
+      reportFinishTime: reportFinishTime, // 完成时间
+      completeTime: reportFinishTime, // 完成时间
+
+      // ③ 复用原始任务数据中的所有必要字段
+      name: originalTask.title, // 任务名称（原始任务标题）
+      type: mapRepairType(originalTask.type || 'all'), // 任务类型（映射为后端需要的格式）
+      level: mapPriorityLevel(originalTask.priority), // 优先级（映射为后端需要的格式）
+      reportName: originalTask.reporter, // 报修人姓名
+      reportPhone: originalTask.reportPhone || '', // 报修人电话
+      position: originalTask.position || '', // 故障位置
+      reportInfo: originalTask.reportInfo || '', // 报修详情
+
+      // ④ 维修人员信息（保留原有分配的维修人员）
+      sendPerson: originalTask.sendPersonVo?.id || '', // 维修人员ID
+      sendPersonName: originalTask.sendPersonVo?.userName || '', // 维修人员姓名
+      sendPersonVo: originalTask.sendPersonVo || {}, // 维修人员完整信息
+
+      // ⑤ 其他必要参数
+      pageNum: currentPage.value, // 分页参数
+      pageSize: pageSize.value,
+      projectId: 1 // 项目ID
+    };
+
+    const response = await updatebaoxiu(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('处理结果已保存');
+      resultDialogVisible.value = false;
+      reportFinal.value = '';
+      currentTaskId.value = '';
+      getTaskList();
+    } else {
+      const errorMsg = response.msg || '未知错误';
+      console.error(`保存处理结果失败: ${errorMsg}`);
+      ElMessage.error(`保存处理结果失败：${errorMsg}`);
+    }
+  } catch (error) {
+    console.error('保存处理结果失败:', error);
+    ElMessage.error('保存失败，请重试');
+  }
+};
 const handleInspectionManagement1 = () => {
   router.push('/rili/baoxiuguanli');
 };
@@ -795,79 +1083,14 @@ onMounted(async () => {
 </script>
 
 <style scoped>
+@import url('./css/detail-dialog.css');
+@import url('./css/step-bars.css');
 .inspection-tasks {
   padding: 20px;
   background-color: #f5f7fa;
   min-height: 100vh;
 }
 
-/* 上传图片区域样式 */
-.upload-container {
-  width: 100%;
-}
-
-.upload-box {
-  border: 2px dashed #dcdfe6;
-  border-radius: 8px;
-  padding: 40px 20px;
-  text-align: center;
-  cursor: pointer;
-  background-color: #f8f9fa;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  position: relative;
-  overflow: hidden;
-}
-
-.upload-box::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: -100%;
-  width: 100%;
-  height: 100%;
-  background: linear-gradient(90deg, transparent, rgba(64, 158, 255, 0.1), transparent);
-  transition: all 0.6s ease;
-}
-
-.upload-box:hover {
-  border-color: #409eff;
-  background-color: #ecf5ff;
-  transform: translateY(-2px);
-  box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15);
-}
-
-.upload-box:hover::before {
-  left: 100%;
-}
-
-.avatar-uploader-icon {
-  font-size: 40px;
-  color: #c0c4cc;
-  margin-bottom: 12px;
-  transition: color 0.3s;
-}
-
-.upload-box:hover .avatar-uploader-icon {
-  color: #409eff;
-}
-
-.upload-text {
-  font-size: 14px;
-  color: #606266;
-  font-weight: 500;
-  margin-bottom: 6px;
-  transition: color 0.3s;
-}
-
-.upload-box:hover .upload-text {
-  color: #409eff;
-}
-
-.upload-hint {
-  font-size: 12px;
-  color: #909399;
-}
-
 /* 美化弹窗样式 */
 .beautiful-dialog {
   border-radius: 12px;
@@ -917,6 +1140,124 @@ onMounted(async () => {
   border-top: 1px solid #f0f2f5;
   text-align: center;
 }
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+}
+
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
+  font-size: 14px;
+}
+
+/* 故障原因样式 */
+.fail-reason {
+  color: #ff4d4f;
+  font-weight: 500;
+}
+
+/* 加载状态 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.skeleton-card {
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.skeleton-header {
+  height: 20px;
+  width: 30%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 12px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-row {
+  height: 16px;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+/* 无数据提示 */
+.no-info {
+  text-align: center;
+  color: #909399;
+  padding: 60px 20px;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .custom-experiment-dialog {
+    width: 95% !important;
+  }
+
+  .info-item {
+    flex: 0 0 100%;
+  }
+}
 
 /* 美化表单样式 */
 .elegant-form .el-form-item {
@@ -1048,10 +1389,6 @@ onMounted(async () => {
   .elegant-form .el-form-item {
     margin-bottom: 20px;
   }
-
-  .upload-box {
-    padding: 30px 15px;
-  }
 }
 
 /* 选项卡样式 */
@@ -1147,7 +1484,7 @@ onMounted(async () => {
 /* 任务卡片样式 - 恢复优先级标签背景色 */
 .task-cards {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(310px, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
   gap: 20px;
   margin-bottom: 30px;
 }
@@ -1160,22 +1497,14 @@ onMounted(async () => {
   transition: all 0.3s ease;
   position: relative;
   overflow: hidden;
-  min-height: 260px; /* 增加高度以适应新增的预计完成时间 */
+  min-height: 280px; /* 增加高度以确保内容完整显示 */
+  display: flex;
+  flex-direction: column;
 }
 
-.task-actions {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  padding-top: 12px;
-  border-top: 1px solid #f0f2f5;
-  position: absolute;
-  bottom: 16px;
-  right: 16px;
-  left: 16px;
-  background-color: #fff;
-  padding: 12px 0 0 0;
-  z-index: 10;
+.task-content {
+  flex: 1; /* 内容区域占满剩余空间 */
+  margin-bottom: 16px;
 }
 
 .task-actions .el-button {
@@ -1228,6 +1557,9 @@ onMounted(async () => {
   font-weight: 500;
   color: #1d2129;
   line-height: 1.4;
+  word-break: break-word;
+  flex: 1;
+  margin-right: 8px;
 }
 
 /* 恢复优先级标签背景色样式 */
@@ -1237,6 +1569,7 @@ onMounted(async () => {
   font-size: 12px;
   font-weight: 500;
   border: 1px solid transparent;
+  flex-shrink: 0;
 }
 
 .priority-high {
@@ -1265,17 +1598,20 @@ onMounted(async () => {
   display: flex;
   margin-bottom: 10px;
   font-size: 13px;
+  align-items: flex-start;
 }
 
 .detail-label {
-  flex: 0 0 80px;
+  flex: 0 0 85px;
   color: #86909c;
+  margin-right: 4px;
 }
 
 .detail-value {
   flex: 1;
   color: #4e5969;
-  word-break: break-all;
+  word-break: break-word;
+  line-height: 1.5;
 }
 
 .task-result {
@@ -1292,13 +1628,7 @@ onMounted(async () => {
   align-items: center;
   padding-top: 12px;
   border-top: 1px solid #f0f2f5;
-  position: absolute;
-  bottom: 16px;
-  right: 16px;
-  left: 16px;
   background-color: #fff;
-  padding: 12px 0 0 0;
-  z-index: 10;
 }
 
 .action-btn {
@@ -1369,24 +1699,6 @@ onMounted(async () => {
   color: #fff;
 }
 
-.avatar-uploader .el-upload-list {
-  margin-top: 12px;
-}
-
-.avatar-uploader .el-upload-list__item {
-  border-radius: 6px;
-  margin-bottom: 8px;
-  transition: all 0.2s;
-}
-
-.avatar-uploader .el-upload-list__item:hover {
-  transform: translateX(4px);
-}
-
-.upload-tip {
-  margin-top: 10px;
-  font-size: 12px;
-}
 /* 响应式设计 */
 @media (max-width: 1200px) {
   .task-cards {
@@ -1458,4 +1770,120 @@ onMounted(async () => {
   cursor: pointer;
   user-select: none;
 }
+
+/* 详情弹窗样式 */
+.custom-experiment-dialog {
+  .detail-content {
+    max-height: 60vh;
+    overflow-y: auto;
+    padding-right: 10px;
+  }
+
+  .detail-section {
+    margin-bottom: 24px;
+  }
+
+  .section-title {
+    font-size: 16px;
+    font-weight: 500;
+    color: #303133;
+    margin-bottom: 16px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #f0f2f5;
+  }
+
+  .detail-grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 16px;
+  }
+
+  .detail-item {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .detail-label {
+    font-size: 14px;
+    color: #909399;
+    margin-bottom: 4px;
+  }
+
+  .detail-value {
+    font-size: 14px;
+    color: #303133;
+  }
+
+  .detail-textarea {
+    margin-bottom: 16px;
+  }
+
+  .detail-text {
+    font-size: 14px;
+    color: #303133;
+    line-height: 1.6;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+  }
+
+  /* 多图片展示容器样式 */
+  .images-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16px;
+    margin-top: 12px;
+    padding: 10px;
+    background-color: #f9f9f9;
+    border-radius: 8px;
+  }
+
+  /* 单个图片项样式 */
+  .image-item {
+    flex: 0 0 auto;
+    width: 200px; /* 固定宽度 */
+    height: 160px; /* 固定高度 */
+    border-radius: 6px;
+    overflow: hidden;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+    transition: transform 0.3s ease;
+  }
+
+  .image-item:hover {
+    transform: scale(1.03);
+  }
+
+  /* 图片样式 */
+  .detail-image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover; /* 保持比例填充容器 */
+    display: block;
+  }
+
+  /* 图片加载失败样式 */
+  .detail-image[src=''] {
+    background-color: #f0f0f0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #999;
+    font-size: 12px;
+  }
+
+  .no-info {
+    text-align: center;
+    color: #909399;
+    padding: 40px 0;
+  }
+}
+
+@media (max-width: 768px) {
+  .custom-experiment-dialog {
+    width: 90% !important;
+
+    .detail-grid {
+      grid-template-columns: 1fr;
+    }
+  }
+}
 </style>
diff --git a/src/views/zhinengxunjian/baoxiujilu.vue b/src/views/zhinengxunjian/baoxiujilu.vue
index bd22772..b5d97a7 100644
--- a/src/views/zhinengxunjian/baoxiujilu.vue
+++ b/src/views/zhinengxunjian/baoxiujilu.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="inspection-tasks">
       <!-- 导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,10 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <!-- 页面标题 -->
-      <TitleComponent title="报修管理模块" subtitle="创建报修任务，跟进报修记录，管理维修进度"></TitleComponent>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -28,16 +25,16 @@
         <div class="filter-container">
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
-              <el-option label="待执行" value="pending"></el-option>
-              <el-option label="处理中" value="processing"></el-option>
-              <el-option label="已完成" value="completed"></el-option>
+              <el-option label="待执行" value="1"></el-option>
+              <el-option label="处理中" value="2"></el-option>
+              <el-option label="已完成" value="3"></el-option>
             </el-select>
           </div>
           <div class="filter-item">
             <el-select v-model="priority" placeholder="优先级">
-              <el-option label="高优先级" value="high"></el-option>
-              <el-option label="中优先级" value="medium"></el-option>
-              <el-option label="低优先级" value="low"></el-option>
+              <el-option label="高优先级" value="1"></el-option>
+              <el-option label="中优先级" value="2"></el-option>
+              <el-option label="低优先级" value="3"></el-option>
             </el-select>
           </div>
           <div class="filter-item">
@@ -58,7 +55,7 @@
             />
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
           </div>
         </div>
       </div>
@@ -68,8 +65,8 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">本月报修数</p>
-            <p class="stat-value">24</p>
-            <p class="stat-trend up">较上月 +4.2%</p>
+            <p class="stat-value">{{ statsLoading ? '加载中...' : statsData.byzbxs }}</p>
+            <p class="stat-trend up">较上月：{{ statsData.bxsjszzzl }}</p>
           </div>
           <div class="stat-icon">
             <img src="@/assets/images/baoxiu.png" alt="本月报修数" class="stat-image" />
@@ -79,8 +76,8 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">平均处理时长</p>
-            <p class="stat-value">3.5小时</p>
-            <p class="stat-trend down">较上月 -0.6小时</p>
+            <p class="stat-value">{{ statsLoading ? '加载中...' : statsData.pjclsc }}</p>
+            <p class="stat-trend down">较上月：{{ statsData.clscjszzzl }}</p>
           </div>
           <div class="stat-icon">
             <img src="@/assets/images/baoxiushijian.png" alt="平均处理时长" class="stat-image" />
@@ -90,7 +87,7 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">待处理报修</p>
-            <p class="stat-value">15</p>
+            <p class="stat-value">{{ statsLoading ? '加载中...' : statsData.dclbx }}</p>
             <p class="stat-trend warning">需及时处理</p>
           </div>
           <div class="stat-icon warning">
@@ -101,8 +98,8 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">完成率</p>
-            <p class="stat-value">92%</p>
-            <p class="stat-trend up">较上月 +2.1%</p>
+            <p class="stat-value">{{ statsLoading ? '加载中...' : statsData.wcl }}%</p>
+            <p class="stat-trend up">{{ statsData.wcljszzzl }}%</p>
           </div>
           <div class="stat-icon success">
             <img src="@/assets/images/baoxiuwancheng.png" alt="完成率" class="stat-image" />
@@ -112,24 +109,44 @@
 
       <!-- 报修记录表格 -->
       <div class="table-container">
-        <el-table :data="filteredRecords" border style="width: 100%" class="record-table">
-          <el-table-column align="center" prop="reportNo" label="报修单号" min-width="120"></el-table-column>
-          <el-table-column align="center" prop="content" label="报修内容" min-width="200"></el-table-column>
-          <el-table-column align="center" prop="reporter" label="报修人" min-width="90"></el-table-column>
-          <el-table-column align="center" prop="reportTime" label="报修时间" min-width="150"></el-table-column>
-          <el-table-column align="center" prop="handler" label="处理人员" min-width="90"></el-table-column>
-          <el-table-column align="center" prop="status" label="处理状态" min-width="90">
+        <el-table :data="filteredRecords" border style="width: 100%" class="record-table" v-loading="loading" element-loading-text="加载中...">
+          <el-table-column align="center" prop="reportNo" label="报修单号" min-width="120">
+            <template #default="scope">{{ scope.row.id }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="content" label="报修内容" min-width="200">
+            <template #default="scope">{{ scope.row.reportInfo }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="reporter" label="报修人" min-width="90">
+            <template #default="scope">{{ scope.row.reportName }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="reportTime" label="报修时间" min-width="150">
+            <template #default="scope">{{ formatDate(scope.row.createTime) }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="handler" label="处理人员" min-width="90">
             <template #default="scope">
-              <span :class="`status-tag ${scope.row.statusClass}`">{{ scope.row.status }}</span>
+              {{ scope.row.sendPersonVo ? scope.row.sendPersonVo.userName : '未分配' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="status" label="处理状态" min-width="90">
+            <template #default="scope">
+              <span :class="`status-tag ${getStatusClass(scope.row.status)}`">{{ getStatusText(scope.row.status) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="handleTime" label="处理时间" min-width="150">
+            <template #default="scope">
+              {{ scope.row.reportFinishTime ? formatDate(scope.row.reportFinishTime) : '--' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="result" label="维修结果" min-width="180">
+            <template #default="scope">
+              {{ scope.row.reportFinal || '--' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="handleTime" label="处理时间" min-width="150"></el-table-column>
-          <el-table-column align="center" prop="result" label="维修结果" min-width="180"></el-table-column>
           <el-table-column align="center" label="操作" min-width="140">
             <template #default="scope">
               <el-button type="text" class="detail-btn" @click="handleDetail(scope.row)"> 详情 </el-button>
-              <el-button type="text" :class="scope.row.actionClass" @click="handleAction(scope.row)">
-                {{ scope.row.actionText }}
+              <el-button type="text" :class="getActionClass(scope.row.status)" @click="handleAction(scope.row)">
+                {{ getActionText(scope.row.status) }}
               </el-button>
             </template>
           </el-table-column>
@@ -153,13 +170,209 @@
         </div>
       </div>
     </div>
+
+    <!-- 任务详情弹窗 -->
+    <el-dialog
+      v-model="detailDialogVisible"
+      title="报修任务详情"
+      width="800px"
+      :before-close="handleCloseDetailDialog"
+      class="custom-experiment-dialog"
+    >
+      <div v-if="detailData" class="task-detail-container">
+        <!-- 加载状态骨架屏 -->
+        <div v-if="isDetailLoading" class="skeleton-loading">
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 任务基本信息卡片 -->
+        <div class="detail-card">
+          <h3 class="card-title">任务基本信息</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">任务ID：</span>
+                <span class="info-value">{{ detailData.id || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">任务名称：</span>
+                <span class="info-value">{{ detailData.name || '未命名' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">任务状态：</span>
+                <span class="info-value">{{ getStatusText(detailData.status) }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">任务等级：</span>
+                <span class="info-value">{{ getPriorityText(detailData.level) }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">任务类型：</span>
+                <span class="info-value">{{ detailData.type === '1' ? '硬件故障' : detailData.type === '2' ? '软件故障' : '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">报修时间：</span>
+                <span class="info-value">{{ formatDate(detailData.createTime) }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 报修人信息卡片 -->
+        <div class="detail-card">
+          <h3 class="card-title">报修人信息</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">报修人：</span>
+                <span class="info-value">{{ detailData.reportName || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">联系人：</span>
+                <span class="info-value">{{ detailData.reportName || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">联系电话：</span>
+                <span class="info-value">{{ detailData.reportPhone || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">维修人：</span>
+                <span class="info-value">{{ detailData.sendPersonVo?.userName || '-' }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 报修详情信息卡片 -->
+        <div class="detail-card">
+          <h3 class="card-title">报修详情</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item full-width">
+                <span class="info-label">故障位置：</span>
+                <span class="info-value">{{ detailData.position || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item full-width">
+                <span class="info-label">详细描述：</span>
+                <span class="info-value">{{ detailData.reportInfo || '-' }}</span>
+              </div>
+            </div>
+            <!-- 已完成状态的额外信息 -->
+            <div v-if="detailData.status === '3'" class="info-row">
+              <div class="info-item">
+                <span class="info-label">完成时间：</span>
+                <span class="info-value">{{ formatDate(detailData.completeTime) }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 故障图片 -->
+        <div v-if="detailData.fileUrl && detailData.fileUrl.length > 0" class="detail-card">
+          <h3 class="card-title">故障图片</h3>
+          <div class="card-content">
+            <div class="images-container">
+              <!-- 将逗号分隔的URL字符串拆分为数组并循环展示 -->
+              <div v-for="(url, index) in splitImageUrls(detailData.fileUrl)" :key="index" class="image-item">
+                <img
+                  :src="url"
+                  :alt="`故障图片 ${index + 1}`"
+                  class="detail-image"
+                  @error="handleImageError($event, index)"
+                  style="max-width: 100%; max-height: 200px; border-radius: 4px"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-else class="loading-state">
+        <i class="el-icon-loading el-icon--loading"></i>
+        <span>加载中...</span>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseDetailDialog">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 跟进任务弹窗 -->
+    <el-dialog v-model="followDialogVisible" title="跟进任务" width="600px" :before-close="handleCloseFollowDialog" class="beautiful-dialog">
+      <div class="dialog-content">
+        <div class="form-group">
+          <label class="form-label">处理结果</label>
+          <el-input v-model="reportFinal" type="textarea" :rows="6" placeholder="请输入维修处理结果（5-500字）" maxlength="500" />
+        </div>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseFollowDialog">取消</el-button>
+          <el-button type="primary" @click="submitFollow">提交</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 分配任务弹窗 -->
+    <el-dialog v-model="assignDialogVisible" title="分配维修人员" width="500px" :before-close="handleCloseAssignDialog" class="beautiful-dialog">
+      <div class="dialog-content">
+        <div class="form-group">
+          <label class="form-label">选择维修人员</label>
+          <el-select v-model="selectedUserId" placeholder="请选择维修人员" :disabled="loadingUsers">
+            <el-option v-for="user in usersList" :key="user.id" :label="user.name" :value="user.id" />
+          </el-select>
+        </div>
+        <div v-if="loadingUsers" class="loading-hint">加载中...</div>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseAssignDialog">取消</el-button>
+          <el-button type="primary" @click="submitAssign">确认分配</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
-
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
+import { ElMessage } from 'element-plus';
+import { baoxiulist, baoxiuDetail, baoxiuRecord, updatebaoxiu } from '@/api/zhinengxunjian/baoxiou/index';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
+
+// 加载状态
+const loading = ref(false);
+const statsLoading = ref(false);
 
 // 筛选条件
 const taskStatus = ref('');
@@ -168,106 +381,60 @@ const executor = ref('');
 const dateRange = ref([]);
 
 // 分页相关
-const currentPage = ref(3);
+const currentPage = ref(1);
 const pageSize = ref(7);
 
 // 报修记录数据
-const repairRecords = ref([
-  {
-    reportNo: 'R-2025-0620-001',
-    content: '服务器A1电源故障',
-    reporter: '张明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李阳',
-    status: '处理中',
-    statusClass: 'processing',
-    handleTime: '--',
-    result: '--',
-    actionText: '跟进',
-    actionClass: 'follow-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-002',
-    content: '测试软件授权过期',
-    reporter: '张明',
-    reportTime: '2025-06-20 09:15',
-    handler: '李阳',
-    status: '已完成',
-    statusClass: 'completed',
-    handleTime: '2025-06-21 14:30',
-    result: '已重新授权',
-    actionText: '评价',
-    actionClass: 'evaluate-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-003',
-    content: '打印机卡纸故障',
-    reporter: '张明',
-    reportTime: '2025-06-20 10:45',
-    handler: '李阳',
-    status: '已完成',
-    statusClass: 'completed',
-    handleTime: '2025-06-21 10:15',
-    result: '已清除卡纸，设备正常',
-    actionText: '评价',
-    actionClass: 'evaluate-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-004',
-    content: '网络交换机端口故障',
-    reporter: '张明',
-    reportTime: '2025-06-20 13:20',
-    handler: '李阳',
-    status: '已完成',
-    statusClass: 'completed',
-    handleTime: '2025-06-20 15:40',
-    result: '已更换端口',
-    actionText: '评价',
-    actionClass: 'evaluate-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-005',
-    content: '服务器A1电源故障',
-    reporter: '张明',
-    reportTime: '2025-06-20 14:50',
-    handler: '李阳',
-    status: '已完成',
-    statusClass: 'completed',
-    handleTime: '2025-06-21 09:30',
-    result: '已重新授权',
-    actionText: '评价',
-    actionClass: 'evaluate-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-006',
-    content: '机房空调温度异常',
-    reporter: '张明',
-    reportTime: '2025-06-20 16:10',
-    handler: '李阳',
-    status: '已完成',
-    statusClass: 'completed',
-    handleTime: '2025-06-20 17:25',
-    result: '已修复，温度正常',
-    actionText: '评价',
-    actionClass: 'evaluate-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-007',
-    content: '监控系统无法连接',
-    reporter: '张明',
-    reportTime: '2025-06-20 18:05',
-    handler: '李阳',
-    status: '已完成',
-    statusClass: 'completed',
-    handleTime: '2025-06-21 08:45',
-    result: '网络配置已重置',
-    actionText: '评价',
-    actionClass: 'evaluate-btn'
-  }
-]);
+const repairRecords = ref([]);
+const total = ref(0);
 
-// 总记录数
-const total = ref(54);
+// 统计数据
+const statsData = ref({
+  byzbxs: '0', // 本月报修数
+  bxsjszzzl: '0%', // 报修及时处理率
+  pjclsc: '0小时', // 平均处理时长
+  clscjszzzl: '0%', // 处理时长及时处理率
+  dclbx: '0', // 待处理报修
+  wcl: '0%', // 完成率
+  wcljszzzl: '0%' // 完成率及时处理率
+});
+
+// 初始化加载数据
+onMounted(() => {
+  fetchRepairRecords();
+  fetchStatsData();
+});
+
+// 从接口获取报修记录
+const fetchRepairRecords = async () => {
+  loading.value = true;
+  try {
+    // 构建请求参数
+    const params = {
+      page: currentPage.value,
+      limit: pageSize.value,
+      status: taskStatus.value || undefined,
+      level: priority.value || undefined
+      // 可以根据需要添加更多筛选参数
+    };
+
+    // 调用接口获取数据
+    const response = await baoxiulist(params);
+
+    if (response.code === 200) {
+      repairRecords.value = response.rows || [];
+      total.value = response.total || 0;
+    } else {
+      console.error('获取报修记录失败:', response.msg);
+      // 可以添加错误提示
+    }
+  } catch (error) {
+    console.error('获取报修记录出错:', error);
+    // 可以添加错误提示
+  } finally {
+    loading.value = false;
+  }
+};
 
 // 筛选后的记录
 const filteredRecords = computed(() => {
@@ -278,73 +445,442 @@ const filteredRecords = computed(() => {
 // 搜索处理
 const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
-  // 实际应用中这里会根据筛选条件过滤数据
-};
-
-// 创建任务弹窗相关
-const createTaskDialogVisible = ref(false);
-const createTaskForm = ref({
-  taskName: '',
-  repairContent: '',
-  timeRange: [],
-  priority: '',
-  handler: ''
-});
-
-const createTaskRules = {
-  taskName: [{ required: true, message: '请输入任务名称', trigger: 'blur' }],
-  repairContent: [{ required: true, message: '请输入报修内容', trigger: 'blur' }],
-  timeRange: [{ required: true, message: '请选择时间范围', trigger: 'change' }]
-};
-
-// 保存任务
-const handleSaveTask = () => {
-  // 模拟保存任务逻辑
-  console.log('保存任务:', createTaskForm.value);
-  // 关闭弹窗
-  createTaskDialogVisible.value = false;
-  // 重置表单
-  createTaskForm.value = {
-    taskName: '',
-    repairContent: '',
-    timeRange: [],
-    priority: '',
-    handler: ''
-  };
-  // 这里可以添加成功提示和刷新任务列表的逻辑
-};
-
-// 取消创建任务
-const handleCancelCreateTask = () => {
-  createTaskDialogVisible.value = false;
-  // 重置表单
-  createTaskForm.value = {
-    taskName: '',
-    repairContent: '',
-    timeRange: [],
-    priority: '',
-    handler: ''
-  };
+  fetchRepairRecords(); // 重新获取数据
 };
 
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
   currentPage.value = 1;
+  fetchRepairRecords();
 };
 
 const handleCurrentChange = (val) => {
   currentPage.value = val;
+  fetchRepairRecords();
+};
+
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const isDetailLoading = ref(false);
+
+// 跟进任务弹窗相关
+const followDialogVisible = ref(false);
+const currentFollowTaskId = ref('');
+const reportFinal = ref('');
+
+// 分配任务弹窗相关
+const assignDialogVisible = ref(false);
+const currentAssignTaskId = ref('');
+const selectedUserId = ref('');
+const usersList = ref([]);
+const loadingUsers = ref(false);
+
+// 维修类型映射
+function mapRepairType(type) {
+  const typeMap = {
+    'hardware': '1', // 硬件故障
+    'software': '2', // 软件故障
+    'all': '1'
+  };
+  return typeMap[type] || '1';
+}
+
+// 获取用户列表
+const getUsersList = async () => {
+  loadingUsers.value = true;
+  try {
+    const res = await xunjianUserlist();
+    // 根据接口返回格式，成功码是200，用户数据在rows数组中
+    if (res.code === 200 && res.rows && Array.isArray(res.rows)) {
+      // 映射用户数据，使用userId字段作为唯一标识并转换为字符串以避免大整数精度问题
+      usersList.value = res.rows.map((user) => ({
+        id: String(user.userId || ''),
+        name: user.userName || '未知用户'
+      }));
+    } else {
+      usersList.value = [];
+      console.error('获取用户列表失败:', res.msg || '未知错误');
+    }
+  } catch (error) {
+    console.error('获取用户列表异常:', error);
+    usersList.value = [];
+  } finally {
+    loadingUsers.value = false;
+  }
+};
+
+// 优先级映射 - 1低优先2中优先3高优先
+function mapPriorityLevel(priority) {
+  const levelMap = {
+    'low': '1', // 低优先
+    'medium': '2', // 中优先
+    'high': '3' // 高优先
+  };
+  return levelMap[priority] || '2';
+}
+
+// 关闭详情弹窗
+const handleCloseDetailDialog = () => {
+  detailDialogVisible.value = false;
+  detailData.value = null;
 };
 
 // 查看详情
-const handleDetail = (record) => {
+const handleDetail = async (record) => {
   console.log('查看详情:', record);
+  isDetailLoading.value = true;
+  try {
+    // 调用接口获取详情数据
+    const response = await baoxiuDetail(record.id);
+    if (response.code === 200) {
+      detailData.value = response.data;
+      detailDialogVisible.value = true;
+    } else {
+      console.error('获取详情失败:', response.msg);
+      // 可以添加错误提示
+    }
+  } catch (error) {
+    console.error('获取详情出错:', error);
+    // 可以添加错误提示
+  } finally {
+    isDetailLoading.value = false;
+  }
+};
+
+// 状态文本映射 - 与图片需求保持一致
+const getStatusText = (status) => {
+  const statusMap = {
+    '1': '待处理',
+    '2': '处理中',
+    '3': '已完成',
+    '4': '已延期'
+  };
+  return statusMap[status] || '未知状态';
+};
+
+// 状态样式映射 - 与其他页面保持一致
+const getStatusClass = (status) => {
+  const classMap = {
+    '1': 'tag-pending',
+    '2': 'tag-executing',
+    '3': 'tag-completed',
+    '4': 'tag-delayed'
+  };
+  return classMap[status] || '';
+};
+
+// 优先级文本映射
+const getPriorityText = (level) => {
+  const levelMap = {
+    '1': '高优先级',
+    '2': '中优先级',
+    '3': '低优先级'
+  };
+  return levelMap[level] || '未知优先级';
+};
+
+// 根据状态获取操作文本
+const getActionText = (status) => {
+  const actionMap = {
+    '1': '处理',
+    '2': '跟进',
+    '3': '评价'
+  };
+  return actionMap[status] || '操作';
+};
+
+// 根据状态获取操作样式
+const getActionClass = (status) => {
+  const classMap = {
+    '1': 'process-btn',
+    '2': 'follow-btn',
+    '3': 'evaluate-btn'
+  };
+  return classMap[status] || '';
+};
+
+// 格式化日期
+const formatDate = (dateString) => {
+  if (!dateString) return '-';
+  try {
+    const date = new Date(dateString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } catch (error) {
+    return dateString;
+  }
+};
+
+// 分割图片URL
+const splitImageUrls = (fileUrl) => {
+  if (!fileUrl) return [];
+  // 去掉首尾的空格并按逗号分割
+  const urls = fileUrl.trim().split(',');
+  return urls.filter((url) => url.trim());
+};
+
+// 处理图片加载错误
+const handleImageError = (event, index) => {
+  event.target.src = '@/assets/images/error-image.png';
+};
+
+// 获取统计数据
+const fetchStatsData = async () => {
+  statsLoading.value = true;
+  try {
+    const response = await baoxiuRecord({ projectId: 1 });
+    if (response.code === 0 || response.code === 200) {
+      // 确保数据完整性
+      const data = response.data || {};
+      statsData.value = {
+        byzbxs: data.byzbxs || '0',
+        bxsjszzzl: data.bxsjszzzl || '0%',
+        pjclsc: data.pjclsc || '0小时',
+        clscjszzzl: data.clscjszzzl || '0%',
+        dclbx: data.dclbx || '0',
+        wcl: data.wcl || '0%',
+        wcljszzzl: data.wcljszzzl || '0%'
+      };
+    } else {
+      console.error('获取统计数据失败:', response.msg);
+    }
+  } catch (error) {
+    console.error('获取统计数据出错:', error);
+  } finally {
+    statsLoading.value = false;
+  }
 };
 
 // 处理操作
 const handleAction = (record) => {
-  console.log('执行操作:', record.actionText, record);
+  console.log('执行操作:', getActionText(record.status), record);
+  // 根据不同状态执行不同操作
+  switch (record.status) {
+    case '1':
+      // 待执行状态 - 处理任务
+      handleProcessTask(record);
+      break;
+    case '2':
+      // 处理中状态 - 跟进任务
+      handleFollowTask(record);
+      break;
+    case '3':
+      // 已完成状态 - 评价任务
+      handleEvaluateTask(record);
+      break;
+    default:
+      console.log('未知操作');
+  }
+};
+
+// 处理任务 - 打开分配弹窗
+const handleProcessTask = async (record) => {
+  console.log('分配任务:', record);
+  currentAssignTaskId.value = record.id;
+  selectedUserId.value = '';
+
+  // 打开弹窗时获取用户列表
+  await getUsersList();
+  if (usersList.value.length === 0) {
+    ElMessage.error('无可用维修人员，请先配置维修人员信息');
+    return;
+  }
+  assignDialogVisible.value = true;
+};
+
+// 关闭分配弹窗
+const handleCloseAssignDialog = () => {
+  assignDialogVisible.value = false;
+  selectedUserId.value = '';
+  currentAssignTaskId.value = '';
+};
+
+// 提交分配结果
+const submitAssign = async () => {
+  try {
+    if (!currentAssignTaskId.value) {
+      ElMessage.warning('任务ID不存在');
+      return;
+    }
+
+    if (!selectedUserId.value) {
+      ElMessage.warning('请选择维修人员');
+      return;
+    }
+
+    // 1. 查找当前任务的完整数据
+    const originalTask = repairRecords.value.find((t) => t.id === currentAssignTaskId.value);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      console.error('未找到任务完整数据，任务ID：', currentAssignTaskId.value);
+      return;
+    }
+
+    // 2. 找到选中的维修人员
+    const selectedUser = usersList.value.find((u) => u.id === selectedUserId.value);
+    if (!selectedUser) {
+      ElMessage.error('未找到选中的维修人员');
+      return;
+    }
+
+    // 3. 构造完整的更新参数（与baoxiuguanli保持一致）
+    const updateData = {
+      // 任务基础标识
+      id: currentAssignTaskId.value,
+
+      // 状态流转参数
+      status: '2', // 状态：2=处理中
+      statusText: '处理中',
+
+      // 复用原始任务数据中的所有必要字段
+      name: originalTask.name || '未命名',
+      type: mapRepairType(originalTask.type || 'all'),
+      level: mapPriorityLevel(originalTask.priority || 'medium'),
+      reportName: originalTask.reportName || '',
+      reportPhone: originalTask.reportPhone || '',
+      position: originalTask.position || '',
+      reportInfo: originalTask.reportInfo || '',
+
+      // 维修人员信息
+      sendPerson: selectedUser.id,
+      sendPersonName: selectedUser.name,
+      sendPersonVo: {
+        id: selectedUser.id,
+        userName: selectedUser.name
+      },
+
+      // 其他必要参数
+      pageNum: currentPage.value,
+      pageSize: pageSize.value,
+      projectId: 1
+    };
+
+    const response = await updatebaoxiu(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('任务已分配');
+      assignDialogVisible.value = false;
+      selectedUserId.value = '';
+      currentAssignTaskId.value = '';
+      fetchRepairRecords(); // 刷新列表
+    } else {
+      const errorMsg = response.msg || '未知错误';
+      console.error(`分配任务失败: ${errorMsg}`);
+      ElMessage.error(`分配任务失败：${errorMsg}`);
+    }
+  } catch (error) {
+    console.error('分配任务失败:', error);
+    ElMessage.error('分配失败，请重试');
+  }
+};
+
+// 跟进任务 - 打开弹窗
+const handleFollowTask = (record) => {
+  console.log('跟进任务:', record);
+  currentFollowTaskId.value = record.id;
+  reportFinal.value = '';
+  followDialogVisible.value = true;
+};
+
+// 关闭跟进弹窗
+const handleCloseFollowDialog = () => {
+  followDialogVisible.value = false;
+  reportFinal.value = '';
+  currentFollowTaskId.value = '';
+};
+
+// 提交跟进结果
+const submitFollow = async () => {
+  try {
+    if (!currentFollowTaskId.value) {
+      ElMessage.warning('任务ID不存在');
+      return;
+    }
+
+    if (!reportFinal.value.trim()) {
+      ElMessage.warning('请输入处理结果');
+      return;
+    }
+
+    // 1. 查找当前任务的完整数据
+    const originalTask = repairRecords.value.find((t) => t.id === currentFollowTaskId.value);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      console.error('未找到任务完整数据，任务ID：', currentFollowTaskId.value);
+      return;
+    }
+
+    // 2. 生成当前时间作为完成时间
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, '0');
+    const day = String(now.getDate()).padStart(2, '0');
+    const hours = String(now.getHours()).padStart(2, '0');
+    const minutes = String(now.getMinutes()).padStart(2, '0');
+    const seconds = String(now.getSeconds()).padStart(2, '0');
+    const reportFinishTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+
+    // 3. 构造完整的更新参数（与baoxiuguanli保持一致）
+    const updateData = {
+      // ① 任务基础标识（必传）
+      id: currentFollowTaskId.value, // 任务ID（核心主键）
+
+      // ② 状态流转参数（必传）
+      status: '3', // 状态：3=已完成
+      statusText: '已完成', // 状态文本
+      reportFinal: reportFinal.value, // 处理结果
+      reportFinishTime: reportFinishTime, // 完成时间
+      completeTime: reportFinishTime, // 完成时间（向后兼容字段）
+
+      // ③ 复用原始任务数据中的所有必要字段
+      name: originalTask.name || '未命名', // 任务名称
+      type: mapRepairType(originalTask.type || 'all'), // 任务类型（映射为后端需要的格式）
+      level: mapPriorityLevel(originalTask.priority || 'medium'), // 优先级（映射为后端需要的格式）
+      reportName: originalTask.reportName || '', // 报修人姓名
+      reportPhone: originalTask.reportPhone || '', // 报修人电话
+      position: originalTask.position || '', // 故障位置
+      reportInfo: originalTask.reportInfo || '', // 报修详情
+
+      // ④ 维修人员信息（保留原有分配的维修人员）
+      sendPerson: originalTask.sendPersonVo?.id || '', // 维修人员ID
+      sendPersonName: originalTask.sendPersonVo?.userName || '', // 维修人员姓名
+      sendPersonVo: originalTask.sendPersonVo || {}, // 维修人员完整信息
+
+      // ⑤ 其他必要参数
+      pageNum: currentPage.value, // 分页参数
+      pageSize: pageSize.value,
+      projectId: 1 // 项目ID
+    };
+
+    const response = await updatebaoxiu(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('处理结果已保存');
+      followDialogVisible.value = false;
+      reportFinal.value = '';
+      currentFollowTaskId.value = '';
+      fetchRepairRecords(); // 刷新列表
+    } else {
+      const errorMsg = response.msg || '未知错误';
+      console.error(`保存处理结果失败: ${errorMsg}`);
+      ElMessage.error(`保存处理结果失败：${errorMsg}`);
+    }
+  } catch (error) {
+    console.error('保存处理结果失败:', error);
+    ElMessage.error('保存失败，请重试');
+  }
+};
+
+// 评价任务
+const handleEvaluateTask = (record) => {
+  console.log('评价任务:', record);
+  // 评价任务的逻辑
 };
 
 // 导航事件
@@ -445,28 +981,10 @@ const handleInspection7 = () => {
   flex-shrink: 0;
 }
 
-.search-btn {
-  background-color: #f2f3f5;
-  color: #303133;
-  border-color: #f2f3f5;
-  transition: all 0.2s ease;
-}
-
-.search-btn:hover {
-  background-color: #e5e6eb;
-  color: #303133;
-  border-color: #e5e6eb;
-}
-
+.search-btn,
 .create-btn {
-  background-color: #165dff;
-  border-color: #165dff;
-  transition: all 0.2s ease;
-}
-
-.create-btn:hover {
-  background-color: #0e42d2;
-  border-color: #0e42d2;
+  height: 36px;
+  border-radius: 4px;
 }
 
 /* 统计卡片样式 */
@@ -580,22 +1098,37 @@ const handleInspection7 = () => {
   font-size: 14px;
 }
 
+/* 状态标签样式 - 与其他页面保持一致 */
 .status-tag {
-  padding: 2px 8px;
-  border-radius: 4px;
+  padding: 4px 10px;
+  border-radius: 6px;
   font-size: 12px;
+  font-weight: 500;
 }
 
-.status-tag.processing {
+/* 标签状态类 */
+.tag-pending {
+  background-color: #e6f7ff;
+  color: #1677ff;
+  border: 1px solid #91d5ff;
+}
+
+.tag-executing {
   background-color: #fffbe6;
-  color: #faad14;
-  border: 1px solid #fff1b8;
+  color: #fa8c16;
+  border: 1px solid #ffe58f;
 }
 
-.status-tag.completed {
-  background-color: #f0f9eb;
+.tag-completed {
+  background-color: #f6ffed;
   color: #52c41a;
-  border: 1px solid #e1f3d8;
+  border: 1px solid #b7eb8f;
+}
+
+.tag-delayed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border: 1px solid #ffccc7;
 }
 
 .detail-btn {
@@ -711,4 +1244,190 @@ const handleInspection7 = () => {
     overflow-x: auto;
   }
 }
+
+/* 详情弹窗样式 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+}
+
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
+  font-size: 14px;
+}
+/* 详情弹窗样式 */
+.custom-experiment-dialog {
+  .detail-content {
+    max-height: 60vh;
+    overflow-y: auto;
+    padding-right: 10px;
+  }
+
+  .detail-section {
+    margin-bottom: 24px;
+  }
+
+  .section-title {
+    font-size: 16px;
+    font-weight: 500;
+    color: #303133;
+    margin-bottom: 16px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #f0f2f5;
+  }
+
+  .detail-grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 16px;
+  }
+
+  .detail-item {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .detail-label {
+    font-size: 14px;
+    color: #909399;
+    margin-bottom: 4px;
+  }
+
+  .detail-value {
+    font-size: 14px;
+    color: #303133;
+  }
+
+  .detail-textarea {
+    margin-bottom: 16px;
+  }
+
+  .detail-text {
+    font-size: 14px;
+    color: #303133;
+    line-height: 1.6;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+  }
+
+  /* 多图片展示容器样式 */
+  .images-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16px;
+    margin-top: 12px;
+    padding: 10px;
+    background-color: #f9f9f9;
+    border-radius: 8px;
+  }
+
+  /* 单个图片项样式 */
+  .image-item {
+    flex: 0 0 auto;
+    width: 200px; /* 固定宽度 */
+    height: 160px; /* 固定高度 */
+    border-radius: 6px;
+    overflow: hidden;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+    transition: transform 0.3s ease;
+  }
+
+  .image-item:hover {
+    transform: scale(1.03);
+  }
+
+  /* 图片样式 */
+  .detail-image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover; /* 保持比例填充容器 */
+    display: block;
+  }
+
+  /* 图片加载失败样式 */
+  .detail-image[src=''] {
+    background-color: #f0f0f0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #999;
+    font-size: 12px;
+  }
+
+  .no-info {
+    text-align: center;
+    color: #909399;
+    padding: 40px 0;
+  }
+}
+@media (max-width: 768px) {
+  .custom-experiment-dialog {
+    width: 90% !important;
+
+    .detail-grid {
+      grid-template-columns: 1fr;
+    }
+
+    .info-item {
+      flex: 0 0 100%;
+    }
+
+    .image-item {
+      width: 140px;
+      height: 112px;
+    }
+  }
+}
 </style>
diff --git a/src/views/zhinengxunjian/cheliangzhuangtai.vue b/src/views/zhinengxunjian/cheliangzhuangtai.vue
index d0727bf..20ea098 100644
--- a/src/views/zhinengxunjian/cheliangzhuangtai.vue
+++ b/src/views/zhinengxunjian/cheliangzhuangtai.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="execution-records">
       <!-- 顶部导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,10 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab active" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <!-- 页面标题 -->
-      <TitleComponent title="运维组织模块" subtitle="实时监控人员状态、车辆状态和班组状态"></TitleComponent>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -139,7 +136,6 @@
 <script setup>
 import { ref, computed } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
 
 // 搜索和筛选条件
 const searchKeyword = ref('');
diff --git a/src/views/zhinengxunjian/css/detail-dialog.css b/src/views/zhinengxunjian/css/detail-dialog.css
new file mode 100644
index 0000000..516195f
--- /dev/null
+++ b/src/views/zhinengxunjian/css/detail-dialog.css
@@ -0,0 +1,374 @@
+/* 详情弹窗通用样式 */
+/* 详情卡片样式 */
+.detail-card {
+  margin-bottom: 20px;
+  padding: 20px;
+  background-color: #fafafa;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.card-title {
+  margin: 0 0 16px 0;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.card-content {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+}
+
+.info-item {
+  flex: 1;
+  min-width: 280px;
+}
+
+.info-item.full-width {
+  min-width: 100%;
+}
+
+.info-label {
+  display: inline-block;
+  width: 100px;
+  color: #606266;
+  font-weight: 500;
+}
+
+.info-value {
+  color: #303133;
+  word-break: break-word;
+}
+
+/* 步骤相关样式 - 详情弹窗专用 - 使用外部CSS样式 */
+.task-detail-container .steps-container {
+  width: 100%;
+  padding: 20px;
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  background-color: #fff;
+}
+
+.task-detail-container .step-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  padding: 15px;
+  background-color: #fafafa;
+  border-radius: 6px;
+  position: relative;
+  transition: all 0.3s ease;
+}
+
+.task-detail-container .step-item:hover {
+  background-color: #f5f7fa;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.task-detail-container .step-number {
+  width: 32px;
+  height: 32px;
+  background-color: #409eff;
+  color: white;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16px;
+  font-size: 14px;
+  font-weight: bold;
+  flex-shrink: 0;
+  z-index: 1;
+}
+
+.task-detail-container .step-item:not(:last-child)::after {
+  content: '';
+  position: absolute;
+  top: 50px;
+  left: 16px;
+  width: 2px;
+  height: calc(100% + 5px);
+  background-color: #e4e7ed;
+  z-index: 0;
+}
+
+.task-detail-container .step-info {
+  flex: 1;
+}
+
+.task-detail-container .step-name {
+  font-weight: 500;
+  color: #1d2129;
+  margin-bottom: 4px;
+  font-size: 14px;
+}
+
+.task-detail-container .step-purpose {
+  color: #606266;
+  margin-bottom: 4px;
+  font-size: 13px;
+}
+
+.task-detail-container .step-time,
+.task-detail-container .step-finish-time,
+.task-detail-container .step-remark {
+  color: #909399;
+  font-size: 12px;
+  margin-bottom: 2px;
+}
+
+.task-detail-container .step-status {
+  padding: 4px 12px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-top: 4px;
+}
+
+.step-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.step-name {
+  font-weight: 500;
+  color: #1d2129;
+  margin-bottom: 4px;
+  font-size: 14px;
+}
+
+.step-purpose {
+  color: #606266;
+  margin-bottom: 4px;
+  font-size: 13px;
+}
+
+.step-time,
+.step-finish-time,
+.step-remark {
+  color: #909399;
+  font-size: 12px;
+  margin-bottom: 2px;
+}
+
+/* 步骤状态样式 - 详情弹窗专用 */
+.task-detail-container .step-status {
+  padding: 4px 12px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-top: 4px;
+}
+
+/* 步骤状态样式 - 待执行 */
+.task-detail-container .step-status.status-pending {
+  background-color: #e6f7ff;
+  color: #1677ff;
+  border: 1px solid #91d5ff;
+}
+
+/* 步骤状态样式 - 执行中 */
+.task-detail-container .step-status.status-executing {
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border: 1px solid #ffe58f;
+}
+
+/* 步骤状态样式 - 已完成 */
+.task-detail-container .step-status.status-completed {
+  background-color: #f6ffed;
+  color: #52c41a;
+  border: 1px solid #b7eb8f;
+}
+
+/* 步骤状态样式 - 已延期 */
+.task-detail-container .step-status.status-delayed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border: 1px solid #ffccc7;
+}
+
+/* 通用状态颜色样式 */
+.status-pending {
+  color: #e6a23c;
+}
+
+.status-executing {
+  color: #409eff;
+}
+
+.status-completed {
+  color: #67c23a;
+}
+
+.status-delayed {
+  color: #f56c6c;
+}
+
+.status-unknown {
+  color: #909399;
+}
+
+/* 加载状态样式 */
+.loading-details {
+  padding: 20px 0;
+}
+
+/* 骨架屏加载 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.skeleton-card {
+  background-color: #f2f2f2;
+  border-radius: 8px;
+  padding: 20px;
+  animation: skeleton-loading 1.5s infinite;
+}
+
+.skeleton-header {
+  height: 24px;
+  width: 140px;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 16px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.skeleton-row {
+  height: 20px;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+.skeleton-row:nth-child(1) {
+  width: 70%;
+}
+
+.skeleton-row:nth-child(2) {
+  width: 90%;
+}
+
+.skeleton-row:nth-child(3) {
+  width: 60%;
+}
+
+@keyframes skeleton-loading {
+  0% {
+    opacity: 0.6;
+  }
+  50% {
+    opacity: 0.3;
+  }
+  100% {
+    opacity: 0.6;
+  }
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .info-item {
+    min-width: 100%;
+  }
+
+  .info-row {
+    gap: 12px;
+  }
+
+  /* 步骤条响应式设计 */
+  .task-detail-container .steps-container {
+    padding: 10px;
+  }
+
+  .task-detail-container .step-item {
+    flex-direction: column;
+    align-items: flex-start;
+    padding: 10px;
+    margin-bottom: 10px;
+  }
+
+  .task-detail-container .step-item > * {
+    width: 100%;
+    margin-bottom: 10px;
+    margin-right: 0 !important;
+  }
+
+  .task-detail-container .step-number {
+    margin-bottom: 10px;
+    width: 24px;
+    height: 24px;
+    font-size: 12px;
+  }
+
+  .task-detail-container .step-item:not(:last-child)::after {
+    display: none;
+  }
+}
+
+/* 弹窗按钮样式 */
+.dialog-footer .el-button {
+  padding: 10px 24px;
+  border-radius: 6px;
+  font-size: 14px;
+  font-weight: 500;
+  transition: all 0.3s ease;
+}
+
+.dialog-footer .el-button:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
+}
+
+/* 其他相关样式 */
+.fail-reason {
+  color: #f56c6c;
+}
+
+.no-info {
+  color: #909399;
+  font-style: italic;
+  padding: 10px 0;
+}
+
+.loading-state {
+  text-align: center;
+  padding: 80px 20px;
+  color: #6c757d;
+  font-size: 14px;
+}
+
+.loading-state i {
+  display: block;
+  font-size: 48px;
+  margin-bottom: 16px;
+  color: #1677ff;
+}
+
+.step-content {
+  padding: 30px 20px;
+  background-color: #fafafa;
+  border-radius: 8px;
+  margin-top: 20px;
+}
diff --git a/src/views/zhinengxunjian/css/step-bars.css b/src/views/zhinengxunjian/css/step-bars.css
new file mode 100644
index 0000000..c4a8f14
--- /dev/null
+++ b/src/views/zhinengxunjian/css/step-bars.css
@@ -0,0 +1,206 @@
+/* 步骤容器样式 */
+.steps-container {
+  width: 100%;
+  padding: 20px;
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  background-color: #fff;
+}
+
+/* 单个步骤项样式 */
+.step-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  padding: 15px;
+  background-color: #fafafa;
+  border-radius: 6px;
+  position: relative;
+  transition: all 0.3s ease;
+}
+
+/* 步骤项悬停效果 */
+.step-item:hover {
+  background-color: #f5f7fa;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+/* 步骤序号样式 */
+.step-number {
+  width: 32px;
+  height: 32px;
+  background-color: #409eff;
+  color: white;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16px;
+  font-size: 14px;
+  font-weight: bold;
+  flex-shrink: 0;
+  z-index: 1;
+}
+
+/* 步骤连接线样式 */
+.step-item:not(:last-child)::after {
+  content: '';
+  position: absolute;
+  top: 50px;
+  left: 16px;
+  width: 2px;
+  height: calc(100% + 5px);
+  background-color: #e4e7ed;
+  z-index: 0;
+}
+
+/* 步骤内容样式 */
+.step-content {
+  padding: 30px 20px;
+  background-color: #fafafa;
+  border-radius: 8px;
+  margin-top: 20px;
+}
+
+/* 步骤信息样式 */
+.step-info {
+  flex: 1;
+}
+
+/* 步骤名称样式 */
+.step-name {
+  font-weight: 500;
+  color: #1d2129;
+  margin-bottom: 4px;
+  font-size: 14px;
+}
+
+/* 步骤目的样式 */
+.step-purpose {
+  color: #606266;
+  margin-bottom: 4px;
+  font-size: 13px;
+}
+
+/* 步骤时间样式 */
+.step-time,
+.step-finish-time,
+.step-remark {
+  color: #909399;
+  font-size: 12px;
+  margin-bottom: 2px;
+}
+
+/* 添加步骤按钮样式 */
+.add-step-btn {
+  color: #409eff;
+  display: block;
+  margin: 15px auto 0;
+  padding: 8px 16px;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+}
+
+.add-step-btn:hover {
+  color: #66b1ff;
+  background-color: #ecf5ff;
+}
+
+/* 删除步骤按钮样式 */
+.delete-step-btn {
+  color: #f56c6c;
+  flex-shrink: 0;
+}
+
+.delete-step-btn:hover {
+  color: #ff8590;
+  background-color: #fef0f0;
+}
+
+/* 步骤状态标签样式 */
+.step-status {
+  padding: 4px 12px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-top: 4px;
+}
+
+/* 步骤状态样式 - 待执行 */
+.step-status.status-pending {
+  background-color: #e6f7ff;
+  color: #1677ff;
+  border: 1px solid #91d5ff;
+}
+
+/* 步骤状态样式 - 执行中 */
+.step-status.status-executing {
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border: 1px solid #ffe58f;
+}
+
+/* 步骤状态样式 - 已完成 */
+.step-status.status-completed {
+  background-color: #f6ffed;
+  color: #52c41a;
+  border: 1px solid #b7eb8f;
+}
+
+/* 步骤状态样式 - 已延期 */
+.step-status.status-delayed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border: 1px solid #ffccc7;
+}
+
+/* 响应式设计 - 中等屏幕 */
+@media (max-width: 1024px) {
+  .steps-container {
+    padding: 15px;
+  }
+
+  .step-item {
+    padding: 12px;
+    margin-bottom: 12px;
+  }
+
+  .step-number {
+    width: 28px;
+    height: 28px;
+    font-size: 13px;
+    margin-right: 12px;
+  }
+}
+
+/* 响应式设计 - 小屏幕 */
+@media (max-width: 768px) {
+  .steps-container {
+    padding: 10px;
+  }
+
+  .step-item {
+    flex-direction: column;
+    align-items: flex-start;
+    padding: 10px;
+    margin-bottom: 10px;
+  }
+
+  .step-item > * {
+    width: 100%;
+    margin-bottom: 10px;
+    margin-right: 0 !important;
+  }
+
+  .step-number {
+    margin-bottom: 10px;
+    width: 24px;
+    height: 24px;
+    font-size: 12px;
+  }
+
+  .step-item:not(:last-child)::after {
+    display: none;
+  }
+}
diff --git a/src/views/zhinengxunjian/gongdanliebiao.vue b/src/views/zhinengxunjian/gongdanliebiao.vue
index 9ba0d24..efee07c 100644
--- a/src/views/zhinengxunjian/gongdanliebiao.vue
+++ b/src/views/zhinengxunjian/gongdanliebiao.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="work-order-management">
       <!-- 顶部导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,10 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab active" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <!-- 页面标题 -->
-      <TitleComponent title="工单管理模块" subtitle="发起工单任务，跟踪流程记录和执行情况"></TitleComponent>
+      </div> -->
 
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -55,8 +52,8 @@
             <el-date-picker v-model="createDate" type="date" placeholder="创建日期" format="yyyy/MM/dd" value-format="yyyy/MM/dd"></el-date-picker>
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch">搜索</el-button>
-            <el-button type="primary" class="create-btn" @click="handleCreateWorkOrder">发起工单任务</el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch">搜索</el-button>
+            <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateWorkOrder">发起工单任务</el-button>
           </div>
         </div>
       </div>
@@ -92,19 +89,45 @@
           </el-table-column>
           <el-table-column align="center" label="操作" min-width="180" fixed="right">
             <template #default="scope">
-              <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">查看详情</el-button>
-              <el-button type="text" @click="handleEvaluate(scope.row)" class="action-btn">评价</el-button>
-              <el-button
-                type="text"
-                @click="handleCancel(scope.row)"
-                size="small"
-                class="action-btn cancel-btn"
-                v-if="['已接单', '待处理'].includes(scope.row.status)"
-              >
-                取消
-              </el-button>
-              <el-button type="text" @click="handleCommunicate(scope.row)" class="action-btn" v-if="scope.row.status === '执行中'"> 沟通 </el-button>
-              <el-button type="text" @click="handleArchive(scope.row)" class="action-btn" v-if="scope.row.status === '已完成'"> 归档 </el-button>
+              <!-- 已接单状态 -->
+              <template v-if="scope.row.status === '已接单'">
+                <el-button type="text" @click="handleFollow(scope.row)" class="action-btn">跟踪</el-button>
+                <el-button type="text" @click="handleCancel(scope.row)" class="action-btn cancel-btn">删除</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 已派单状态 -->
+              <template v-else-if="scope.row.status === '已派单'">
+                <el-button type="text" @click="handleSetTrack(scope.row)" class="action-btn">
+                  {{ scope.row.point === '1' ? '取消跟踪' : '跟踪' }}
+                </el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 待派单状态 -->
+              <template v-else-if="scope.row.status === '待派单'">
+                <el-button type="text" @click="handleAssign(scope.row)" class="action-btn">派单</el-button>
+                <el-button type="text" @click="handleEdit(scope.row)" class="action-btn">编辑</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 执行中状态 -->
+              <template v-else-if="scope.row.status === '执行中'">
+                <el-button type="text" @click="handleCommunicate(scope.row)" class="action-btn">沟通</el-button>
+                <el-button type="text" @click="handleViewProgress(scope.row)" class="action-btn">查看进度</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 已完成状态 -->
+              <template v-else-if="scope.row.status === '已完成'">
+                <el-button type="text" @click="handleArchive(scope.row)" class="action-btn">归档</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 默认显示 -->
+              <template v-else>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">查看详情</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -159,7 +182,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="截止时间*" prop="deadline">
-                <el-date-picker v-model="createForm.deadline" type="date" placeholder="yyyy/mm/日" format="yyyy/MM/dd" value-format="yyyy/MM/dd" />
+                <el-date-picker v-model="createForm.deadline" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -176,25 +199,38 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="相关设备/系统">
-                <el-select v-model="createForm.relatedEquipment" placeholder="请填写相关设备或系统名称" filterable allow-create>
-                  <el-option label="设备A" value="设备A" />
-                  <el-option label="设备B" value="设备B" />
-                  <el-option label="系统1" value="系统1" />
-                </el-select>
+                <el-input v-model="createForm.relatedEquipment" placeholder="请输入相关设备或系统名称" />
               </el-form-item>
             </el-col>
           </el-row>
-
-          <el-form-item label="上传图片">
-            <div class="upload-container">
-              <div class="upload-box">
-                <i class="el-icon-upload avatar-uploader-icon"></i>
-                <div class="upload-text">点击或拖拽文件至此处上传</div>
-                <div class="upload-hint">支持PDF、Word、Excel、图片等格式，最大50MB</div>
+          <el-form-item label="工单步骤" class="form-item" style="width: 100%">
+            <div class="steps-container">
+              <div class="step-item" v-for="(step, index) in createForm.steps" :key="index">
+                <div class="step-number">{{ index + 1 }}</div>
+                <el-input v-model="step.name" placeholder="输入步骤名称" style="flex: 1; margin-right: 10px" />
+                <el-input v-model="step.intendedPurpose" placeholder="输入预期目的" style="flex: 1; margin-right: 10px" />
+                <el-date-picker
+                  v-model="step.intendedTime"
+                  type="datetime"
+                  placeholder="选择计划时间"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                  style="width: 180px; margin-right: 10px"
+                />
+                <el-button v-if="createForm.steps.length > 1" type="text" class="delete-step-btn" @click="deleteStep(index)" style="color: #f56c6c">
+                  删除
+                </el-button>
               </div>
+              <el-button type="text" class="add-step-btn" @click="addStep">添加步骤</el-button>
             </div>
           </el-form-item>
+          <el-form-item label="上传图片(可选)" width="100%" prop="file">
+            <image-upload v-model="createForm.file" />
 
+            <div v-if="createForm.fileList && createForm.fileList.length > 0" class="upload-tip">
+              <span style="color: #1989fa">已选择{{ createForm.fileList.length }}张图片，将在提交时上传</span>
+            </div>
+          </el-form-item>
           <el-form-item label="工单描述">
             <el-input v-model="createForm.resultDescription" type="textarea" :rows="3" placeholder="请描述该工单完成后预期达成的成果" />
           </el-form-item>
@@ -205,14 +241,6 @@
               <el-radio label="false">否，由系统分配</el-radio>
             </el-radio-group>
           </el-form-item>
-
-          <el-form-item label="选择执行人" prop="assignee" v-if="createForm.needAssignee === 'true'">
-            <el-select v-model="createForm.assignee" placeholder="请选择执行人">
-              <el-option label="李阳" value="李阳" />
-              <el-option label="张工" value="张工" />
-              <el-option label="王工" value="王工" />
-            </el-select>
-          </el-form-item>
         </el-form>
 
         <template #footer>
@@ -223,6 +251,199 @@
           </span>
         </template>
       </el-dialog>
+
+      <!-- 工单详情弹窗 -->
+      <el-dialog
+        v-model="detailDialogVisible"
+        title="工单详情"
+        width="800px"
+        :before-close="handleCloseDetailDialog"
+        class="custom-experiment-dialog"
+      >
+        <div v-if="isDetailLoading" class="skeleton-loading">
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+        </div>
+
+        <div v-else-if="detailData" class="task-detail-container">
+          <!-- 基础信息区 -->
+          <div class="detail-card">
+            <h3 class="card-title">基础信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">工单编号：</span>
+                  <span class="info-value">WO-{{ detailData.id }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">工单标题：</span>
+                  <span class="info-value">{{ detailData.title }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">工单类型：</span>
+                  <span class="info-value">{{ mapCodeToType(detailData.type) }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">优先级：</span>
+                  <span class="info-value task-status priority-{{ mapPriorityToClass(detailData.level) }}">{{
+                    mapCodeToPriority(detailData.level)
+                  }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">创建人：</span>
+                  <span class="info-value">{{ detailData.sendOrderPersonVo?.userName || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">创建时间：</span>
+                  <span class="info-value">{{ detailData.createTime ? formatDate(detailData.createTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="detail-label">执行人：</span>
+                  <span class="detail-value">{{ detailData.getOrderPersonVo?.userName || '-' }}</span>
+                </div>
+                <div class="detail-item">
+                  <span class="detail-label">接单时间：</span>
+                  <span class="detail-value">{{ detailData.getOrderTime ? formatDate(detailData.getOrderTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="detail-item">
+                  <span class="detail-label">截止时间：</span>
+                  <span class="detail-value">{{ detailData.endTime ? formatDate(detailData.endTime) : '-' }}</span>
+                </div>
+                <div class="detail-item">
+                  <span class="detail-label">完成时间：</span>
+                  <span class="detail-value">{{ detailData.finishiOrderTime ? formatDate(detailData.finishiOrderTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="detail-item">
+                  <span class="detail-label">执行地点：</span>
+                  <span class="detail-value">{{ detailData.position || '-' }}</span>
+                </div>
+                <div class="detail-item">
+                  <span class="detail-label">相关设备：</span>
+                  <span class="detail-value">{{ detailData.device || '-' }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 工单描述 -->
+          <div class="detail-card">
+            <h3 class="card-title">工单描述</h3>
+            <div class="card-content">
+              <div class="description-content">
+                {{ detailData.info || '无描述信息' }}
+              </div>
+            </div>
+          </div>
+
+          <!-- 步骤条 -->
+          <div v-if="detailData.nodes && detailData.nodes.length > 0" class="detail-card">
+            <h3 class="card-title">执行步骤</h3>
+            <div class="steps-container">
+              <div v-for="(node, index) in detailData.nodes" :key="node.id || index" class="step-item">
+                <div class="step-number">{{ node.code || index + 1 }}</div>
+                <div class="step-info">
+                  <div class="step-name">{{ node.name || '未命名步骤' }}</div>
+                  <div class="step-purpose">{{ node.intendedPurpose || '无说明' }}</div>
+                  <div class="step-time">计划时间：{{ formatDateTime(node.intendedTime) }}</div>
+                  <div v-if="node.finishTime" class="step-finish-time">完成时间：{{ formatDateTime(node.finishTime) }}</div>
+                  <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
+                </div>
+                <div class="step-status" :class="getStatusClass(node.status)">
+                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 图片展示区 -->
+          <div v-if="detailData.fileUrl" class="detail-card">
+            <h3 class="card-title">故障图片</h3>
+            <div class="card-content">
+              <div class="images-container">
+                <!-- 将逗号分隔的URL字符串拆分为数组并循环展示 -->
+                <div v-for="(url, index) in splitImageUrls(detailData.fileUrl)" :key="index" class="image-item">
+                  <img
+                    :src="url"
+                    :alt="`故障图片 ${index + 1}`"
+                    class="detail-image"
+                    @error="handleImageError($event, index)"
+                    style="max-width: 100%; max-height: 200px; border-radius: 4px"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 工单结果 -->
+          <div v-if="detailData.orderResult" class="detail-card">
+            <h3 class="card-title">工单结果</h3>
+            <div class="card-content">
+              <div class="result-content">
+                {{ detailData.orderResult }}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div v-else class="empty-state">
+          <p>暂无工单详情数据</p>
+        </div>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="closeDetailDialog">关闭</el-button>
+          </span>
+        </template>
+      </el-dialog>
+
+      <!-- 派单弹窗 -->
+      <el-dialog v-model="assignDialogVisible" title="派单" width="400px" :before-close="cancelAssign">
+        <div class="assign-dialog-content">
+          <div class="form-group">
+            <label class="form-label">选择执行人:</label>
+            <el-select v-model="selectedExecutor" placeholder="请选择执行人" style="width: 100%" :loading="loadingUsers" filterable>
+              <el-option v-for="item in executors" :key="item.userId" :label="item.userName" :value="item.userId" />
+            </el-select>
+          </div>
+        </div>
+
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button @click="cancelAssign">取消</el-button>
+            <el-button type="primary" @click="confirmAssign" :loading="assignLoading">确定</el-button>
+          </div>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -230,7 +451,11 @@
 <script setup>
 import { ref, computed, reactive } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
+import { gongdanlist, addgongdan, updategongdan, gongdanDetail } from '@/api/zhinengxunjian/gongdan/index';
+import { addjiedian, updatejiedian } from '@/api/zhinengxunjian/jiedian';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
+import ImageUpload from '@/components/ImageUpload/index.vue';
+import { ElMessageBox } from 'element-plus';
 
 // 激活的选项卡
 const activeTab = ref('list');
@@ -241,143 +466,155 @@ const workOrderStatus = ref('all');
 const priority = ref('all');
 const createDate = ref('');
 
+// 优先级转类名
+const mapPriorityToClass = (priority) => {
+  const priorityMap = {
+    1: 'high',
+    2: 'medium',
+    3: 'low'
+  };
+  return priorityMap[priority] || 'low';
+};
+
 // 工单数据
-const rawTableData = ref([
-  {
-    orderNo: 'WO-2023-0620-056',
-    description: '季度设备维护保养',
-    type: '维护保养',
-    priority: '高',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '已接单'
-  },
-  {
-    orderNo: 'WO-2023-0620-057',
-    description: '安全设备检查检测',
-    type: '检查检测',
-    priority: '中',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '待处理'
-  },
-  {
-    orderNo: 'WO-2023-0620-058',
-    description: '新设备安装调试',
-    type: '安装调试',
-    priority: '高',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '执行中'
-  },
-  {
-    orderNo: 'WO-2023-0620-059',
-    description: '系统升级改造',
-    type: '升级改造',
-    priority: '中',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '已完成'
-  },
-  {
-    orderNo: 'WO-2023-0620-060',
-    description: '季度设备维护保养',
-    type: '维护保养',
-    priority: '高',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '已接单'
-  },
-  {
-    orderNo: 'WO-2023-0620-061',
-    description: '季度设备维护保养',
-    type: '维护保养',
-    priority: '高',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '已接单'
-  },
-  {
-    orderNo: 'WO-2023-0620-062',
-    description: '网络设备检查',
-    type: '检查检测',
-    priority: '中',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '待处理'
-  },
-  {
-    orderNo: 'WO-2023-0620-063',
-    description: '服务器升级',
-    type: '升级改造',
-    priority: '高',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '执行中'
-  },
-  {
-    orderNo: 'WO-2023-0620-064',
-    description: '空调维护',
-    type: '维护保养',
-    priority: '低',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '已完成'
-  },
-  {
-    orderNo: 'WO-2023-0620-065',
-    description: 'UPS设备检测',
-    type: '检查检测',
-    priority: '中',
-    creator: '李阳',
-    createTime: '2023-06-20 09:30',
-    deadline: '2023-06-30 17:00',
-    status: '已接单'
-  }
-]);
+const rawTableData = ref([]);
 
 // 分页相关
 const currentPage = ref(1);
 const pageSize = ref(10);
-const total = ref(rawTableData.value.length);
+const total = ref(0);
+
+// 获取工单列表数据
+const fetchWorkOrderList = async () => {
+  try {
+    const params = {
+      projectId: 1,
+      pageNum: currentPage.value,
+      pageSize: pageSize.value
+    };
+
+    const response = await gongdanlist(params);
+
+    if (response.code === 200 && response.rows) {
+      // 处理返回的数据，转换为表格需要的格式
+      rawTableData.value = response.rows.map((item) => ({
+        id: item.id,
+        projectId: item.projectId,
+        orderNo: `WO-${item.id}`, // 生成工单编号
+        title: item.title || '',
+        description: item.info || '',
+        type: mapCodeToType(item.type),
+        priority: mapCodeToPriority(item.level),
+        creator: item.sendOrderPersonVo?.userName || '',
+        createTime: item.createTime ? formatDate(item.createTime) : item.sendOrderTime ? formatDate(item.sendOrderTime) : '',
+        deadline: item.endTime ? formatDate(item.endTime) : '',
+        status: mapCodeToStatus(item.status),
+        executor: item.getOrderPersonVo?.userName || '',
+        getOrderTime: item.getOrderTime ? formatDate(item.getOrderTime) : '',
+        finishiOrderTime: item.finishiOrderTime ? formatDate(item.finishiOrderTime) : '',
+        position: item.position || '',
+        device: item.device || ''
+      }));
+
+      // 更新总条数
+      total.value = response.total || 0;
+    }
+  } catch (error) {
+    console.error('获取工单列表失败:', error);
+  }
+};
+
+// 类型映射函数 - 页面类型转接口code
+const mapTypeToCode = (type) => {
+  const typeMap = {
+    '维护保养': 1,
+    '检查检测': 2,
+    '安装调试': 3,
+    '升级改造': 4
+  };
+  return typeMap[type] || null;
+};
+
+// 类型映射函数 - 接口code转页面类型
+const mapCodeToType = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const typeMap = {
+    '1': '维护保养',
+    '2': '检查检测',
+    '3': '安装调试',
+    '4': '升级改造'
+  };
+  return typeMap[codeStr] || code;
+};
+
+// 状态映射函数 - 页面状态转接口code
+const mapStatusToCode = (status) => {
+  const statusMap = {
+    '待派单': 1,
+    '已派单': 2,
+    '执行中': 3,
+    '已完成': 4
+  };
+  return statusMap[status] || null;
+};
+
+// 状态映射函数 - 接口code转页面状态
+const mapCodeToStatus = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const statusMap = {
+    '1': '待派单',
+    '2': '已派单',
+    '3': '执行中',
+    '4': '已完成'
+  };
+  return statusMap[codeStr] || code;
+};
+
+// 优先级映射函数 - 页面优先级转接口code
+const mapPriorityToCode = (priority) => {
+  const priorityMap = {
+    '高': 3,
+    '中': 2,
+    '低': 1
+  };
+  return priorityMap[priority] || null;
+};
+
+// 优先级映射函数 - 接口code转页面优先级
+const mapCodeToPriority = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const priorityMap = {
+    '1': '低',
+    '2': '中',
+    '3': '高'
+  };
+  return priorityMap[codeStr] || code;
+};
+
+// 日期格式化函数 - 支持datetime格式
+const formatDate = (dateString) => {
+  if (!dateString) return '';
+  const date = new Date(dateString);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+
+  // 返回与datetime选择器value-format一致的格式
+  return `${year}/${month}/${day} ${hours}:${minutes}`;
+};
+
+// 初始化加载数据
+fetchWorkOrderList();
 
 // 分页处理后的数据
 const pagedTableData = computed(() => {
-  // 筛选逻辑
-  let filteredData = [...rawTableData.value];
-
-  if (workOrderType.value !== 'all') {
-    filteredData = filteredData.filter((item) => item.type === workOrderType.value);
-  }
-
-  if (workOrderStatus.value !== 'all') {
-    filteredData = filteredData.filter((item) => item.status === workOrderStatus.value);
-  }
-
-  if (priority.value !== 'all') {
-    filteredData = filteredData.filter((item) => item.priority === priority.value);
-  }
-
-  if (createDate.value) {
-    filteredData = filteredData.filter((item) => item.createTime.includes(createDate.value));
-  }
-
-  // 更新总条数
-  total.value = filteredData.length;
-
-  // 分页处理
-  const startIndex = (currentPage.value - 1) * pageSize.value;
-  const endIndex = startIndex + pageSize.value;
-  return filteredData.slice(startIndex, endIndex);
+  // 由于接口已经处理了分页和筛选，这里直接返回全部数据
+  return rawTableData.value;
 });
 
 // 获取类型标签样式
@@ -405,30 +642,74 @@ const getPriorityTagType = (priority) => {
   return priorityMap[priority] || 'default';
 };
 
-// 获取状态标签样式
+// 状态标签样式
 const getStatusTagType = (status) => {
   const statusMap = {
     '已接单': 'primary',
     '待处理': 'warning',
+    '待派单': 'warning',
     '执行中': 'success',
     '已完成': 'info'
   };
   return statusMap[status] || 'default';
 };
 
-// 搜索处理
+// 根据步骤状态获取对应的样式类
+const getStatusClass = (status) => {
+  // 处理可能的数字输入
+  const statusStr = status?.toString() || '';
+  const statusClassMap = {
+    '1': 'status-pending',
+    '2': 'status-delayed',
+    '3': 'status-executing',
+    '4': 'status-completed'
+  };
+  return statusClassMap[statusStr] || 'status-unknown';
+};
+
+// 格式化日期时间（用于步骤条）
+const formatDateTime = (dateTime) => {
+  if (!dateTime) return '-';
+  try {
+    const date = new Date(dateTime);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } catch (error) {
+    return dateTime;
+  }
+};
+
+// 获取步骤状态文本
+const getStepStatusText = (status) => {
+  const statusStr = status?.toString() || '';
+  const statusMap = {
+    '1': '待执行',
+    '2': '执行中',
+    '3': '已完成',
+    '4': '已延期'
+  };
+  return statusMap[statusStr] || '未知状态';
+};
+
 const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
+  fetchWorkOrderList(); // 重新获取数据
 };
 
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
   currentPage.value = 1;
+  fetchWorkOrderList(); // 重新获取数据
 };
 
 const handleCurrentChange = (val) => {
   currentPage.value = val;
+  fetchWorkOrderList(); // 重新获取数据
 };
 
 // 选项卡点击
@@ -443,8 +724,65 @@ const handleTabClick = (tab) => {
 };
 
 // 操作按钮事件
-const handleViewDetail = (row) => {
-  console.log('查看详情:', row);
+const handleViewDetail = async (row) => {
+  try {
+    isDetailLoading.value = true;
+    const response = await gongdanDetail(row.id);
+    if (response.code === 200 && response.data) {
+      detailData.value = response.data;
+      detailDialogVisible.value = true;
+    } else {
+      ElMessageBox.alert('获取工单详情失败', '提示', {
+        confirmButtonText: '确定',
+        type: 'error'
+      });
+    }
+  } catch (error) {
+    console.error('获取工单详情错误:', error);
+    ElMessageBox.alert('获取工单详情时发生错误', '错误', {
+      confirmButtonText: '确定',
+      type: 'error'
+    });
+  } finally {
+    isDetailLoading.value = false;
+  }
+};
+
+// 关闭详情弹窗
+const closeDetailDialog = () => {
+  detailDialogVisible.value = false;
+  detailData.value = null;
+};
+
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const isDetailLoading = ref(false);
+
+// 分割图片URL
+const splitImageUrls = (fileUrl) => {
+  if (!fileUrl) return [];
+  return fileUrl.split(',').filter((url) => url.trim());
+};
+
+// 根据module分组nodes
+const groupNodesByModule = (nodes) => {
+  if (!nodes || !Array.isArray(nodes)) return [];
+  const moduleMap = new Map();
+
+  nodes.forEach((node) => {
+    const module = node.module || '默认模块';
+    if (!moduleMap.has(module)) {
+      moduleMap.set(module, []);
+    }
+    moduleMap.get(module).push(node);
+  });
+
+  // 转换为数组并排序
+  return Array.from(moduleMap.entries()).map(([module, items]) => ({
+    module,
+    items: items.sort((a, b) => (a.code || 0) - (b.code || 0))
+  }));
 };
 
 const handleEvaluate = (row) => {
@@ -457,12 +795,260 @@ const handleCancel = (row) => {
 
 const handleCommunicate = (row) => {
   console.log('沟通:', row);
+  // 这里可以实现沟通功能，例如打开沟通弹窗或跳转到沟通页面
 };
 
 const handleArchive = (row) => {
   console.log('归档:', row);
 };
 
+// 派单弹窗相关状态
+const assignDialogVisible = ref(false);
+const assignLoading = ref(false);
+const currentTaskId = ref('');
+const currentTaskInfo = ref(null); // 存储当前工单的完整信息
+const selectedExecutor = ref('');
+const executors = ref([]);
+const loadingUsers = ref(false);
+
+// 派单功能
+const handleAssign = async (row) => {
+  console.log('派单:', row);
+  currentTaskId.value = row.id;
+  currentTaskInfo.value = row; // 保存完整的工单信息
+  selectedExecutor.value = '';
+
+  try {
+    // 调用xunjianUserlist接口获取用户列表
+    loadingUsers.value = true;
+    const res = await xunjianUserlist();
+    if (res && res.code === 200 && res.rows && Array.isArray(res.rows)) {
+      // 过滤有效用户并格式化数据
+      executors.value = res.rows
+        .filter((user) => user.userId && user.userName)
+        .map((user) => ({
+          userId: user.userId.toString(),
+          userName: user.userName
+        }));
+    } else {
+      ElMessage.error('获取用户列表失败');
+    }
+  } catch (error) {
+    console.error('获取用户列表异常:', error);
+    ElMessage.error('获取用户列表失败，请稍后重试');
+  } finally {
+    loadingUsers.value = false;
+  }
+
+  // 打开派单弹窗
+  assignDialogVisible.value = true;
+};
+
+// 确认派单
+const confirmAssign = async () => {
+  if (!selectedExecutor.value) {
+    ElMessage.warning('请选择执行人');
+    return;
+  }
+
+  try {
+    assignLoading.value = true;
+    // 调用updategongdan接口来执行派单操作
+    // 从执行人列表中查找选中的执行人信息
+    const selectedExecutorInfo = executors.value.find((item) => item.userId === selectedExecutor.value);
+
+    // 先获取完整的工单详情，确保有所有必要字段（
+    const detailResponse = await gongdanDetail(currentTaskId.value);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+
+    // 获取完整的工单数据
+    const workOrderDetail = detailResponse.data;
+
+    // 在完整工单数据基础上进行修改（与编辑弹窗一样的方式）
+    const updateData = {
+      ...workOrderDetail,
+      // 状态更新为已派单（根据系统状态映射，2表示已派单）
+      status: 2,
+      // 设置执行人ID
+      handler: selectedExecutor.value,
+      // 设置执行人姓名
+      handlerName: selectedExecutorInfo?.userName || '',
+      // 设置派单人ID（根据qiangxiujilu.vue的实现，同时提供getOrderPerson和sendPerson两个字段）
+      getOrderPerson: selectedExecutor.value,
+      sendPerson: selectedExecutor.value,
+      // 设置派单人Vo对象（包含id和userName）
+      getOrderPersonVo: selectedExecutorInfo
+        ? {
+            id: selectedExecutor.value,
+            userName: selectedExecutorInfo.userName
+          }
+        : null,
+      // 更新时间
+      updateTime: new Date().toISOString(),
+      // 根据用户要求，在派单时设置派单时间
+      sendOrderTime: new Date().toISOString(),
+      // 确保类型字段正确
+      type: workOrderDetail.type || 1
+    };
+
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('派单成功');
+      assignDialogVisible.value = false;
+
+      // 刷新工单列表以显示更新后的状态
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error(response.msg || '派单失败');
+    }
+  } catch (error) {
+    console.error('派单异常:', error);
+    ElMessage.error('派单失败，请稍后重试');
+  } finally {
+    assignLoading.value = false;
+  }
+};
+
+// 取消派单
+const cancelAssign = () => {
+  assignDialogVisible.value = false;
+  selectedExecutor.value = '';
+  currentTaskId.value = '';
+};
+
+// 跟踪功能 - 已接单状态
+const handleFollow = (row) => {
+  console.log('跟踪:', row);
+  // 这里可以实现跟踪功能，例如显示工单跟踪记录或打开跟踪记录页面
+};
+
+// 设置跟踪功能 - 已派单状态
+const handleSetTrack = async (row) => {
+  try {
+    // 获取当前point值，默认为2（不跟踪）
+    const currentPoint = row.point || '2';
+    // 确定新的point值和操作类型
+    const newPoint = currentPoint === '1' ? '2' : '1';
+    const operationText = currentPoint === '1' ? '取消跟踪' : '设置跟踪';
+
+    // 弹出确认对话框
+    await ElMessageBox.confirm(`确定要${operationText}该工单吗？`, '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+
+    // 获取完整的工单详情
+    const detailResponse = await gongdanDetail(row.id);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+
+    // 获取完整的工单数据
+    const workOrderDetail = detailResponse.data;
+
+    // 在完整工单数据基础上进行修改
+    const updateData = {
+      ...workOrderDetail,
+      // 切换point值：1表示跟踪，2表示不跟踪
+      point: newPoint,
+      // 更新时间
+      updateTime: new Date().toISOString()
+    };
+
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success(`${operationText}成功`);
+      // 刷新工单列表以显示更新后的状态
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error(response.msg || `${operationText}失败`);
+    }
+  } catch (error) {
+    if (error === 'cancel') {
+      // 用户取消操作，不做处理
+      return;
+    }
+    console.error('设置跟踪异常:', error);
+    ElMessage.error('设置跟踪失败，请稍后重试');
+  }
+};
+
+// 编辑工单
+const handleEdit = async (row) => {
+  console.log('编辑工单:', row);
+  try {
+    // 获取工单详情
+    const detailResponse = await gongdanDetail(row.id);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+    const workOrderDetail = detailResponse.data;
+
+    // 填充表单数据（与新增工单使用同一套表单）
+    createForm.title = workOrderDetail.title || '';
+    createForm.type = mapCodeToType(workOrderDetail.type) || '维护保养';
+    createForm.priority = mapCodeToPriority(workOrderDetail.level) || '低';
+    createForm.deadline = workOrderDetail.endTime ? formatDate(workOrderDetail.endTime) : '';
+    createForm.description = workOrderDetail.info || '';
+    createForm.location = workOrderDetail.position || '';
+    createForm.relatedEquipment = workOrderDetail.device || '';
+    createForm.file = workOrderDetail.fileId || '';
+    createForm.resultDescription = workOrderDetail.results || '';
+    createForm.needAssignee = !!workOrderDetail.executor;
+
+    // 填充步骤数据：从nodes数组中提取并按code排序
+    if (workOrderDetail.nodes && Array.isArray(workOrderDetail.nodes)) {
+      // 复制nodes数组并按code升序排序（与groupNodesByModule函数保持一致的排序逻辑）
+      const sortedNodes = [...workOrderDetail.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+      // 转换为createForm.steps所需的格式
+      createForm.steps = sortedNodes.map((node) => ({
+        name: node.name || '',
+        intendedPurpose: node.intendedPurpose || '',
+        intendedTime: node.intendedTime || ''
+      }));
+      // 确保至少有一个空步骤
+      if (createForm.steps.length === 0) {
+        createForm.steps = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+      }
+    } else {
+      // 如果没有nodes数据，重置为默认的一个空步骤
+      createForm.steps = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+    }
+
+    // 存储当前编辑的工单ID，用于区分是创建还是编辑操作
+    editingWorkOrderId.value = row.id;
+
+    // 保存原始创建时间
+    originalCreateTime.value = workOrderDetail.createTime || '';
+
+    // 打开新增工单的弹窗
+    createDialogVisible.value = true;
+  } catch (error) {
+    console.error('打开编辑工单弹窗过程中发生错误:', error);
+    ElMessage.error('打开编辑工单弹窗失败');
+  }
+};
+
+// 编辑状态下的工单ID
+const editingWorkOrderId = ref('');
+
+// 保存原始创建时间（编辑工单时使用）
+const originalCreateTime = ref('');
+
+// 查看工单进度
+const handleViewProgress = (row) => {
+  console.log('查看工单进度:', row);
+  // 实现查看进度功能，可能会打开进度查看弹窗或跳转到进度页面
+};
+
 // 创建工单弹窗相关
 const createDialogVisible = ref(false);
 const createFormRef = ref(null);
@@ -477,7 +1063,10 @@ const createForm = reactive({
   relatedEquipment: '',
   resultDescription: '',
   needAssignee: 'true',
-  assignee: ''
+  assignee: '',
+  steps: [{ name: '', intendedPurpose: '', intendedTime: '' }],
+  file: '',
+  fileList: []
 });
 
 const createFormRules = {
@@ -487,8 +1076,7 @@ const createFormRules = {
   deadline: [{ required: true, message: '请选择截止时间', trigger: 'change' }],
   description: [{ required: true, message: '请输入工单描述', trigger: 'blur' }],
   location: [{ required: true, message: '请输入执行地点', trigger: 'blur' }],
-  needAssignee: [{ required: true, message: '请选择是否需要指定执行人', trigger: 'change' }],
-  assignee: [{ required: true, message: '请选择执行人', trigger: 'change' }]
+  needAssignee: [{ required: true, message: '请选择是否需要指定执行人', trigger: 'change' }]
 };
 
 // 打开创建工单弹窗
@@ -496,15 +1084,178 @@ const handleCreateWorkOrder = () => {
   createDialogVisible.value = true;
 };
 
+// 添加试验步骤
+const addStep = () => {
+  createForm.steps.push({ name: '', intendedPurpose: '', intendedTime: '' });
+};
+
+// 删除试验步骤
+const deleteStep = (index) => {
+  // 确保至少保留一个步骤
+  if (createForm.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  createForm.steps.splice(index, 1);
+};
+
 // 提交创建工单
-const submitCreate = () => {
-  console.log('提交工单:', createForm);
-  // 这里可以添加表单验证和提交逻辑
-  createDialogVisible.value = false;
-  // 重置表单
-  Object.keys(createForm).forEach((key) => {
-    createForm[key] = '';
-  });
+const submitCreate = async () => {
+  // 表单验证
+  if (!createFormRef.value) return;
+
+  try {
+    await createFormRef.value.validate();
+
+    // 准备步骤数据
+    const stepsData = createForm.steps
+      .filter((step) => step.name.trim() && step.intendedPurpose.trim())
+      .map((step, index) => ({
+        createTime: new Date().toISOString(),
+        updateTime: new Date().toISOString(),
+        params: {},
+        module: 1,
+        code: index + 1,
+        name: step.name,
+        intendedPurpose: step.intendedPurpose,
+        intendedTime: step.intendedTime ? new Date(step.intendedTime).toISOString() : new Date().toISOString(),
+        finishTime: '',
+        remark: '',
+        status: 2
+      }));
+
+    // 编辑模式下，需要为每个步骤添加id，并调用updatejiedian接口
+    let nodeIds = '';
+    if (editingWorkOrderId.value) {
+      // 获取工单详情，以获取原始步骤的id
+      const detailResponse = await gongdanDetail(editingWorkOrderId.value);
+      if (detailResponse.code !== 200) {
+        ElMessage.error('获取工单详情失败');
+        return;
+      }
+
+      const workOrderDetail = detailResponse.data;
+      if (workOrderDetail.nodes && Array.isArray(workOrderDetail.nodes)) {
+        // 按code排序原始nodes数组
+        const sortedNodes = [...workOrderDetail.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+
+        // 为新的步骤数据添加id
+        const updatedSteps = stepsData.map((step, index) => ({
+          ...step,
+          id: sortedNodes[index]?.id || 0 // 使用原始步骤的id，如果不存在则使用0
+        }));
+
+        // 调用updatejiedian接口更新步骤，直接传递数组
+        const updateResponse = await updatejiedian(updatedSteps);
+        if (updateResponse.code !== 200) {
+          ElMessage.error('更新步骤失败');
+          return;
+        }
+
+        // 使用原始的nodeIds，避免重新创建步骤
+        nodeIds = workOrderDetail.nodeIds;
+      }
+    } else {
+      // 创建模式下，调用addjiedian接口，直接传递数组
+      const jiedianResponse = await addjiedian(stepsData);
+
+      if (jiedianResponse.code !== 200) {
+        ElMessage.error('创建步骤失败');
+        return;
+      }
+
+      // 获取返回的ids，实际返回格式中msg字段包含ids字符串，data为null
+      if (jiedianResponse.code === 200 && jiedianResponse.msg) {
+        nodeIds = jiedianResponse.msg;
+      } else {
+        ElMessage.warning('未获取到有效的步骤ID');
+        return;
+      }
+    }
+
+    // 准备工单数据
+    const workOrderData = {
+      // 编辑模式下使用原始创建时间，创建模式下使用当前时间
+      createTime: editingWorkOrderId.value && originalCreateTime.value ? originalCreateTime.value : new Date().toISOString(),
+      updateTime: new Date().toISOString(),
+      params: {},
+      module: 1,
+      projectId: 1,
+      title: createForm.title,
+      type: mapTypeToCode(createForm.type),
+      level: mapPriorityToCode(createForm.priority),
+      // 采用与shiyanguanli页面相同的日期处理方式
+      endTime: createForm.deadline ? new Date(createForm.deadline).toISOString() : '',
+      info: createForm.description,
+      position: createForm.location,
+      device: createForm.relatedEquipment || '',
+      // 图片上传处理：后端期望Long类型，前端需要从逗号分隔字符串中提取第一个ID
+      fileId: createForm.file ? createForm.file : '',
+      nodeIds: nodeIds,
+      results: createForm.resultDescription || '',
+      status: 1, // 待派单 1待派单2已派单3执行中4已完成
+      sendOrderTime: '', // 根据用户要求，只有在派单并选择人员后才赋值
+      getOrderTime: '',
+      finishiOrderTime: '',
+      orderResult: '', // 验收结果1通过2需整改
+      point: '2', // 默认不跟踪（2表示不跟踪，1表示跟踪）
+      createDept: '',
+      createBy: '',
+      handlerDept: '',
+      handler: '',
+      handlerName: ''
+    };
+
+    let response;
+    // 区分创建和编辑操作
+    if (editingWorkOrderId.value) {
+      // 编辑操作：调用updategongdan接口
+      const updateData = {
+        ...workOrderData,
+        id: editingWorkOrderId.value
+      };
+      response = await updategongdan(updateData);
+    } else {
+      // 创建操作：调用addgongdan接口
+      response = await addgongdan(workOrderData);
+    }
+
+    if (response.code === 200) {
+      const successMessage = editingWorkOrderId.value ? '工单编辑成功' : '工单创建成功';
+      ElMessage.success(successMessage);
+      createDialogVisible.value = false;
+
+      // 重置表单
+      Object.keys(createForm).forEach((key) => {
+        if (key === 'steps') {
+          createForm[key] = [{ content: '' }];
+        } else {
+          createForm[key] = '';
+        }
+      });
+
+      // 重置编辑状态
+      editingWorkOrderId.value = '';
+      originalCreateTime.value = '';
+
+      // 刷新工单列表
+      fetchWorkOrderList();
+    } else {
+      const errorMessage = editingWorkOrderId.value ? '工单编辑失败' : '工单创建失败';
+      ElMessage.error(errorMessage);
+    }
+  } catch (error) {
+    // 增加详细的错误信息日志
+    console.error('创建工单过程中发生错误:', error);
+    console.error('错误详情:', {
+      message: error.message,
+      stack: error.stack,
+      workOrderData: typeof workOrderData !== 'undefined' ? workOrderData : '未生成工单数据',
+      stepsDataLength: typeof stepsData !== 'undefined' ? stepsData.length : 0
+    });
+    // 显示更具体的错误信息给用户
+    ElMessage.error(`创建工单过程中发生错误: ${error.message || '未知错误'}`);
+  }
 };
 
 // 取消创建工单
@@ -558,12 +1309,49 @@ const handleInspectionManagement3 = () => {
 </script>
 
 <style scoped>
+@import url('./css/step-bars.css');
+@import url('./css/detail-dialog.css');
+
 .work-order-management {
   padding: 20px;
   background-color: #f5f7fa;
   min-height: 100vh;
 }
 
+/* 步骤表单样式 */
+.steps-container {
+  width: 100%;
+}
+
+.step-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 10px;
+}
+
+.step-number {
+  width: 30px;
+  height: 30px;
+  background-color: #409eff;
+  color: white;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 10px;
+  flex-shrink: 0;
+}
+
+.add-step-btn {
+  margin-top: 10px;
+  color: #409eff;
+}
+
+.add-step-btn:hover {
+  color: #66b1ff;
+  background-color: #ecf5ff;
+}
+
 /* 选项卡样式 */
 .tabs-wrapper {
   background-color: #fff;
@@ -650,28 +1438,10 @@ const handleInspectionManagement3 = () => {
   flex-shrink: 0;
 }
 
-.search-btn {
-  background-color: #f2f3f5;
-  color: #303133;
-  border-color: #f2f3f5;
-  transition: all 0.2s ease;
-}
-
-.search-btn:hover {
-  background-color: #e5e6eb;
-  color: #303133;
-  border-color: #e5e6eb;
-}
-
+.search-btn,
 .create-btn {
-  background-color: #165dff;
-  border-color: #165dff;
-  transition: all 0.2s ease;
-}
-
-.create-btn:hover {
-  background-color: #0e42d2;
-  border-color: #0e42d2;
+  height: 36px;
+  border-radius: 4px;
 }
 
 /* 表格样式 */
@@ -915,72 +1685,6 @@ const handleInspectionManagement3 = () => {
   padding-left: 8px;
 }
 
-/* 上传区域样式 */
-.upload-container {
-  width: 100%;
-}
-
-.upload-box {
-  border: 2px dashed #dcdfe6;
-  border-radius: 8px;
-  padding: 40px 20px;
-  text-align: center;
-  cursor: pointer;
-  background-color: #f8f9fa;
-  transition: all 0.3s ease;
-  position: relative;
-  overflow: hidden;
-}
-
-.upload-box::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 1px;
-  background: linear-gradient(90deg, transparent, #e0e7ff, transparent);
-  transform: scaleX(0);
-  transform-origin: left;
-  transition: transform 0.3s ease;
-}
-
-.upload-box:hover {
-  border-color: #165dff;
-  background-color: #f0f5ff;
-  transform: translateY(-2px);
-  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.1);
-}
-
-.upload-box:hover::before {
-  transform: scaleX(1);
-}
-
-.avatar-uploader-icon {
-  font-size: 36px;
-  color: #909399;
-  margin-bottom: 12px;
-  transition: color 0.3s ease;
-}
-
-.upload-box:hover .avatar-uploader-icon {
-  color: #165dff;
-  transform: scale(1.1);
-}
-
-.upload-text {
-  font-size: 14px;
-  color: #606266;
-  margin-bottom: 8px;
-  font-weight: 500;
-}
-
-.upload-hint {
-  font-size: 12px;
-  color: #909399;
-  line-height: 1.5;
-}
-
 /* 弹窗按钮美化 */
 .create-dialog .dialog-footer {
   display: flex;
@@ -1088,4 +1792,304 @@ const handleInspectionManagement3 = () => {
     gap: 10px;
   }
 }
+/* 详情弹窗样式 - 与保修管理页面保持一致 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
+}
+
+.task-detail-container {
+  padding: 10px 0;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+}
+
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
+  font-size: 14px;
+}
+
+/* 骨架屏样式 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.skeleton-card {
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.skeleton-header {
+  height: 20px;
+  width: 30%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 12px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-row {
+  height: 16px;
+  width: 100%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+/* 优先级标签样式 */
+.task-status {
+  padding: 4px 10px;
+  border-radius: 6px;
+  font-size: 12px;
+  font-weight: 500;
+  border: 1px solid transparent;
+}
+
+.priority-high {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border-color: #ffccc7;
+}
+
+.priority-medium {
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border-color: #ffe58f;
+}
+
+.priority-low {
+  background-color: #e6f7ff;
+  color: #1890ff;
+  border-color: #91d5ff;
+}
+
+.description-content,
+.result-content {
+  padding: 12px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  line-height: 1.6;
+  color: #4e5969;
+  font-size: 13px;
+}
+
+/* 多图片展示容器样式 */
+.images-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-top: 12px;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 8px;
+}
+
+/* 单个图片项样式 */
+.image-item {
+  flex: 0 0 auto;
+  width: 200px; /* 固定宽度 */
+  height: 160px; /* 固定高度 */
+  border-radius: 6px;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: transform 0.3s ease;
+}
+
+.image-item:hover {
+  transform: scale(1.03);
+}
+
+/* 图片样式 */
+.detail-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持比例填充容器 */
+  display: block;
+}
+
+/* 图片加载失败样式 */
+.detail-image[src=''] {
+  background-color: #f0f0f0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #999;
+  font-size: 12px;
+}
+
+.custom-steps .el-step__description {
+  white-space: pre-wrap;
+  font-size: 12px;
+  color: #666;
+  line-height: 1.4;
+}
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 60px 0;
+  color: #999;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+  .work-order-management {
+    padding: 10px;
+  }
+
+  .navigation-tabs {
+    flex-wrap: wrap;
+  }
+
+  .nav-tab {
+    flex: 1 0 33%;
+    padding: 10px 0;
+    font-size: 12px;
+  }
+
+  .pagination-section {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 10px;
+  }
+
+  .detail-item {
+    flex: 0 0 100%;
+    padding-right: 0;
+  }
+}
+/* 详情弹窗样式 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 600px;
+  overflow-y: auto;
+}
+
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+}
+
+.detail-container {
+  padding: 10px 0;
+}
+
+.detail-section {
+  margin-bottom: 24px;
+}
+
+.section-title {
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 12px;
+  padding-bottom: 8px;
+  border-bottom: 2px solid #e6f7ff;
+  color: #1890ff;
+}
+
+.info-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 12px;
+}
+
+.info-item {
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-label {
+  font-weight: bold;
+  color: #666;
+  min-width: 100px;
+}
+
+.info-value {
+  flex: 1;
+  color: #333;
+}
+
+.description-content,
+.result-content {
+  padding: 12px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  line-height: 1.6;
+}
+
+/* 自定义步骤条样式覆盖 */
+.custom-steps .el-step__description {
+  white-space: pre-wrap;
+  font-size: 12px;
+  color: #666;
+  line-height: 1.4;
+}
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 60px 0;
+  color: #999;
+}
 </style>
diff --git a/src/views/zhinengxunjian/index.vue b/src/views/zhinengxunjian/index.vue
index b5a5f97..6393076 100644
--- a/src/views/zhinengxunjian/index.vue
+++ b/src/views/zhinengxunjian/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="box-container">
       <!-- 导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab active" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,7 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
+      </div> -->
       <div class="main-content">
         <!-- 左侧日历区域 -->
         <div class="calendar-container">
@@ -43,7 +43,7 @@
         <div class="form-container">
           <div class="form-header">
             <h2>今日待办</h2>
-            <el-button type="primary" size="small" icon="el-icon-plus" @click="openAddTaskDialog">添加</el-button>
+            <el-button type="primary" icon="Plus" @click="openAddTaskDialog">添加</el-button>
           </div>
 
           <!-- 待办事项列表 - 动态渲染 -->
@@ -54,6 +54,7 @@
               class="todo-item"
               :class="{ 'important': item.taskLevel === '重要', 'completed': item.status === 2 }"
             >
+              <el-checkbox class="todo-checkbox" :checked="item.status === 2" @change="handleStatusChange(item, $event)"></el-checkbox>
               <div
                 class="todo-color-indicator"
                 :class="{
@@ -63,7 +64,6 @@
                   completed: item.status === 2
                 }"
               ></div>
-              <el-checkbox class="todo-checkbox" :checked="item.status === 2" @change="handleStatusChange(item, $event)"></el-checkbox>
               <div class="todo-content">
                 <div class="todo-main">
                   <div class="todo-title">{{ item.title }}</div>
@@ -590,16 +590,6 @@ const handleInspection7 = () => {
   min-height: 100vh;
 }
 
-/* 导航栏样式 */
-.navigation-tabs {
-  display: flex;
-  margin-bottom: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  padding: 2px;
-}
-
 /* 已完成任务的样式 */
 .todo-color-indicator.completed {
   background-color: #dcdfe6;
@@ -609,7 +599,15 @@ const handleInspection7 = () => {
   color: #909399;
   text-decoration: line-through;
 }
-
+/* 导航栏样式 */
+.navigation-tabs {
+  display: flex;
+  margin-bottom: 20px;
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
+  padding: 2px;
+}
 .nav-tab {
   padding: 12px 24px;
   cursor: pointer;
@@ -849,13 +847,14 @@ const handleInspection7 = () => {
 
 /* 悬停显示操作按钮 */
 .todo-item:hover .todo-actions {
-  opacity: 1;
+  background: linear-gradient(to right, rgba(173, 216, 230, 0), rgb(64, 158, 255));
   right: 0;
+  opacity: 0.8;
 }
 
-/* 内容区域平移以给按钮留出空间 */
+/* 取消内容区域平移效果 */
 .todo-item:hover .todo-content {
-  transform: translateX(-120px);
+  transform: none;
 }
 
 .action-icon {
@@ -942,7 +941,7 @@ const handleInspection7 = () => {
   background-color: #ff4d4f;
 }
 
-::v-deep .custom-date-cell {
+:deep(.custom-date-cell) {
   width: 100%;
   height: 100%;
   padding: 5px;
@@ -983,13 +982,13 @@ const handleInspection7 = () => {
 }
 
 /* 穿透作用域，强制设置日历单元格为正方形 */
-::v-deep .el-calendar-table td {
+:deep(.el-calendar-table td) {
   padding: 2px;
   vertical-align: top;
   width: 120px; /* 强制宽度 */
   height: 120px; /* 强制高度（与宽度一致） */
 }
-::v-deep .el-calendar-day {
+:deep(.el-calendar-day) {
   padding: 0; /* 移除默认内边距 */
   width: 100%;
   height: 100%;
diff --git a/src/views/zhinengxunjian/paidanjilu.vue b/src/views/zhinengxunjian/paidanjilu.vue
index 60897d4..57e7452 100644
--- a/src/views/zhinengxunjian/paidanjilu.vue
+++ b/src/views/zhinengxunjian/paidanjilu.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="dispatch-records">
       <!-- 顶部导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,10 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab active" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <!-- 页面标题 -->
-      <TitleComponent title="工单管理模块" subtitle="发起工单任务，跟踪流程记录和执行情况"></TitleComponent>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -28,28 +25,36 @@
       <div class="filter-bar">
         <div class="filter-container">
           <div class="filter-item">
-            <el-select v-model="dispatchStatus" placeholder="派单状态" clearable>
+            <el-select v-model="workOrderType" placeholder="工单类型" clearable>
+              <el-option label="全部类型" value="all"></el-option>
+              <el-option label="维护保养" value="maintenance"></el-option>
+              <el-option label="检查检测" value="inspection"></el-option>
+              <el-option label="安装调试" value="installation"></el-option>
+              <el-option label="升级改造" value="upgrade"></el-option>
+            </el-select>
+          </div>
+          <div class="filter-item">
+            <el-select v-model="workOrderStatus" placeholder="全部状态" clearable>
               <el-option label="全部状态" value="all"></el-option>
-              <el-option label="已接收" value="received"></el-option>
-              <el-option label="处理中" value="processing"></el-option>
+              <el-option label="待派单" value="accepted"></el-option>
+              <el-option label="待处理" value="pending"></el-option>
+              <el-option label="执行中" value="executing"></el-option>
               <el-option label="已完成" value="completed"></el-option>
-              <el-option label="已拒绝" value="rejected"></el-option>
             </el-select>
           </div>
           <div class="filter-item">
-            <el-select v-model="executor" placeholder="执行人" clearable>
-              <el-option label="全部人员" value="all"></el-option>
-              <el-option label="张明" value="zhangming"></el-option>
-              <el-option label="李华" value="lihua"></el-option>
-              <el-option label="王强" value="wangqiang"></el-option>
+            <el-select v-model="priority" placeholder="全部优先级" clearable>
+              <el-option label="全部优先级" value="all"></el-option>
+              <el-option label="高" value="high"></el-option>
+              <el-option label="中" value="medium"></el-option>
+              <el-option label="低" value="low"></el-option>
             </el-select>
           </div>
           <div class="filter-item">
-            <el-date-picker v-model="dispatchDate" type="date" placeholder="派单日期" format="yyyy/MM/dd" value-format="yyyy/MM/dd"></el-date-picker>
+            <el-date-picker v-model="createDate" type="date" placeholder="创建日期" value-format="yyyy/MM/dd"></el-date-picker>
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch">搜索</el-button>
-            <el-button type="primary" class="create-btn" @click="handleExport">导出记录</el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch">搜索</el-button>
           </div>
         </div>
       </div>
@@ -58,81 +63,123 @@
       <div class="statistics-cards">
         <div class="stat-card">
           <div class="stat-value">{{ totalDispatches }}</div>
-          <div class="stat-label">本月派单总数</div>
-          <div class="stat-trend">较上月 <span class="trend-up">↑ 12%</span></div>
+          <div class="stat-label">本月工单总数</div>
+          <div class="stat-trend">
+            较上月
+            <span :class="dispatchGrowthRate.includes('-') ? 'trend-down' : 'trend-up'">
+              {{ dispatchGrowthRate.includes('-') ? '↓' : '↑' }} {{ dispatchGrowthRate }}
+            </span>
+          </div>
           <div class="stat-icon">
-            <img src="@/assets/images/paidan.png" alt="时间" class="stat-img" />
+            <img src="@/assets/images/paidan.png" alt="工单" class="stat-img" />
           </div>
         </div>
         <div class="stat-card">
           <div class="stat-value">{{ avgResponseTime }}</div>
           <div class="stat-label">平均响应时间</div>
-          <div class="stat-trend">较上月 <span class="trend-down">↓ 5分钟</span></div>
+          <div class="stat-trend">
+            较上月
+            <span :class="responseGrowthRate.includes('-') ? 'trend-up' : 'trend-down'">
+              {{ responseGrowthRate.includes('-') ? '↓' : '↑' }} {{ responseGrowthRate }}
+            </span>
+          </div>
           <div class="stat-icon">
             <img src="@/assets/images/shijian.png" alt="时间" class="stat-img" />
           </div>
         </div>
         <div class="stat-card">
           <div class="stat-value">{{ pendingDispatches }}</div>
-          <div class="stat-label">待接收工单</div>
+          <div class="stat-label">待处理工单</div>
           <div class="stat-trend">较昨日 <span class="trend-up">↑ 2</span></div>
           <div class="stat-icon warning">
-            <img src="@/assets/images/gongdan.png" alt="工单" class="stat-img" />
+            <img src="@/assets/images/gongdan.png" alt="待处理" class="stat-img" />
           </div>
         </div>
         <div class="stat-card">
           <div class="stat-value">{{ completionRate }}</div>
           <div class="stat-label">按时完成率</div>
-          <div class="stat-trend">较上月 <span class="trend-up">↑ 3%</span></div>
+          <div class="stat-trend">
+            较上月
+            <span :class="completionGrowthRate.includes('-') ? 'trend-down' : 'trend-up'">
+              {{ completionGrowthRate.includes('-') ? '↓' : '↑' }} {{ completionGrowthRate }}
+            </span>
+          </div>
           <div class="stat-icon success">
-            <img src="@/assets/images/wancheng.png" alt="完成" class="stat-img" />
+            <img src="@/assets/images/wancheng.png" alt="完成率" class="stat-img" />
           </div>
         </div>
       </div>
 
-      <!-- 派单记录表格 -->
+      <!-- 工单表格 -->
       <div class="table-wrapper">
         <el-table :data="pagedTableData" stripe style="width: 100%" highlight-current-row class="custom-table">
-          <el-table-column align="center" prop="dispatchNo" label="派单号" min-width="120"></el-table-column>
           <el-table-column align="center" prop="orderNo" label="工单编号" min-width="120"></el-table-column>
-          <el-table-column align="center" prop="taskType" label="工单类型" min-width="100"></el-table-column>
-          <el-table-column align="center" prop="dispatcher" label="派单人" min-width="100"></el-table-column>
-          <el-table-column align="center" prop="executor" label="接收人" min-width="100"></el-table-column>
-          <el-table-column align="center" prop="dispatchTime" label="派单时间" min-width="140"></el-table-column>
-          <el-table-column align="center" prop="status" label="派单状态" min-width="100">
+          <el-table-column align="center" prop="description" label="工单描述" min-width="150"></el-table-column>
+          <el-table-column align="center" prop="type" label="类型" min-width="100">
+            <template #default="scope">
+              <el-tag :type="getTypeTagType(scope.row.type)" class="type-tag">
+                {{ scope.row.type }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="priority" label="优先级" min-width="100">
+            <template #default="scope">
+              <el-tag :type="getPriorityTagType(scope.row.priority)" class="priority-tag">
+                {{ scope.row.priority }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="creator" label="创建人" min-width="100"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="创建时间" min-width="140"></el-table-column>
+          <el-table-column align="center" prop="deadline" label="截止时间" min-width="140"></el-table-column>
+          <el-table-column align="center" prop="status" label="状态" min-width="100">
             <template #default="scope">
               <el-tag :type="getStatusTagType(scope.row.status)" class="status-tag">
                 {{ scope.row.status }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="completionStatus" label="完成状态" min-width="100">
-            <template #default="scope">
-              <el-tag :type="getCompletionTagType(scope.row.completionStatus)" class="completion-tag">
-                {{ scope.row.completionStatus }}
-              </el-tag>
-            </template>
-          </el-table-column>
           <el-table-column align="center" label="操作" min-width="180" fixed="right">
             <template #default="scope">
-              <el-button type="text" @click="handleViewDetails(scope.row)" class="action-btn">详情</el-button>
-              <el-button
-                type="text"
-                @click="handleViewReport(scope.row)"
-                class="action-btn report-btn"
-                v-if="scope.row.completionStatus === '已完成'"
-              >
-                查看报告
-              </el-button>
-              <el-button
-                type="text"
-                @click="handleViewProgress(scope.row)"
-                class="action-btn progress-btn"
-                v-else-if="scope.row.completionStatus === '进行中'"
-              >
-                查看进度
-              </el-button>
-              <el-button type="text" @click="handleTrack(scope.row)" class="action-btn track-btn" v-else> 跟踪 </el-button>
+              <!-- 已接单状态 -->
+              <template v-if="scope.row.status === '已接单'">
+                <el-button type="text" @click="handleFollow(scope.row)" class="action-btn">跟踪</el-button>
+                <el-button type="text" @click="handleCancel(scope.row)" class="action-btn cancel-btn">删除</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 已派单状态 -->
+              <template v-else-if="scope.row.status === '已派单'">
+                <el-button type="text" @click="handleSetTrack(scope.row)" class="action-btn">
+                  {{ scope.row.point === '1' ? '取消跟踪' : '跟踪' }}
+                </el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 待派单状态 -->
+              <template v-else-if="scope.row.status === '待派单'">
+                <el-button type="text" @click="handleAssign(scope.row)" class="action-btn">派单</el-button>
+                <el-button type="text" @click="handleEdit(scope.row)" class="action-btn">编辑</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 执行中状态 -->
+              <template v-else-if="scope.row.status === '执行中'">
+                <el-button type="text" @click="handleCommunicate(scope.row)" class="action-btn">沟通</el-button>
+                <el-button type="text" @click="handleViewProgress(scope.row)" class="action-btn">查看进度</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 已完成状态 -->
+              <template v-else-if="scope.row.status === '已完成'">
+                <el-button type="text" @click="handleArchive(scope.row)" class="action-btn">归档</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 默认显示 -->
+              <template v-else>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">查看详情</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -157,129 +204,611 @@
           </el-pagination>
         </div>
       </div>
+
+      <!-- 编辑工单弹窗 -->
+      <el-dialog v-model="createDialogVisible" title="编辑工单" width="900px" class="create-dialog" center>
+        <el-form :model="createForm" :rules="createFormRules" ref="createFormRef" label-width="120px" class="custom-form">
+          <el-form-item label="工单标题*" prop="title">
+            <el-input v-model="createForm.title" placeholder="请输入工单标题" />
+          </el-form-item>
+
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="工单类型*" prop="type">
+                <el-select v-model="createForm.type" placeholder="请选择类型">
+                  <el-option label="维护保养" value="维护保养" />
+                  <el-option label="检查检测" value="检查检测" />
+                  <el-option label="安装调试" value="安装调试" />
+                  <el-option label="升级改造" value="升级改造" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="优先级*" prop="priority">
+                <el-select v-model="createForm.priority" placeholder="请选择优先级">
+                  <el-option label="高" value="高" />
+                  <el-option label="中" value="中" />
+                  <el-option label="低" value="低" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="截止时间*" prop="deadline">
+                <el-date-picker v-model="createForm.deadline" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-form-item label="工单描述*" prop="description">
+            <el-input v-model="createForm.description" type="textarea" :rows="3" placeholder="请详细描述工单内容、要求和注意事项等信息" />
+          </el-form-item>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="执行地点*" prop="location">
+                <el-input v-model="createForm.location" placeholder="请填写执行地点" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="相关设备/系统">
+                <el-input v-model="createForm.relatedEquipment" placeholder="请输入相关设备或系统名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="工单步骤" class="form-item" style="width: 100%">
+            <div class="steps-container">
+              <div class="step-item" v-for="(step, index) in createForm.steps" :key="index">
+                <div class="step-number">{{ index + 1 }}</div>
+                <el-input v-model="step.name" placeholder="输入步骤名称" style="flex: 1; margin-right: 10px" />
+                <el-input v-model="step.intendedPurpose" placeholder="输入预期目的" style="flex: 1; margin-right: 10px" />
+                <el-date-picker
+                  v-model="step.intendedTime"
+                  type="datetime"
+                  placeholder="选择计划时间"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                  style="width: 180px; margin-right: 10px"
+                />
+                <el-button v-if="createForm.steps.length > 1" type="text" class="delete-step-btn" @click="deleteStep(index)" style="color: #f56c6c">
+                  删除
+                </el-button>
+              </div>
+              <el-button type="text" class="add-step-btn" @click="addStep">添加步骤</el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="上传图片(可选)" width="100%" prop="file">
+            <image-upload v-model="createForm.file" />
+
+            <div v-if="createForm.fileList && createForm.fileList.length > 0" class="upload-tip">
+              <span style="color: #1989fa">已选择{{ createForm.fileList.length }}张图片，将在提交时上传</span>
+            </div>
+          </el-form-item>
+          <el-form-item label="工单描述">
+            <el-input v-model="createForm.resultDescription" type="textarea" :rows="3" placeholder="请描述该工单完成后预期达成的成果" />
+          </el-form-item>
+
+          <el-form-item label="是否需要执行人" prop="needAssignee">
+            <el-radio-group v-model="createForm.needAssignee">
+              <el-radio label="true">是，指定执行人</el-radio>
+              <el-radio label="false">否，由系统分配</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="cancelCreate">取消</el-button>
+            <el-button type="primary" @click="submitCreate">提交修改</el-button>
+          </span>
+        </template>
+      </el-dialog>
+
+      <!-- 工单详情弹窗 -->
+      <el-dialog
+        v-model="detailDialogVisible"
+        title="工单详情"
+        width="800px"
+        :before-close="handleCloseDetailDialog"
+        class="custom-experiment-dialog"
+      >
+        <div v-if="isDetailLoading" class="skeleton-loading">
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+        </div>
+
+        <div v-else-if="detailData" class="task-detail-container">
+          <!-- 基础信息区 -->
+          <div class="detail-card">
+            <h3 class="card-title">基础信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">工单编号：</span>
+                  <span class="info-value">WO-{{ detailData.id }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">工单标题：</span>
+                  <span class="info-value">{{ detailData.title }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">工单类型：</span>
+                  <span class="info-value">{{ mapCodeToType(detailData.type) }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">优先级：</span>
+                  <span class="info-value task-status priority-{{ mapPriorityToClass(detailData.level) }}">{{
+                    mapCodeToPriority(detailData.level)
+                  }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">创建人：</span>
+                  <span class="info-value">{{ detailData.sendOrderPersonVo?.userName || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">创建时间：</span>
+                  <span class="info-value">{{ detailData.createTime ? formatDate(detailData.createTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">执行人：</span>
+                  <span class="info-value">{{ detailData.getOrderPersonVo?.userName || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">接单时间：</span>
+                  <span class="info-value">{{ detailData.getOrderTime ? formatDate(detailData.getOrderTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">截止时间：</span>
+                  <span class="info-value">{{ detailData.endTime ? formatDate(detailData.endTime) : '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">完成时间：</span>
+                  <span class="info-value">{{ detailData.finishiOrderTime ? formatDate(detailData.finishiOrderTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">执行地点：</span>
+                  <span class="info-value">{{ detailData.position || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">相关设备：</span>
+                  <span class="info-value">{{ detailData.device || '-' }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 工单描述 -->
+          <div class="detail-card">
+            <h3 class="card-title">工单描述</h3>
+            <div class="card-content">
+              <div class="description-content">
+                {{ detailData.info || '无描述信息' }}
+              </div>
+            </div>
+          </div>
+
+          <!-- 步骤条 -->
+          <div v-if="detailData.nodes && detailData.nodes.length > 0" class="detail-card">
+            <h3 class="card-title">执行步骤</h3>
+            <div class="steps-container">
+              <div v-for="(node, index) in detailData.nodes" :key="node.id || index" class="step-item">
+                <div class="step-number">{{ node.code || index + 1 }}</div>
+                <div class="step-info">
+                  <div class="step-name">{{ node.name || '未命名步骤' }}</div>
+                  <div class="step-purpose">{{ node.intendedPurpose || '无说明' }}</div>
+                  <div class="step-time">计划时间：{{ formatDateTime(node.intendedTime) }}</div>
+                  <div v-if="node.finishTime" class="step-finish-time">完成时间：{{ formatDateTime(node.finishTime) }}</div>
+                  <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
+                </div>
+                <div class="step-status" :class="getStatusClass(node.status)">
+                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 图片展示区 -->
+          <div v-if="detailData.fileUrl" class="detail-card">
+            <h3 class="card-title">故障图片</h3>
+            <div class="card-content">
+              <div class="images-container">
+                <!-- 将逗号分隔的URL字符串拆分为数组并循环展示 -->
+                <div v-for="(url, index) in splitImageUrls(detailData.fileUrl)" :key="index" class="image-item">
+                  <img
+                    :src="url"
+                    :alt="`故障图片 ${index + 1}`"
+                    class="detail-image"
+                    @error="handleImageError($event, index)"
+                    style="max-width: 100%; max-height: 200px; border-radius: 4px"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 工单结果 -->
+          <div v-if="detailData.orderResult" class="detail-card">
+            <h3 class="card-title">工单结果</h3>
+            <div class="card-content">
+              <div class="result-content">
+                {{ detailData.orderResult }}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div v-else class="empty-state">
+          <p>暂无工单详情数据</p>
+        </div>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="closeDetailDialog">关闭</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </div>
+
+    <!-- 派单弹窗 -->
+    <el-dialog v-model="assignDialogVisible" title="派单" width="400px" :before-close="cancelAssign">
+      <div class="assign-dialog-content">
+        <div class="form-group">
+          <label class="form-label">选择执行人:</label>
+          <el-select v-model="selectedExecutor" placeholder="请选择执行人" style="width: 100%" :loading="loadingUsers" filterable>
+            <el-option v-for="item in executors" :key="item.userId" :label="item.userName" :value="item.userId" />
+          </el-select>
+        </div>
+      </div>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancelAssign">取消</el-button>
+          <el-button type="primary" @click="confirmAssign" :loading="assignLoading">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import { ref, computed, reactive } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
-
-// 激活的选项卡，默认显示派单记录
-const activeTab = ref('dispatch');
+import { gongdanlist, gongdanRecord, updategongdan, gongdanDetail } from '@/api/zhinengxunjian/gongdan/index';
+import { updatejiedian } from '@/api/zhinengxunjian/jiedian';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
+import ImageUpload from '@/components/ImageUpload/index.vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
 
 // 筛选条件
-const dispatchStatus = ref('all');
-const executor = ref('all');
-const dispatchDate = ref('');
+const workOrderType = ref('all');
+const workOrderStatus = ref('all');
+const priority = ref('all');
+const createDate = ref('');
 
 // 统计数据
-const totalDispatches = ref(56);
-const avgResponseTime = ref('42分钟');
-const pendingDispatches = ref(7);
-const completionRate = ref('92%');
+const totalDispatches = ref('');
+const avgResponseTime = ref('');
+const pendingDispatches = ref('');
+const completionRate = ref('');
 
-// 派单记录数据
-const rawTableData = ref([
-  {
-    dispatchNo: 'DP-2023-0619-089',
-    orderNo: 'WO-2023-0619-055',
-    taskType: '安全设备检查检测',
-    dispatcher: '张明',
-    executor: '李阳',
-    dispatchTime: '2023-06-19 13:50',
-    status: '已接收',
-    completionStatus: '未完成'
-  },
-  {
-    dispatchNo: 'DP-2023-0619-088',
-    orderNo: 'WO-2023-0618-054',
-    taskType: '新设备安装调试',
-    dispatcher: '张明',
-    executor: '李阳',
-    dispatchTime: '2023-06-19 13:30',
-    status: '已接收',
-    completionStatus: '进行中'
-  },
-  {
-    dispatchNo: 'DP-2023-0619-087',
-    orderNo: 'WO-2023-0617-053',
-    taskType: '系统升级改造',
-    dispatcher: '张明',
-    executor: '李阳',
-    dispatchTime: '2023-06-19 10:15',
-    status: '已接收',
-    completionStatus: '已完成'
-  },
-  {
-    dispatchNo: 'DP-2023-0619-086',
-    orderNo: 'WO-2023-0616-052',
-    taskType: '安全设备检查检测',
-    dispatcher: '张明',
-    executor: '李阳',
-    dispatchTime: '2023-06-19 09:40',
-    status: '已接收',
-    completionStatus: '未完成'
-  },
-  {
-    dispatchNo: 'DP-2023-0619-085',
-    orderNo: 'WO-2023-0615-051',
-    taskType: '安全设备检查检测',
-    dispatcher: '张明',
-    executor: '李阳',
-    dispatchTime: '2023-06-19 09:20',
-    status: '已接收',
-    completionStatus: '未完成'
-  },
-  {
-    dispatchNo: 'DP-2023-0619-084',
-    orderNo: 'WO-2023-0614-050',
-    taskType: '安全设备检查检测',
-    dispatcher: '张明',
-    executor: '李阳',
-    dispatchTime: '2023-06-19 09:10',
-    status: '已接收',
-    completionStatus: '未完成'
-  },
-  {
-    dispatchNo: 'DP-2023-0619-083',
-    orderNo: 'WO-2023-0613-049',
-    taskType: '安全设备检查检测',
-    dispatcher: '张明',
-    executor: '李阳',
-    dispatchTime: '2023-06-19 08:50',
-    status: '已接收',
-    completionStatus: '未完成'
-  }
-]);
+// 增长率数据
+const dispatchGrowthRate = ref('');
+const responseGrowthRate = ref('');
+const completionGrowthRate = ref('');
+
+// 优先级转类名
+const mapPriorityToClass = (priority) => {
+  const priorityMap = {
+    1: 'high',
+    2: 'medium',
+    3: 'low'
+  };
+  return priorityMap[priority] || 'low';
+};
+
+// 工单数据
+const rawTableData = ref([]);
 
 // 分页相关
 const currentPage = ref(1);
 const pageSize = ref(10);
-const total = ref(rawTableData.value.length);
+const total = ref(0);
+
+// 获取统计数据
+const fetchStatisticsData = async () => {
+  try {
+    const response = await gongdanRecord();
+    if (response.code === 200 && response.data) {
+      // 更新统计数据，处理null值
+      totalDispatches.value = response.data.bypds || '0';
+      avgResponseTime.value = response.data.pjxysj ? `${response.data.pjxysj}分钟` : '0分钟';
+      pendingDispatches.value = response.data.djsgd || '0';
+      completionRate.value = response.data.aswcl ? `${response.data.aswcl}%` : '0%';
+
+      // 更新增长率数据，处理null值
+      dispatchGrowthRate.value = response.data.pdzzl || '0%';
+      responseGrowthRate.value = response.data.xysjzzl || '0分钟';
+      completionGrowthRate.value = response.data.wczzl || '0%';
+    }
+  } catch (error) {
+    console.error('获取统计数据失败:', error);
+    // 发生错误时使用默认值
+    totalDispatches.value = '56';
+    avgResponseTime.value = '42分钟';
+    pendingDispatches.value = '7';
+    completionRate.value = '92%';
+    dispatchGrowthRate.value = '12%';
+    responseGrowthRate.value = '-5分钟';
+    completionGrowthRate.value = '3%';
+  }
+};
+
+// 获取工单列表数据
+const fetchWorkOrderList = async () => {
+  try {
+    const params = {
+      projectId: 1,
+      pageNum: currentPage.value,
+      pageSize: pageSize.value
+    };
+
+    const response = await gongdanlist(params);
+
+    if (response.code === 200 && response.rows) {
+      // 处理返回的数据，转换为表格需要的格式
+      rawTableData.value = response.rows.map((item) => ({
+        id: item.id,
+        projectId: item.projectId,
+        orderNo: `WO-${item.id}`, // 生成工单编号
+        title: item.title || '',
+        description: item.info || '',
+        type: mapCodeToType(item.type),
+        priority: mapCodeToPriority(item.level),
+        creator: item.sendOrderPersonVo?.userName || '',
+        createTime: item.createTime ? formatDate(item.createTime) : item.sendOrderTime ? formatDate(item.sendOrderTime) : '',
+        deadline: item.endTime ? formatDate(item.endTime) : '',
+        status: mapCodeToStatus(item.status),
+        executor: item.getOrderPersonVo?.userName || '',
+        getOrderTime: item.getOrderTime ? formatDate(item.getOrderTime) : '',
+        finishiOrderTime: item.finishiOrderTime ? formatDate(item.finishiOrderTime) : '',
+        position: item.position || '',
+        device: item.device || ''
+      }));
+
+      // 更新总条数
+      total.value = response.total || 0;
+    }
+  } catch (error) {
+    console.error('获取工单列表失败:', error);
+  }
+};
+
+// 类型映射函数 - 页面类型转接口code
+const mapTypeToCode = (type) => {
+  const typeMap = {
+    '维护保养': 1,
+    '检查检测': 2,
+    '安装调试': 3,
+    '升级改造': 4
+  };
+  return typeMap[type] || null;
+};
+
+// 类型映射函数 - 接口code转页面类型
+const mapCodeToType = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const typeMap = {
+    '1': '维护保养',
+    '2': '检查检测',
+    '3': '安装调试',
+    '4': '升级改造'
+  };
+  return typeMap[codeStr] || code;
+};
+
+// 状态映射函数 - 页面状态转接口code
+const mapStatusToCode = (status) => {
+  const statusMap = {
+    '待派单': 1,
+    '已派单': 2,
+    '执行中': 3,
+    '已完成': 4
+  };
+  return statusMap[status] || null;
+};
+
+// 状态映射函数 - 接口code转页面状态
+const mapCodeToStatus = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const statusMap = {
+    '1': '待派单',
+    '2': '已派单',
+    '3': '执行中',
+    '4': '已完成'
+  };
+  return statusMap[codeStr] || code;
+};
+
+// 优先级映射函数 - 页面优先级转接口code
+const mapPriorityToCode = (priority) => {
+  const priorityMap = {
+    '高': 3,
+    '中': 2,
+    '低': 1
+  };
+  return priorityMap[priority] || null;
+};
+
+// 优先级映射函数 - 接口code转页面优先级
+const mapCodeToPriority = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const priorityMap = {
+    '1': '低',
+    '2': '中',
+    '3': '高'
+  };
+  return priorityMap[codeStr] || code;
+};
+
+// 日期格式化函数 - 支持datetime格式
+const formatDate = (dateString) => {
+  if (!dateString) return '';
+  const date = new Date(dateString);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+
+  // 返回与datetime选择器value-format一致的格式
+  return `${year}/${month}/${day} ${hours}:${minutes}`;
+};
+
+// 根据步骤状态获取对应的样式类
+const getStatusClass = (status) => {
+  // 处理可能的数字输入
+  const statusStr = status?.toString() || '';
+  const statusClassMap = {
+    '1': 'status-pending',
+    '2': 'status-delayed',
+    '3': 'status-executing',
+    '4': 'status-completed'
+  };
+  return statusClassMap[statusStr] || 'status-unknown';
+};
+
+// 格式化日期时间（用于步骤条）
+const formatDateTime = (dateTime) => {
+  if (!dateTime) return '-';
+  try {
+    const date = new Date(dateTime);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } catch (error) {
+    return dateTime;
+  }
+};
+
+// 获取步骤状态文本
+const getStepStatusText = (status) => {
+  const statusStr = status?.toString() || '';
+  const statusMap = {
+    '1': '待执行',
+    '2': '执行中',
+    '3': '已完成',
+    '4': '已延期'
+  };
+  return statusMap[statusStr] || '未知状态';
+};
+
+// 初始化加载数据
+const initData = async () => {
+  await fetchStatisticsData();
+  await fetchWorkOrderList();
+};
+
+initData();
 
 // 分页处理后的数据
 const pagedTableData = computed(() => {
   // 筛选逻辑
   let filteredData = [...rawTableData.value];
 
-  if (dispatchStatus.value !== 'all') {
-    filteredData = filteredData.filter((item) => item.status === dispatchStatus.value);
+  if (workOrderType.value !== 'all') {
+    // 转换筛选条件为显示文本进行匹配
+    let typeText = '';
+    switch (workOrderType.value) {
+      case 'maintenance':
+        typeText = '维护保养';
+        break;
+      case 'inspection':
+        typeText = '检查检测';
+        break;
+      case 'installation':
+        typeText = '安装调试';
+        break;
+      case 'upgrade':
+        typeText = '升级改造';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.type === typeText);
   }
 
-  if (executor.value !== 'all') {
-    // 这里假设执行人的值与选项值对应
-    const executorMap = {
-      'zhangming': '张明',
-      'lihua': '李华',
-      'wangqiang': '王强'
-    };
-    filteredData = filteredData.filter((item) => item.executor === executorMap[executor.value]);
+  if (workOrderStatus.value !== 'all') {
+    // 转换筛选条件为显示文本进行匹配
+    let statusText = '';
+    switch (workOrderStatus.value) {
+      case 'accepted':
+        statusText = '已接单';
+        break;
+      case 'pending':
+        statusText = '待处理';
+        break;
+      case 'executing':
+        statusText = '执行中';
+        break;
+      case 'completed':
+        statusText = '已完成';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.status === statusText);
   }
 
-  if (dispatchDate.value) {
-    filteredData = filteredData.filter((item) => item.dispatchTime.includes(dispatchDate.value));
+  if (priority.value !== 'all') {
+    // 转换筛选条件为显示文本进行匹配
+    let priorityText = '';
+    switch (priority.value) {
+      case 'high':
+        priorityText = '高';
+        break;
+      case 'medium':
+        priorityText = '中';
+        break;
+      case 'low':
+        priorityText = '低';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.priority === priorityText);
+  }
+
+  if (createDate.value) {
+    filteredData = filteredData.filter((item) => item.createTime.includes(createDate.value));
   }
 
   // 更新总条数
@@ -291,24 +820,39 @@ const pagedTableData = computed(() => {
   return filteredData.slice(startIndex, endIndex);
 });
 
-// 获取派单状态标签样式
-const getStatusTagType = (status) => {
-  const statusMap = {
-    '已接收': 'primary',
-    '处理中': 'success',
-    '已完成': 'info',
-    '已拒绝': 'danger'
+// 获取类型标签样式
+const getTypeTagType = (type) => {
+  const typeMap = {
+    // 维护保养为红色
+    '维护保养': 'danger',
+    // 检查检测为绿色
+    '检查检测': 'success',
+    // 安装调试为黄色
+    '安装调试': 'warning',
+    // 升级改造为绿色
+    '升级改造': 'success'
   };
-  return statusMap[status] || 'default';
+  return typeMap[type] || 'default';
 };
 
-// 获取完成状态标签样式
-const getCompletionTagType = (status) => {
+// 获取优先级标签样式
+const getPriorityTagType = (priority) => {
+  const priorityMap = {
+    '高': 'danger',
+    '中': 'warning',
+    '低': 'info'
+  };
+  return priorityMap[priority] || 'default';
+};
+
+// 获取状态标签样式
+const getStatusTagType = (status) => {
   const statusMap = {
-    '未完成': 'warning',
-    '进行中': 'primary',
-    '已完成': 'success',
-    '已逾期': 'danger'
+    '已接单': 'primary',
+    '待处理': 'warning',
+    '待派单': 'warning',
+    '执行中': 'success',
+    '已完成': 'info'
   };
   return statusMap[status] || 'default';
 };
@@ -318,12 +862,6 @@ const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
 };
 
-// 导出记录
-const handleExport = () => {
-  console.log('导出派单记录');
-  // 实际应用中这里会调用导出API
-};
-
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
@@ -334,42 +872,535 @@ const handleCurrentChange = (val) => {
   currentPage.value = val;
 };
 
-// 选项卡点击
-const handleTabClick = (tab) => {
-  console.log('切换到选项卡:', tab.name);
-  // 重置筛选条件和分页
-  dispatchStatus.value = 'all';
-  executor.value = 'all';
-  dispatchDate.value = '';
-  currentPage.value = 1;
-
-  // 如果切换到其他选项卡，导航到相应页面
-  if (tab.name === 'list') {
-    router.push('/rili/gongdanguanli');
-  } else if (tab.name === 'execution') {
-    router.push('/rili/execution-records');
+// 操作按钮事件
+const handleViewDetail = async (row) => {
+  try {
+    isDetailLoading.value = true;
+    const response = await gongdanDetail(row.id);
+    if (response.code === 200 && response.data) {
+      detailData.value = response.data;
+      detailDialogVisible.value = true;
+    } else {
+      ElMessageBox.alert('获取工单详情失败', '提示', {
+        confirmButtonText: '确定',
+        type: 'error'
+      });
+    }
+  } catch (error) {
+    console.error('获取工单详情错误:', error);
+    ElMessageBox.alert('获取工单详情时发生错误', '错误', {
+      confirmButtonText: '确定',
+      type: 'error'
+    });
+  } finally {
+    isDetailLoading.value = false;
   }
 };
 
-// 操作按钮事件
-const handleViewDetails = (row) => {
-  console.log('查看派单详情:', row);
-  // 实际应用中这里会跳转到详情页
+// 关闭详情弹窗
+const closeDetailDialog = () => {
+  detailDialogVisible.value = false;
+  detailData.value = null;
 };
 
-const handleViewReport = (row) => {
-  console.log('查看报告:', row);
-  // 实际应用中这里会跳转到报告页面
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const isDetailLoading = ref(false);
+
+// 分割图片URL
+const splitImageUrls = (fileUrl) => {
+  if (!fileUrl) return [];
+  return fileUrl.split(',').filter((url) => url.trim());
 };
 
+// 处理图片加载错误
+const handleImageError = (event, index) => {
+  event.target.src = '@/assets/images/error-image.png';
+};
+
+// 根据module分组nodes
+const groupNodesByModule = (nodes) => {
+  if (!nodes || !Array.isArray(nodes)) return [];
+  const moduleMap = new Map();
+
+  nodes.forEach((node) => {
+    const module = node.module || '默认模块';
+    if (!moduleMap.has(module)) {
+      moduleMap.set(module, []);
+    }
+    moduleMap.get(module).push(node);
+  });
+
+  // 转换为数组并排序
+  return Array.from(moduleMap.entries()).map(([module, items]) => ({
+    module,
+    items: items.sort((a, b) => (a.code || 0) - (b.code || 0))
+  }));
+};
+
+const handleCancel = (row) => {
+  console.log('取消工单:', row);
+};
+
+const handleCommunicate = (row) => {
+  console.log('沟通:', row);
+  // 这里可以实现沟通功能，例如打开沟通弹窗或跳转到沟通页面
+};
+
+const handleArchive = (row) => {
+  console.log('归档:', row);
+};
+
+// 派单弹窗相关状态
+const assignDialogVisible = ref(false);
+const assignLoading = ref(false);
+const currentTaskId = ref('');
+const currentTaskInfo = ref(null); // 存储当前工单的完整信息
+const selectedExecutor = ref('');
+const executors = ref([]);
+const loadingUsers = ref(false);
+
+// 派单功能
+const handleAssign = async (row) => {
+  console.log('派单:', row);
+  currentTaskId.value = row.id;
+  currentTaskInfo.value = row; // 保存完整的工单信息
+  selectedExecutor.value = '';
+
+  try {
+    // 调用xunjianUserlist接口获取用户列表
+    loadingUsers.value = true;
+    const res = await xunjianUserlist();
+    if (res && res.code === 200 && res.rows && Array.isArray(res.rows)) {
+      // 过滤有效用户并格式化数据
+      executors.value = res.rows
+        .filter((user) => user.userId && user.userName)
+        .map((user) => ({
+          userId: user.userId.toString(),
+          userName: user.userName
+        }));
+    } else {
+      ElMessage.error('获取用户列表失败');
+    }
+  } catch (error) {
+    console.error('获取用户列表异常:', error);
+    ElMessage.error('获取用户列表失败，请稍后重试');
+  } finally {
+    loadingUsers.value = false;
+  }
+
+  // 打开派单弹窗
+  assignDialogVisible.value = true;
+};
+
+// 确认派单
+const confirmAssign = async () => {
+  if (!selectedExecutor.value) {
+    ElMessage.warning('请选择执行人');
+    return;
+  }
+
+  try {
+    assignLoading.value = true;
+    // 调用updategongdan接口来执行派单操作
+    // 从执行人列表中查找选中的执行人信息
+    const selectedExecutorInfo = executors.value.find((item) => item.userId === selectedExecutor.value);
+
+    // 先获取完整的工单详情
+    const detailResponse = await gongdanDetail(currentTaskId.value);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+
+    // 获取完整的工单数据
+    const workOrderDetail = detailResponse.data;
+
+    // 在完整工单数据基础上进行修改
+    const updateData = {
+      ...workOrderDetail,
+      // 状态更新为已派单（根据系统状态映射，2表示已派单）
+      status: 2,
+      // 设置执行人ID
+      handler: selectedExecutor.value,
+      // 设置执行人姓名
+      handlerName: selectedExecutorInfo?.userName || '',
+      // 设置派单人ID
+      getOrderPerson: selectedExecutor.value,
+      sendPerson: selectedExecutor.value,
+      // 设置派单人Vo对象（包含id和userName）
+      getOrderPersonVo: selectedExecutorInfo
+        ? {
+            id: selectedExecutor.value,
+            userName: selectedExecutorInfo.userName
+          }
+        : null,
+      // 更新时间
+      updateTime: new Date().toISOString(),
+      // 设置派单时间
+      sendOrderTime: new Date().toISOString(),
+      // 确保类型字段正确
+      type: workOrderDetail.type || 1
+    };
+
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('派单成功');
+      assignDialogVisible.value = false;
+
+      // 刷新工单列表以显示更新后的状态
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error(response.msg || '派单失败');
+    }
+  } catch (error) {
+    console.error('派单异常:', error);
+    ElMessage.error('派单失败，请稍后重试');
+  } finally {
+    assignLoading.value = false;
+  }
+};
+
+// 取消派单
+const cancelAssign = () => {
+  assignDialogVisible.value = false;
+  selectedExecutor.value = '';
+  currentTaskId.value = '';
+};
+
+// 跟踪功能 - 已接单状态
+const handleFollow = (row) => {
+  console.log('跟踪:', row);
+  // 实现跟踪功能
+};
+
+// 设置跟踪功能 - 已派单状态
+const handleSetTrack = async (row) => {
+  try {
+    // 获取当前point值，默认为2（不跟踪）
+    const currentPoint = row.point || '2';
+    // 确定新的point值和操作类型
+    const newPoint = currentPoint === '1' ? '2' : '1';
+    const operationText = currentPoint === '1' ? '取消跟踪' : '设置跟踪';
+
+    // 弹出确认对话框
+    await ElMessageBox.confirm(`确定要${operationText}该工单吗？`, '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+
+    // 获取完整的工单详情
+    const detailResponse = await gongdanDetail(row.id);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+
+    // 获取完整的工单数据
+    const workOrderDetail = detailResponse.data;
+
+    // 在完整工单数据基础上进行修改
+    const updateData = {
+      ...workOrderDetail,
+      // 切换point值：1表示跟踪，2表示不跟踪
+      point: newPoint,
+      // 更新时间
+      updateTime: new Date().toISOString()
+    };
+
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success(`${operationText}成功`);
+      // 刷新工单列表以显示更新后的状态
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error(response.msg || `${operationText}失败`);
+    }
+  } catch (error) {
+    if (error === 'cancel') {
+      // 用户取消操作，不做处理
+      return;
+    }
+    console.error('设置跟踪异常:', error);
+    ElMessage.error('设置跟踪失败，请稍后重试');
+  }
+};
+
+// 编辑工单
+const handleEdit = async (row) => {
+  console.log('编辑工单:', row);
+  try {
+    // 获取工单详情
+    const detailResponse = await gongdanDetail(row.id);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+    const workOrderDetail = detailResponse.data;
+
+    // 填充表单数据
+    createForm.title = workOrderDetail.title || '';
+    createForm.type = mapCodeToType(workOrderDetail.type) || '维护保养';
+    createForm.priority = mapCodeToPriority(workOrderDetail.level) || '低';
+    createForm.deadline = workOrderDetail.endTime ? formatDate(workOrderDetail.endTime) : '';
+    createForm.description = workOrderDetail.info || '';
+    createForm.location = workOrderDetail.position || '';
+    createForm.relatedEquipment = workOrderDetail.device || '';
+    createForm.file = workOrderDetail.fileId || '';
+    createForm.resultDescription = workOrderDetail.results || '';
+    createForm.needAssignee = !!workOrderDetail.executor;
+
+    // 填充步骤数据：从nodes数组中提取并按code排序
+    if (workOrderDetail.nodes && Array.isArray(workOrderDetail.nodes)) {
+      // 复制nodes数组并按code升序排序
+      const sortedNodes = [...workOrderDetail.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+      // 转换为createForm.steps所需的格式
+      createForm.steps = sortedNodes.map((node) => ({
+        name: node.name || '',
+        intendedPurpose: node.intendedPurpose || '',
+        intendedTime: node.intendedTime ? formatDate(node.intendedTime, 'YYYY-MM-DD HH:mm') : ''
+      }));
+      // 确保至少有一个空步骤
+      if (createForm.steps.length === 0) {
+        createForm.steps = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+      }
+    } else {
+      // 如果没有nodes数据，重置为默认的一个空步骤
+      createForm.steps = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+    }
+
+    // 存储当前编辑的工单ID，用于区分是创建还是编辑操作
+    editingWorkOrderId.value = row.id;
+
+    // 保存原始创建时间
+    originalCreateTime.value = workOrderDetail.createTime || '';
+
+    // 打开新增工单的弹窗
+    createDialogVisible.value = true;
+  } catch (error) {
+    console.error('打开编辑工单弹窗过程中发生错误:', error);
+    ElMessage.error('打开编辑工单弹窗失败');
+  }
+};
+
+// 编辑状态下的工单ID
+const editingWorkOrderId = ref('');
+
+// 保存原始创建时间（编辑工单时使用）
+const originalCreateTime = ref('');
+
+// 查看工单进度
 const handleViewProgress = (row) => {
-  console.log('查看进度:', row);
-  // 实际应用中这里会跳转到进度页面
+  console.log('查看工单进度:', row);
+  // 实现查看进度功能
 };
 
-const handleTrack = (row) => {
-  console.log('跟踪工单:', row);
-  // 实际应用中这里会跳转到跟踪页面或打开跟踪弹窗
+// 编辑工单弹窗相关
+const createDialogVisible = ref(false);
+const createFormRef = ref(null);
+
+const createForm = reactive({
+  title: '',
+  type: '',
+  priority: '',
+  deadline: '',
+  description: '',
+  location: '',
+  relatedEquipment: '',
+  steps: [{ name: '', intendedPurpose: '', intendedTime: '' }], // 工单步骤数组
+  file: '',
+  fileList: [],
+  resultDescription: '',
+  needAssignee: 'false'
+});
+
+const createFormRules = {
+  title: [{ required: true, message: '请输入工单标题', trigger: 'blur' }],
+  type: [{ required: true, message: '请选择工单类型', trigger: 'change' }],
+  priority: [{ required: true, message: '请选择优先级', trigger: 'change' }],
+  deadline: [{ required: true, message: '请选择截止时间', trigger: 'change' }],
+  description: [{ required: true, message: '请输入工单描述', trigger: 'blur' }],
+  location: [{ required: true, message: '请输入执行地点', trigger: 'blur' }],
+  needAssignee: [{ required: true, message: '请选择是否需要指定执行人', trigger: 'change' }]
+};
+
+// 添加试验步骤
+const addStep = () => {
+  createForm.steps.push({ name: '', intendedPurpose: '', intendedTime: '' });
+};
+
+// 删除试验步骤
+const deleteStep = (index) => {
+  // 确保至少保留一个步骤
+  if (createForm.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  createForm.steps.splice(index, 1);
+};
+
+// 提交编辑工单
+const submitCreate = async () => {
+  // 表单验证
+  if (!createFormRef.value) return;
+
+  try {
+    await createFormRef.value.validate();
+
+    // 准备步骤数据
+    const stepsData = createForm.steps
+      .filter((step) => step.name.trim() && step.intendedPurpose.trim())
+      .map((step, index) => ({
+        createTime: new Date().toISOString(),
+        updateTime: new Date().toISOString(),
+        params: {},
+        module: 1,
+        code: index + 1,
+        name: step.name,
+        intendedPurpose: step.intendedPurpose,
+        intendedTime: step.intendedTime ? new Date(step.intendedTime).toISOString() : new Date().toISOString(),
+        finishTime: '',
+        remark: '',
+        status: 1 // 使用数字值而不是字符串，确保状态字段不为空
+      }));
+
+    // 编辑模式下，需要为每个步骤添加id，并调用updatejiedian接口
+    let nodeIds = '';
+    if (editingWorkOrderId.value) {
+      // 获取工单详情，以获取原始步骤的id
+      const detailResponse = await gongdanDetail(editingWorkOrderId.value);
+      if (detailResponse.code !== 200) {
+        ElMessage.error('获取工单详情失败');
+        return;
+      }
+
+      const workOrderDetail = detailResponse.data;
+      if (workOrderDetail.nodes && Array.isArray(workOrderDetail.nodes)) {
+        // 按code排序原始nodes数组
+        const sortedNodes = [...workOrderDetail.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+
+        // 为新的步骤数据添加id
+        const updatedSteps = stepsData.map((step, index) => ({
+          ...step,
+          id: sortedNodes[index]?.id || 0 // 使用原始步骤的id，如果不存在则使用0
+        }));
+
+        // 调用updatejiedian接口更新步骤，直接传递数组
+        const updateResponse = await updatejiedian(updatedSteps);
+        if (updateResponse.code !== 200) {
+          ElMessage.error('更新步骤失败');
+          return;
+        }
+
+        // 使用原始的nodeIds，避免重新创建步骤
+        nodeIds = workOrderDetail.nodeIds;
+      }
+    } else {
+      // 创建模式下，调用addjiedian接口，直接传递数组
+      const jiedianResponse = await addjiedian(stepsData);
+
+      if (jiedianResponse.code !== 200) {
+        ElMessage.error('创建步骤失败');
+        return;
+      }
+
+      // 获取返回的ids，实际返回格式中msg字段包含ids字符串，data为null
+      if (jiedianResponse.code === 200 && jiedianResponse.msg) {
+        nodeIds = jiedianResponse.msg;
+      } else {
+        ElMessage.warning('未获取到有效的步骤ID');
+        return;
+      }
+    }
+
+    // 准备工单数据
+    const workOrderData = {
+      // 编辑模式下使用原始创建时间
+      createTime: originalCreateTime.value,
+      updateTime: new Date().toISOString(),
+      params: {},
+      module: 1,
+      projectId: 1,
+      title: createForm.title,
+      type: mapTypeToCode(createForm.type),
+      level: mapPriorityToCode(createForm.priority),
+      endTime: createForm.deadline ? new Date(createForm.deadline).toISOString() : '',
+      info: createForm.description,
+      position: createForm.location,
+      device: createForm.relatedEquipment || '',
+      fileId: createForm.file ? createForm.file : '',
+      nodeIds: nodeIds,
+      results: createForm.resultDescription || '',
+      status: 1, // 待派单 1待派单2已派单3执行中4已完成
+      sendOrderTime: '', // 只有在派单并选择人员后才赋值
+      getOrderTime: '',
+      finishiOrderTime: '',
+      orderResult: '', // 验收结果1通过2需整改
+      point: '2', // 默认不跟踪（2表示不跟踪，1表示跟踪）
+      createDept: '',
+      createBy: '',
+      handlerDept: '',
+      handler: '',
+      handlerName: ''
+    };
+
+    // 编辑操作：调用updategongdan接口
+    const updateData = {
+      ...workOrderData,
+      id: editingWorkOrderId.value
+    };
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('工单编辑成功');
+      createDialogVisible.value = false;
+
+      // 重置表单
+      Object.keys(createForm).forEach((key) => {
+        if (key === 'steps') {
+          createForm[key] = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+        } else if (key === 'fileList') {
+          createForm[key] = [];
+        } else {
+          createForm[key] = '';
+        }
+      });
+      createForm.needAssignee = 'false';
+
+      // 重置编辑状态
+      editingWorkOrderId.value = '';
+      originalCreateTime.value = '';
+
+      // 刷新工单列表
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error('工单编辑失败');
+    }
+  } catch (error) {
+    console.error('编辑工单过程中发生错误:', error);
+    ElMessage.error(`编辑工单过程中发生错误: ${error.message || '未知错误'}`);
+  }
+};
+
+// 取消编辑工单
+const cancelCreate = () => {
+  createDialogVisible.value = false;
+  // 重置表单
+  Object.keys(createForm).forEach((key) => {
+    if (key === 'steps') {
+      createForm[key] = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+    } else if (key === 'fileList') {
+      createForm[key] = [];
+    } else {
+      createForm[key] = '';
+    }
+  });
+  createForm.needAssignee = 'false';
+  editingWorkOrderId.value = '';
 };
 
 // 导航路由跳转
@@ -389,7 +1420,7 @@ const handleInspection5 = () => {
   router.push('/rili/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanguanli');
+  router.push('/rili/gongdanliebiao');
 };
 const handleInspection7 = () => {
   router.push('/rili/renyuanzhuangtai');
@@ -404,15 +1435,60 @@ const handleInspectionManagement2 = () => {
 const handleInspectionManagement3 = () => {
   router.push('/rili/zhixingjilu');
 };
+
+// 关闭详情弹窗
+const handleCloseDetailDialog = () => {
+  detailDialogVisible.value = false;
+};
 </script>
 
 <style scoped>
+@import url('./css/detail-dialog.css');
+@import url('./css/step-bars.css');
 .dispatch-records {
   padding: 20px;
   background-color: #f5f7fa;
   min-height: 100vh;
 }
 
+/* 步骤表单样式 */
+.steps-container {
+  width: 100%;
+}
+
+.step-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 10px;
+}
+
+.step-number {
+  width: 30px;
+  height: 30px;
+  background-color: #409eff;
+  color: white;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 10px;
+  flex-shrink: 0;
+}
+
+.add-step-btn {
+  margin-top: 10px;
+  color: #409eff;
+}
+
+.add-step-btn:hover {
+  color: #66b1ff;
+  background-color: #ecf5ff;
+}
+
+.delete-step-btn {
+  margin-top: 5px;
+}
+
 /* 选项卡样式 */
 .tabs-wrapper {
   background-color: #fff;
@@ -499,29 +1575,10 @@ const handleInspectionManagement3 = () => {
   flex-shrink: 0;
 }
 
-.search-btn {
-  background-color: #f2f3f5;
-  color: #303133;
-  border-color: #f2f3f5;
-  transition: all 0.2s ease;
-}
-
-.search-btn:hover {
-  background-color: #e5e6eb;
-  color: #303133;
-  border-color: #e5e6eb;
-}
-
-.export-btn {
-  color: #165dff;
-  border: 1px solid #165dff;
-  transition: all 0.2s ease;
-}
-
-.export-btn:hover {
-  background-color: #e8f3ff;
-  color: #0e42d2;
-  border-color: #0e42d2;
+.search-btn,
+.create-btn {
+  height: 36px;
+  border-radius: 4px;
 }
 
 /* 统计卡片样式 */
@@ -642,8 +1699,9 @@ const handleInspectionManagement3 = () => {
   background-color: #ecf5ff;
 }
 
-.status-tag,
-.completion-tag {
+.type-tag,
+.priority-tag,
+.status-tag {
   padding: 2px 8px;
   border-radius: 4px;
   font-size: 12px;
@@ -651,41 +1709,24 @@ const handleInspectionManagement3 = () => {
 
 /* 操作按钮样式 */
 .action-btn {
+  color: #165dff;
   font-size: 12px;
   padding: 4px 8px;
   margin: 0 2px;
-  transition: all 0.2s ease;
 }
 
 .action-btn:hover {
-  background-color: #e8f3ff;
-}
-
-.report-btn {
-  color: #52c41a;
-}
-
-.report-btn:hover {
-  color: #389e0d;
-  background-color: #f6ffed;
-}
-
-.progress-btn {
-  color: #165dff;
-}
-
-.progress-btn:hover {
   color: #0e42d2;
   background-color: #e8f3ff;
 }
 
-.track-btn {
-  color: #fa8c16;
+.cancel-btn {
+  color: #f56c6c;
 }
 
-.track-btn:hover {
-  color: #e67700;
-  background-color: #fff7e6;
+.cancel-btn:hover {
+  color: #e64340;
+  background-color: #fff2f0;
 }
 
 /* 分页区域样式 */
@@ -763,6 +1804,404 @@ const handleInspectionManagement3 = () => {
   user-select: none;
 }
 
+/* 弹窗样式 */
+.create-dialog {
+  border-radius: 12px;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.15);
+  overflow: hidden;
+}
+
+.create-dialog .el-dialog__header {
+  padding: 20px 24px;
+  border-bottom: 1px solid #f0f0f0;
+  background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+}
+
+.create-dialog .el-dialog__title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  letter-spacing: 0.5px;
+}
+
+.create-dialog .el-dialog__body {
+  padding: 24px;
+  background-color: #ffffff;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+.custom-form .el-form-item {
+  margin-bottom: 20px;
+}
+
+.custom-form .el-form-item__label {
+  font-size: 14px;
+  color: #303133;
+  font-weight: 500;
+  padding: 10px 0;
+}
+
+/* 表单元素美化 */
+.custom-form .el-input__inner,
+.custom-form .el-select .el-input__inner,
+.custom-form .el-date-picker .el-input__inner {
+  border-radius: 6px;
+  border-color: #dcdfe6;
+  transition: all 0.3s ease;
+  height: 40px;
+  padding: 0 15px;
+  font-size: 14px;
+  background-color: #fff;
+}
+
+.custom-form .el-input__inner:hover,
+.custom-form .el-select .el-input__inner:hover,
+.custom-form .el-date-picker .el-input__inner:hover {
+  border-color: #c0c4cc;
+}
+
+.custom-form .el-input__inner:focus,
+.custom-form .el-select .el-input__inner:focus,
+.custom-form .el-date-picker .el-input__inner:focus {
+  border-color: #165dff;
+  box-shadow: 0 0 0 2px rgba(22, 93, 255, 0.1);
+}
+
+/* 文本域美化 */
+.custom-form .el-textarea__inner {
+  border-radius: 6px;
+  border-color: #dcdfe6;
+  transition: all 0.3s ease;
+  padding: 10px 15px;
+  font-size: 14px;
+  resize: vertical;
+  min-height: 100px;
+}
+
+.custom-form .el-textarea__inner:hover {
+  border-color: #c0c4cc;
+}
+
+.custom-form .el-textarea__inner:focus {
+  border-color: #165dff;
+  box-shadow: 0 0 0 2px rgba(22, 93, 255, 0.1);
+}
+
+/* 单选按钮美化 */
+.custom-form .el-radio-group {
+  display: flex;
+  gap: 20px;
+  padding: 5px 0;
+}
+
+.custom-form .el-radio {
+  font-size: 14px;
+  color: #303133;
+}
+
+.custom-form .el-radio__label {
+  padding-left: 8px;
+}
+
+/* 弹窗按钮美化 */
+.create-dialog .dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  padding: 16px 24px;
+  background-color: #fafafa;
+  border-top: 1px solid #f0f0f0;
+}
+
+.create-dialog .dialog-footer .el-button {
+  padding: 10px 24px;
+  border-radius: 6px;
+  font-size: 14px;
+  font-weight: 500;
+  transition: all 0.3s ease;
+  height: 40px;
+}
+
+.create-dialog .dialog-footer .el-button:first-child {
+  background-color: #f5f7fa;
+  color: #606266;
+  border-color: #f5f7fa;
+}
+
+.create-dialog .dialog-footer .el-button:first-child:hover {
+  background-color: #e6e8eb;
+  color: #303133;
+  border-color: #e6e8eb;
+}
+
+.create-dialog .dialog-footer .el-button:nth-child(2) {
+  background-color: #f5f7fa;
+  color: #606266;
+  border-color: #dcdfe6;
+}
+
+.create-dialog .dialog-footer .el-button:nth-child(2):hover {
+  background-color: #e6e8eb;
+  color: #303133;
+  border-color: #c0c4cc;
+}
+
+.create-dialog .dialog-footer .el-button:last-child {
+  background-color: #165dff;
+  border-color: #165dff;
+  color: #fff;
+}
+
+.create-dialog .dialog-footer .el-button:last-child:hover {
+  background-color: #0e42d2;
+  border-color: #0e42d2;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.3);
+}
+
+/* 表单验证反馈 */
+.custom-form .el-form-item.is-error .el-input__inner,
+.custom-form .el-form-item.is-error .el-select .el-input__inner {
+  border-color: #f56c6c;
+}
+
+.custom-form .el-form-item.is-error .el-input__inner:focus,
+.custom-form .el-form-item.is-error .el-select .el-input__inner:focus {
+  border-color: #f56c6c;
+  box-shadow: 0 0 0 2px rgba(245, 108, 108, 0.1);
+}
+
+/* 详情弹窗样式 - 与工单列表页面保持一致 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
+}
+
+.task-detail-container {
+  padding: 10px 0;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+}
+
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
+  font-size: 14px;
+}
+
+/* 骨架屏样式 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.skeleton-card {
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.skeleton-header {
+  height: 20px;
+  width: 30%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 12px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-row {
+  height: 16px;
+  width: 100%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+/* 优先级标签样式 */
+.task-status {
+  padding: 4px 10px;
+  border-radius: 6px;
+  font-size: 12px;
+  font-weight: 500;
+  border: 1px solid transparent;
+}
+
+.priority-high {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border-color: #ffccc7;
+}
+
+.priority-medium {
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border-color: #ffe58f;
+}
+
+.priority-low {
+  background-color: #e6f7ff;
+  color: #1890ff;
+  border-color: #91d5ff;
+}
+
+.description-content,
+.result-content {
+  padding: 12px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  line-height: 1.6;
+  color: #4e5969;
+  font-size: 13px;
+}
+
+.steps-container {
+  padding: 16px;
+  background-color: #fafafa;
+  border-radius: 4px;
+}
+
+.module-group {
+  margin-bottom: 24px;
+}
+
+.module-title {
+  font-size: 14px;
+  font-weight: bold;
+  margin-bottom: 12px;
+  color: #333;
+}
+
+/* 多图片展示容器样式 */
+.images-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-top: 12px;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 8px;
+}
+
+/* 单个图片项样式 */
+.image-item {
+  flex: 0 0 auto;
+  width: 200px; /* 固定宽度 */
+  height: 160px; /* 固定高度 */
+  border-radius: 6px;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: transform 0.3s ease;
+}
+
+.image-item:hover {
+  transform: scale(1.03);
+}
+
+/* 图片样式 */
+.detail-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持比例填充容器 */
+  display: block;
+}
+
+/* 图片加载失败样式 */
+.detail-image[src=''] {
+  background-color: #f0f0f0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #999;
+  font-size: 12px;
+}
+
+.custom-steps .el-step__description {
+  white-space: pre-wrap;
+  font-size: 12px;
+  color: #666;
+  line-height: 1.4;
+}
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 60px 0;
+  color: #999;
+}
+
+/* 派单弹窗样式 */
+.assign-dialog-content {
+  padding: 10px 0;
+}
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+.form-label {
+  display: block;
+  margin-bottom: 8px;
+  font-weight: 500;
+  color: #606266;
+}
+
 /* 响应式设计 */
 @media (max-width: 1200px) {
   .filter-container {
@@ -780,16 +2219,7 @@ const handleInspectionManagement3 = () => {
     width: 100%;
   }
 }
-.create-btn {
-  background-color: #165dff;
-  border-color: #165dff;
-  transition: all 0.2s ease;
-}
 
-.create-btn:hover {
-  background-color: #0e42d2;
-  border-color: #0e42d2;
-}
 @media (max-width: 768px) {
   .dispatch-records {
     padding: 10px;
@@ -805,20 +2235,15 @@ const handleInspectionManagement3 = () => {
     font-size: 12px;
   }
 
-  .statistics-cards {
-    grid-template-columns: 1fr 1fr;
-  }
-
   .pagination-section {
     flex-direction: column;
     align-items: flex-start;
     gap: 10px;
   }
-}
 
-@media (max-width: 480px) {
-  .statistics-cards {
-    grid-template-columns: 1fr;
+  .detail-item {
+    flex: 0 0 100%;
+    padding-right: 0;
   }
 }
 </style>
diff --git a/src/views/zhinengxunjian/qiangxiuguanli.vue b/src/views/zhinengxunjian/qiangxiuguanli.vue
index dce3346..8e4f360 100644
--- a/src/views/zhinengxunjian/qiangxiuguanli.vue
+++ b/src/views/zhinengxunjian/qiangxiuguanli.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="inspection-tasks">
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -9,9 +9,7 @@
         <div class="nav-tab active" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
-      <!-- 页面标题 -->
-      <TitleComponent title="抢修管理模块" subtitle="处理紧急抢修任务，跟踪抢修进度和记录"></TitleComponent>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -50,8 +48,8 @@
             </el-select>
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch"> 搜索 </el-button>
-            <el-button type="primary" icon="el-icon-plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
       </div>
@@ -59,55 +57,42 @@
       <!-- 任务卡片列表 -->
       <div class="task-cards">
         <div class="task-card" v-for="(task, index) in pagedTasks" :key="index" :class="task.leftLineClass">
-          <!-- 顶部信息区域 -->
           <div class="task-header">
             <div class="task-title">
               {{ task.title }}
             </div>
-            <div class="task-type-tag" :class="getFaultTypeClass(task.faultType)">
-              {{ task.faultType }}
+            <!-- 恢复优先级标签背景色样式 -->
+            <div class="task-status" :class="task.priorityClass">
+              {{ task.priority }}
             </div>
           </div>
 
-          <!-- 滚动内容容器 -->
-          <div class="task-content-scroll">
-            <div class="task-details">
-              <div class="detail-item">
-                <span class="detail-label">报修时间</span>
-                <span class="detail-value">{{ task.reportTime }}</span>
-              </div>
-              <div class="detail-item">
-                <span class="detail-label">报修人</span>
-                <span class="detail-value">{{ task.reporter }}</span>
-              </div>
-              <div class="detail-item">
-                <span class="detail-label">维修人</span>
-                <span class="detail-value">{{ task.maintainer }}</span>
-              </div>
-              <div class="detail-item">
-                <span class="detail-label">预计完成</span>
-                <span class="detail-value">{{ task.expectedCompleteTime }}</span>
-              </div>
-              <div class="detail-item">
-                <span class="detail-label">状态</span>
-                <span class="detail-value">{{ task.statusText }}</span>
-              </div>
+          <div class="task-details">
+            <div class="detail-item">
+              <span class="detail-label">报修时间</span>
+              <span class="detail-value">{{ task.createTime }}</span>
+            </div>
+            <div class="detail-item">
+              <span class="detail-label">报修人</span>
+              <span class="detail-value">{{ task.reporter }}</span>
+            </div>
+            <div class="detail-item">
+              <span class="detail-label">维修人</span>
+              <span class="detail-value">{{ task.maintainer }}</span>
+            </div>
 
-              <!-- 已完成状态的额外信息 -->
-              <div v-if="task.status === 'completed'" class="task-result">
-                <span class="detail-label">完成时间</span>
-                <span class="detail-value">{{ task.completeTime }}</span>
-              </div>
-
-              <!-- 执行中状态的额外信息 -->
-              <div v-if="task.status === 'executing'" class="detail-item">
-                <span class="detail-label">开始时间</span>
-                <span class="detail-value">{{ task.startTime || '30分钟前' }}</span>
-              </div>
-              <div v-if="task.status === 'executing'" class="detail-item">
-                <span class="detail-label">进度</span>
-                <span class="detail-value">{{ task.progress || '60%' }}</span>
-              </div>
+            <div class="detail-item">
+              <span class="detail-label">状态</span>
+              <span class="detail-value">{{ task.statusText }}</span>
+            </div>
+            <div class="detail-item">
+              <span class="detail-label">期望处理时间：</span>
+              <span class="detail-label">{{ task.expectedTime || '——' }}</span>
+            </div>
+            <!-- 已完成状态的额外信息 -->
+            <div v-if="task.status === 'completed'" class="task-result">
+              <span class="detail-label">完成时间</span>
+              <span class="detail-value">{{ task.completeTime }}</span>
             </div>
           </div>
 
@@ -155,6 +140,7 @@
             <el-col :span="12">
               <el-form-item label="抢修类型*" prop="repairType">
                 <el-select v-model="createTaskForm.repairType" placeholder="请选择类型">
+                  <el-option label="电力故障" value="electric" />
                   <el-option label="设备故障" value="device" />
                   <el-option label="软件故障" value="software" />
                   <el-option label="网络故障" value="network" />
@@ -167,8 +153,7 @@
                 <el-select v-model="createTaskForm.priority" placeholder="请选择紧急程度">
                   <el-option label="致命" value="fatal" />
                   <el-option label="紧急" value="urgent" />
-                  <el-option label="较危险" value="dangerous" />
-                  <el-option label="一般" value="normal" />
+                  <el-option label="常规" value="normal" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -182,18 +167,26 @@
               placeholder="详细描述故障现象、影响范围、潜在威胁等信息"
             />
           </el-form-item>
-
+          <el-form-item label="预计完成时间*" prop="expectedTime">
+            <el-date-picker
+              v-model="createTaskForm.expectedTime"
+              type="datetime"
+              :min-date="new Date()"
+              placeholder="选择预计完成时间"
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              @change="validateTime"
+              style="width: 100%"
+            />
+          </el-form-item>
           <el-form-item label="故障位置*" prop="faultLocation">
             <el-input v-model="createTaskForm.faultLocation" placeholder="例如：A区102" />
           </el-form-item>
 
-          <el-form-item label="上传图片(可选)">
-            <div class="upload-container">
-              <div class="upload-box">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
-                <div class="upload-text">点击或拖拽图片至此处上传</div>
-                <div class="upload-hint">支持JPG、PNG格式，最多3张</div>
-              </div>
+          <el-form-item label="上传图片(可选)*">
+            <image-upload v-model="createTaskForm.file" />
+            <div v-if="createTaskForm.fileList && createTaskForm.fileList.length > 0" class="upload-tip">
+              <span style="color: #1989fa">已选择{{ createTaskForm.fileList.length }}张图片，将在提交时上传</span>
             </div>
           </el-form-item>
 
@@ -225,153 +218,220 @@
           </span>
         </template>
       </el-dialog>
+
+      <!-- 任务详情弹窗 -->
+      <el-dialog
+        v-model="detailDialogVisible"
+        title="抢修任务详情"
+        width="800px"
+        :before-close="handleCloseDetailDialog"
+        class="custom-experiment-dialog"
+      >
+        <div v-if="detailData" class="task-detail-container">
+          <!-- 加载状态骨架屏 -->
+          <div v-if="isDetailLoading" class="skeleton-loading">
+            <div class="skeleton-card">
+              <div class="skeleton-header"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+              </div>
+            </div>
+            <div class="skeleton-card">
+              <div class="skeleton-header"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+              </div>
+            </div>
+            <div class="skeleton-card">
+              <div class="skeleton-header"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-row"></div>
+                <div class="skeleton-row"></div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 任务基本信息卡片 -->
+          <div class="detail-card">
+            <h3 class="card-title">任务基本信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">任务ID：</span>
+                  <span class="info-value">{{ detailData.id || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">任务名称：</span>
+                  <span class="info-value">{{ detailData.name || '未命名' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">任务状态：</span>
+                  <span class="info-value">{{ getStatusText(detailData.status) }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">任务等级：</span>
+                  <span class="info-value">{{ getPriorityText(detailData.level) }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">任务类型：</span>
+                  <span class="info-value">{{ getFaultTypeText(detailData.type) }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">创建时间：</span>
+                  <span class="info-value">{{ formatDate(detailData.createTime) }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 报修人信息卡片 -->
+          <div class="detail-card">
+            <h3 class="card-title">报修人信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">报修人：</span>
+                  <span class="info-value">{{ detailData.reportName || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">联系电话：</span>
+                  <span class="info-value">{{ detailData.reportPhone || '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">维修人：</span>
+                  <span class="info-value">{{ detailData.sendPersonVo?.userName || '-' }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="detail-card">
+            <h3 class="card-title">报修详情</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item full-width">
+                  <span class="info-label">故障位置：</span>
+                  <span class="info-value">{{ detailData.position || '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item full-width">
+                  <span class="info-label">详细描述：</span>
+                  <span class="info-value">{{ detailData.reportInfo || '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">期望处理时间：</span>
+                  <span class="info-value">{{ detailData.expectedTime || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">现场支持：</span>
+                  <span class="info-value">{{ detailData.support || '-' }}</span>
+                </div>
+              </div>
+              <!-- 已完成状态的额外信息 -->
+              <div v-if="detailData.status === '3'" class="info-row">
+                <div class="info-item">
+                  <span class="info-label">完成时间：</span>
+                  <span class="info-value">{{ formatDate(detailData.reportFinishTime) }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 故障图片 -->
+          <div v-if="detailData.fileUrl && detailData.fileUrl.length > 0" class="detail-card">
+            <h3 class="card-title">故障图片</h3>
+            <div class="card-content">
+              <div class="images-container">
+                <!-- 将逗号分隔的URL字符串拆分为数组并循环展示 -->
+                <div v-for="(url, index) in splitImageUrls(detailData.fileUrl)" :key="index" class="image-item">
+                  <img
+                    :src="url"
+                    :alt="`故障图片 ${index + 1}`"
+                    class="detail-image"
+                    @error="handleImageError($event, index)"
+                    style="max-width: 100%; max-height: 200px; border-radius: 4px"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-else class="loading-state">
+          <i class="el-icon-loading el-icon--loading"></i>
+          <span>加载中...</span>
+        </div>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="handleCloseDetailDialog">关闭</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </div>
+
+    <!-- 处理结果输入弹窗 -->
+    <el-dialog v-model="resultDialogVisible" title="处理结果输入" class="beautiful-dialog">
+      <div class="result-dialog-content">
+        <el-form ref="resultFormRef" :model="{ reportFinal: reportFinal }" :rules="resultFormRules" label-width="80px">
+          <el-form-item label="处理结果" prop="reportFinal">
+            <el-input v-model="reportFinal" type="textarea" :rows="6" placeholder="请输入处理结果详情" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="resultDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleSaveResult">保存</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 分配任务弹窗 -->
+    <el-dialog title="分配抢修任务" v-model="assignDialogVisible" width="400px" :before-close="handleCloseAssign">
+      <el-form ref="assignTaskFormRef" :model="assignTaskForm" :rules="assignTaskRules" label-width="100px">
+        <el-form-item label="维修人员" prop="sendPerson">
+          <el-select v-model="assignTaskForm.sendPerson" placeholder="请选择维修人" :loading="loadingUsers">
+            <el-option v-for="user in usersList" :key="user.id" :label="user.name" :value="user.id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseAssign">取消</el-button>
+          <el-button type="primary" @click="handleSubmitAssign">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import { ref, computed } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
-
-// 激活的选项卡
-const activeTab = ref('task');
-
-// 根据故障类型获取对应的CSS类
-const getFaultTypeClass = (faultType) => {
-  const typeMap = {
-    '电力故障': 'electric',
-    '设备故障': 'equipment',
-    '供水问题': 'water',
-    '设备损坏': 'damage',
-    '网络中断': 'network',
-    '制冷系统故障': 'cooling',
-    '安全问题': 'safety'
-  };
-  return typeMap[faultType] || '';
-};
-
-// 筛选条件
-const repairType = ref('all');
+import { ElMessage } from 'element-plus';
+import { qiangxiuDetail, qiangxiulist, addqiangxiu, updateqiangxiu } from '@/api/zhinengxunjian/qiangxiu';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
 const taskStatus = ref('all');
-const emergencyLevel = ref('all');
 const planType = ref('all');
 const executor = ref('all');
-
-// 任务数据 - 使用leftLineClass控制左侧状态线，统一按钮样式
-const tasks = ref([
-  {
-    title: '主配电室短路故障',
-    status: 'executing',
-    statusText: '抢修中',
-    leftLineClass: 'left-line-high', // 致命级-红色左侧线
-    priority: '致命',
-    reportTime: '10分钟前',
-    reporter: '李阳',
-    maintainer: '张明',
-    expectedCompleteTime: '30分钟内',
-    faultType: '电力故障',
-    faultLocation: '地下一层主配电室',
-    startTime: '10分钟前',
-    progress: '40%',
-    remarks: '已切断该区域电源，正在排查短路点',
-    actionText: '实时跟进',
-    actionClass: 'follow-btn'
-  },
-  {
-    title: '三楼卫生间漏水',
-    status: 'executing',
-    statusText: '抢修中',
-    leftLineClass: 'left-line-medium', // 紧急级-黄色左侧线
-    priority: '紧急',
-    reportTime: '45分钟前',
-    reporter: '李阳',
-    maintainer: '张明',
-    expectedCompleteTime: '1小时内',
-    faultType: '供水问题',
-    faultLocation: '三楼东侧卫生间',
-    startTime: '40分钟前',
-    progress: '70%',
-    remarks: '已找到漏水点，正在进行修复',
-    actionText: '实时跟进',
-    actionClass: 'follow-btn'
-  },
-  {
-    title: '网络主干交换机故障',
-    status: 'completed',
-    statusText: '已完成',
-    leftLineClass: 'left-line-completed', // 已完成-绿色左侧线
-    priority: '较危险',
-    reportTime: '1小时前',
-    reporter: '李阳',
-    maintainer: '张明',
-    expectedCompleteTime: '1小时内',
-    faultType: '网络中断',
-    faultLocation: '二楼机房',
-    completeTime: '2小时前',
-    remarks: '交换机电源模块故障，已更换备用模块',
-    actionText: '查看报告',
-    actionClass: 'evaluate-btn'
-  },
-  {
-    title: '安全出口指示牌损坏',
-    status: 'pending',
-    statusText: '待处理',
-    leftLineClass: 'left-line-medium', // 较危险级-黄色左侧线
-    priority: '较危险',
-    reportTime: '3小时前',
-    reporter: '李阳',
-    maintainer: '未分配',
-    expectedCompleteTime: '今天以内',
-    faultType: '设备损坏',
-    faultLocation: '一楼东侧安全通道',
-    remarks: '指示牌不亮，可能是线路问题',
-    actionText: '分配任务',
-    actionClass: 'assign-btn'
-  },
-  {
-    title: '制冷系统主压缩机故障',
-    status: 'executing',
-    statusText: '抢修中',
-    leftLineClass: 'left-line-high', // 致命级-红色左侧线
-    priority: '致命',
-    reportTime: '1小时前',
-    reporter: '李阳',
-    maintainer: '张明',
-    expectedCompleteTime: '45分钟内',
-    faultType: '制冷系统故障',
-    faultLocation: '楼顶制冷机房',
-    startTime: '50分钟前',
-    progress: '30%',
-    remarks: '压缩机无法启动，正在检查电路和 refrigerant 压力',
-    actionText: '实时跟进',
-    actionClass: 'follow-btn'
-  },
-  {
-    title: '地下室水泵压力不足',
-    status: 'executing',
-    statusText: '抢修中',
-    leftLineClass: 'left-line-medium', // 紧急级-黄色左侧线
-    priority: '紧急',
-    reportTime: '45分钟前',
-    reporter: '李阳',
-    maintainer: '张明',
-    expectedCompleteTime: '1小时内',
-    faultType: '供水问题',
-    faultLocation: '地下室水泵房',
-    startTime: '40分钟前',
-    progress: '60%',
-    remarks: '水泵压力不足，正在更换滤网和检查管道',
-    actionText: '实时跟进',
-    actionClass: 'follow-btn'
-  }
-]);
-
+// 任务数据 - 添加了更多字段以展示滚动效果
+const tasks = ref([]);
 // 分页相关
 const currentPage = ref(1);
-const pageSize = ref(8);
-const total = ref(tasks.value.length);
-
+const pageSize = ref(20);
+const total = ref(6);
 // 状态排序映射
 const statusOrder = {
   pending: 0, // 待处理
@@ -395,11 +455,14 @@ const pagedTasks = computed(() => {
 // 搜索处理
 const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
-  // 实际应用中这里会根据筛选条件过滤数据
+  getTaskList(); // 调用接口获取数据
 };
 
 // 创建紧急抢修任务弹窗相关
 const createTaskDialogVisible = ref(false);
+const createTaskFormRef = ref(null); // 表单引用
+// 用户列表（维修人）
+
 const createTaskForm = ref({
   repairName: '',
   repairType: '',
@@ -408,7 +471,9 @@ const createTaskForm = ref({
   faultLocation: '',
   contactPerson: '',
   contactPhone: '',
-  needSupport: 'yes'
+  needSupport: 'yes',
+  file: '', // 上传的文件列表
+  expectedTime: '' // 预计完成时间
 });
 
 const createTaskRules = {
@@ -418,21 +483,43 @@ const createTaskRules = {
   detailedDescription: [{ required: true, message: '请输入故障描述', trigger: 'blur' }],
   faultLocation: [{ required: true, message: '请输入故障位置', trigger: 'blur' }],
   contactPerson: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-  contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'blur' }]
+  contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
+  expectedTime: [{ required: true, message: '请选择预计完成时间', trigger: 'change' }]
+};
+
+// 映射抢修类型到接口要求的数字（1电力2设备3供水4网络5设施）
+const mapRepairType = (type) => {
+  const typeMap = {
+    'electric': '1', // 电力故障 -> 1
+    'device': '2', // 设备故障 -> 2
+    'software': '3', // 软件故障 -> 3
+    'network': '4', // 网络故障 -> 4
+    'environment': '5' // 环境问题 -> 5
+  };
+  return typeMap[type] || '2'; // 默认返回设备故障
+};
+
+// 映射优先级到接口要求的数字（1常规2紧急3致命）
+const mapPriorityLevel = (priority) => {
+  const priorityMap = {
+    'normal': '1', // 一般 -> 1
+    'urgent': '2', // 紧急 -> 2
+    'fatal': '3' // 致命 -> 3
+  };
+  return priorityMap[priority] || '1'; // 默认返回常规
 };
 
 // 创建任务
-const handleCreateTask = () => {
+const handleCreateTask = async () => {
   createTaskDialogVisible.value = true;
+  // 打开弹窗时获取用户列表
+  await getUsersList();
 };
 
-// 提交抢修计划
-const handleSaveTask = () => {
-  // 模拟提交抢修计划逻辑
-  console.log('提交抢修计划:', createTaskForm.value);
-  // 关闭弹窗
-  createTaskDialogVisible.value = false;
-  // 重置表单
+const isSubmitting = ref(false); // 防止重复提交的状态标记
+
+// 重置创建表单
+const resetCreateForm = () => {
   createTaskForm.value = {
     repairName: '',
     repairType: '',
@@ -441,9 +528,92 @@ const handleSaveTask = () => {
     faultLocation: '',
     contactPerson: '',
     contactPhone: '',
-    needSupport: 'yes'
+    needSupport: 'yes',
+    file: '',
+    sendPerson: '',
+    expectedTime: ''
   };
-  // 这里可以添加成功提示和刷新任务列表的逻辑
+
+  if (createTaskFormRef.value) {
+    createTaskFormRef.value.resetFields();
+  }
+};
+
+// 提交抢修计划
+const handleSaveTask = async () => {
+  // 防止重复提交
+  if (!createTaskFormRef.value || isSubmitting.value) return;
+
+  try {
+    // 设置提交状态为true
+    isSubmitting.value = true;
+
+    // 先验证表单
+    await createTaskFormRef.value.validate();
+
+    // 构造提交数据
+    const submitData = {
+      // 必填项目ID
+      projectId: 1,
+      // 默认状态为待处理
+      status: '1',
+      // 任务名称
+      name: createTaskForm.value.repairName,
+      // 任务类型（转换为数字：1电力2设备3供水4网络5设施）
+      type: mapRepairType(createTaskForm.value.repairType),
+      // 任务等级（转换为数字：1常规2紧急3致命）
+      level: mapPriorityLevel(createTaskForm.value.priority),
+      // 故障描述
+      reportInfo: createTaskForm.value.detailedDescription,
+      // 故障位置
+      position: createTaskForm.value.faultLocation,
+      // 文件ID
+      fileId: createTaskForm.value.file,
+      // 报修人姓名
+      reportName: createTaskForm.value.contactPerson,
+      // 报修人电话
+      reportPhone: createTaskForm.value.contactPhone,
+      // 现场支持需求
+      support: createTaskForm.value.needSupport === 'yes' ? '是' : '否',
+      // 指派维修人
+      sendPerson: createTaskForm.value.sendPerson,
+      // 预计完成时间
+      expectedTime: createTaskForm.value.expectedTime
+    };
+
+    // 调用接口提交数据
+    const res = await addqiangxiu(submitData);
+
+    // 检查接口返回是否成功
+    if (res && res.code === 200) {
+      // 显示成功提示
+      ElMessage.success('抢修任务创建成功');
+
+      // 关闭弹窗
+      createTaskDialogVisible.value = false;
+
+      // 重置表单
+      resetCreateForm();
+
+      // 刷新任务列表
+      getTaskList();
+    } else {
+      ElMessage.error(`创建失败：${res?.msg || '未知错误'}`);
+    }
+  } catch (error) {
+    // 错误处理
+    if (error instanceof Error) {
+      ElMessage.error(`操作失败：${error.message}`);
+    } else if (error === false) {
+      // 表单验证失败，不做处理
+    } else {
+      ElMessage.error('操作失败：未知错误');
+    }
+    console.error('创建抢修任务失败:', error);
+  } finally {
+    // 无论成功失败，都重置提交状态
+    isSubmitting.value = false;
+  }
 };
 
 // 取消创建紧急抢修任务
@@ -458,7 +628,10 @@ const handleCancelCreateTask = () => {
     faultLocation: '',
     contactPerson: '',
     contactPhone: '',
-    needSupport: 'yes'
+    needSupport: 'yes',
+    file: '',
+    sendPerson: '',
+    expectedTime: ''
   };
 };
 
@@ -472,14 +645,56 @@ const handleCurrentChange = (val) => {
   currentPage.value = val;
 };
 
-// 查看任务详情
-const handleView = (task) => {
-  console.log('查看任务详情:', task);
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const isDetailLoading = ref(false);
+
+// 关闭详情弹窗
+const handleCloseDetailDialog = () => {
+  detailDialogVisible.value = false;
+  detailData.value = null;
 };
 
-// 处理选项卡点击
-const handleTabClick = () => {
-  currentPage.value = 1;
+// 拆分图片URL字符串为数组
+const splitImageUrls = (urlString) => {
+  if (!urlString) return [];
+  // 拆分并过滤空字符串（处理可能的首尾逗号或连续逗号）
+  return urlString.split(',').filter((url) => url.trim().length > 0);
+};
+
+// 处理图片加载失败
+const handleImageError = (event, index) => {
+  // 可以设置一个默认图片占位符
+  event.target.src = '';
+  console.error(`图片加载失败: 索引 ${index}`);
+};
+
+// 查看任务详情
+const handleView = async (task) => {
+  if (!task || !task.id) {
+    ElMessage.warning('任务ID不存在，请刷新页面重试');
+    return;
+  }
+
+  detailDialogVisible.value = true;
+  isDetailLoading.value = true;
+
+  try {
+    // 调用接口获取详情数据
+    const res = await qiangxiuDetail(task.id);
+
+    if (res.code === 200 && res.data) {
+      detailData.value = res.data;
+    } else {
+      ElMessage.error(`获取详情失败：${res?.msg || '未知错误'}`);
+    }
+  } catch (error) {
+    console.error('获取任务详情异常:', error);
+    ElMessage.error('获取详情失败，请稍后重试');
+  } finally {
+    isDetailLoading.value = false;
+  }
 };
 
 const handleInspectionManagement1 = () => {
@@ -510,6 +725,435 @@ const handleInspection6 = () => {
 const handleInspection7 = () => {
   router.push('/rili/renyuanzhuangtai');
 };
+
+// 加载状态
+const loading = ref(false);
+
+// 分配任务弹窗相关
+const assignDialogVisible = ref(false);
+const assignTaskForm = ref({ taskId: '', sendPerson: '', expectedTime: '' });
+const usersList = ref([]);
+const loadingUsers = ref(false);
+const assignTaskRules = {
+  sendPerson: [{ required: true, message: '请选择维修人', trigger: 'change' }],
+  expectedTime: [{ required: true, message: '请选择预计完成时间', trigger: 'change' }]
+};
+const assignTaskFormRef = ref(null);
+
+// 结果输入弹窗相关状态
+const resultDialogVisible = ref(false);
+const currentTaskId = ref('');
+const reportFinal = ref('');
+
+// 处理结果表单验证规则
+const resultFormRules = {
+  reportFinal: [
+    {
+      required: true,
+      message: '请输入处理结果',
+      trigger: 'blur'
+    },
+    {
+      min: 5,
+      max: 500,
+      message: '处理结果长度在 5 到 500 个字符之间',
+      trigger: 'blur'
+    }
+  ]
+};
+
+// 表单引用
+const resultFormRef = ref(null);
+
+// 获取用户列表
+const getUsersList = async () => {
+  loadingUsers.value = true;
+  try {
+    const res = await xunjianUserlist();
+    if (res.code === 200 && res.rows && Array.isArray(res.rows)) {
+      usersList.value = res.rows.map((user) => ({ id: String(user.userId || ''), name: user.userName || '未知用户' }));
+    } else {
+      usersList.value = [];
+      ElMessage.error('获取用户列表失败');
+    }
+  } catch (error) {
+    console.error('获取用户列表异常:', error);
+    ElMessage.error('获取用户列表失败');
+    usersList.value = [];
+  } finally {
+    loadingUsers.value = false;
+  }
+};
+
+// 处理任务操作按钮点击事件
+const handleAction = async (task) => {
+  try {
+    if (!task || !task.id) {
+      ElMessage.warning('任务ID不存在，请刷新页面重试');
+      console.error('任务缺少有效id，任务数据：', task);
+      return;
+    }
+
+    // 点击分配按钮：打开分配弹窗
+    if (task.actionText === '分配') {
+      // 重置表单并设置任务ID
+      assignTaskForm.value = { taskId: task.id, sendPerson: '' };
+      assignDialogVisible.value = true;
+
+      // 打开弹窗时获取用户列表
+      if (usersList.value.length === 0) {
+        await getUsersList();
+      }
+      if (usersList.value.length === 0) {
+        ElMessage.error('无可用维修人员，请先配置维修人员信息');
+        assignDialogVisible.value = false;
+      }
+    }
+
+    // 点击跟进按钮：原有逻辑
+    else if (task.actionText === '跟进') {
+      resultDialogVisible.value = true;
+      currentTaskId.value = task.id;
+    }
+
+    // 其他操作（如评价）
+    else {
+      console.log('其他操作:', task.actionText);
+    }
+  } catch (error) {
+    console.error('任务操作失败:', error, '当前任务数据:', task);
+    ElMessage.error('操作失败，请联系技术支持');
+  }
+};
+
+// 提交分配任务
+const handleSubmitAssign = async () => {
+  if (!assignTaskFormRef.value) return;
+
+  try {
+    await assignTaskFormRef.value.validate();
+
+    // 找到原始任务数据
+    const originalTask = tasks.value.find((t) => t.id === assignTaskForm.value.taskId);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      return;
+    }
+
+    // 找到选中的维修人员
+    const selectedUser = usersList.value.find((u) => u.id === assignTaskForm.value.sendPerson);
+    if (!selectedUser) {
+      ElMessage.error('未找到选中的维修人员');
+      return;
+    }
+
+    // 构造完整的更新参数
+    const updateData = {
+      id: assignTaskForm.value.taskId,
+      status: '2', // 处理中状态
+      sendPerson: selectedUser.id,
+      sendPersonName: selectedUser.name,
+      sendPersonVo: {
+        id: selectedUser.id,
+        userName: selectedUser.name
+      },
+      // 包含后端所需的其他必要字段
+      name: originalTask.title,
+      type: originalTask.type || '1',
+      level: mapPriorityLevel(originalTask.level), // 传入实际的level值（1常规、2紧急、3致命）
+      reportName: originalTask.reporter,
+      reportPhone: originalTask.reportPhone || '',
+      position: originalTask.position || '',
+      reportInfo: originalTask.reportInfo || '',
+      projectId: 1,
+      // 使用用户选择的预计完成时间
+      expectedTime: assignTaskForm.value.expectedTime || originalTask.expectedTime,
+      // 确保support字段处理一致
+      support: originalTask.needSupport || ''
+    };
+
+    // 调用接口更新
+    const res = await updateqiangxiu(updateData);
+    if (res.code === 200) {
+      ElMessage.success(`任务已分配给【${selectedUser.name}】，状态更新为处理中`);
+      assignDialogVisible.value = false;
+      getTaskList(); // 刷新列表
+    } else {
+      const errorMsg = res.msg || '未知错误';
+      console.error(`任务分配失败：${errorMsg}，请求参数：`, updateData);
+      ElMessage.error(`分配失败：${errorMsg}`);
+    }
+  } catch (error) {
+    if (error instanceof Error) {
+      ElMessage.error(`操作失败：${error.message}`);
+    } else if (error !== false) {
+      ElMessage.error('操作失败：未知错误');
+    }
+  }
+};
+
+// 关闭分配弹窗
+const handleCloseAssign = () => {
+  assignDialogVisible.value = false;
+  if (assignTaskFormRef.value) {
+    assignTaskFormRef.value.clearValidate();
+  }
+};
+
+// 保存结果
+const handleSaveResult = async () => {
+  try {
+    if (!currentTaskId.value) {
+      ElMessage.warning('任务ID不存在');
+      return;
+    }
+
+    if (!reportFinal.value.trim()) {
+      ElMessage.warning('请输入处理结果');
+      return;
+    }
+
+    // 1. 查找当前任务的完整数据
+    const originalTask = tasks.value.find((t) => t.id === currentTaskId.value);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      console.error('未找到任务完整数据，任务ID：', currentTaskId.value);
+      return;
+    }
+
+    // 2. 生成当前时间作为完成时间
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, '0');
+    const day = String(now.getDate()).padStart(2, '0');
+    const hours = String(now.getHours()).padStart(2, '0');
+    const minutes = String(now.getMinutes()).padStart(2, '0');
+    const completeTime = `${year}-${month}-${day} ${hours}:${minutes}`;
+
+    // 3. 构造更新参数，确保包含所有必要字段
+    const updateData = {
+      id: currentTaskId.value,
+      status: '3', // 已完成状态
+      reportFinishTime: completeTime,
+      reportFinal: reportFinal.value,
+      expectedTime: originalTask.expectedTime,
+
+      position: originalTask.position || '',
+      name: originalTask.title,
+      type: originalTask.type || '1',
+      level: mapPriorityLevel(originalTask.level),
+      reportName: originalTask.reporter,
+      reportPhone: originalTask.reportPhone || '',
+      reportInfo: originalTask.reportInfo || '',
+      projectId: 1,
+
+      support: originalTask.needSupport || '',
+      // 维修人员信息
+      sendPerson: originalTask.sendPersonVo?.id || '',
+      sendPersonName: originalTask.sendPersonVo?.userName || '',
+      sendPersonVo: originalTask.sendPersonVo || {}
+    };
+
+    // 4. 调用接口更新
+    const res = await updateqiangxiu(updateData);
+    if (res.code === 200) {
+      ElMessage.success('处理结果保存成功');
+      resultDialogVisible.value = false;
+      reportFinal.value = '';
+      getTaskList(); // 刷新列表
+    } else {
+      const errorMsg = res.msg || '未知错误';
+      console.error(`保存结果失败：${errorMsg}，请求参数：`, updateData);
+      ElMessage.error(`保存失败：${errorMsg}`);
+    }
+  } catch (error) {
+    console.error('保存处理结果失败:', error);
+    ElMessage.error('保存失败，请联系技术支持');
+  }
+};
+
+// 状态映射辅助函数
+function mapStatusToKey(status) {
+  const statusMap = {
+    '1': 'pending', // 待处理
+    '2': 'executing', // 处理中
+    '3': 'completed' // 已完成
+  };
+  return statusMap[status] || 'pending';
+}
+
+// 获取状态文本
+function getStatusText(status) {
+  const statusMap = {
+    '1': '待处理',
+    '2': '处理中',
+    '3': '已完成'
+  };
+  return statusMap[status] || '未知状态';
+}
+
+// 获取左侧状态线样式类
+function getLeftLineClass(status, level) {
+  if (status === '3') return 'left-line-completed';
+
+  const levelMap = {
+    '1': 'left-line-low',
+    '2': 'left-line-medium',
+    '3': 'left-line-high'
+  };
+  return levelMap[level] || 'left-line-low';
+}
+
+// 获取优先级样式
+function getPriorityClass(level) {
+  const levelMap = {
+    '1': 'priority-low',
+    '2': 'priority-medium',
+    '3': 'priority-high'
+  };
+  return levelMap[level] || 'priority-low';
+}
+
+// 获取优先级文本
+function getPriorityText(level) {
+  const levelMap = {
+    '1': '低优先级',
+    '2': '中优先级',
+    '3': '高优先级'
+  };
+  return levelMap[level] || '普通优先级';
+}
+
+// 获取操作按钮文本
+function getActionText(status) {
+  const actionMap = {
+    '1': '分配',
+    '2': '跟进',
+    '3': '评价'
+  };
+  return actionMap[status] || '查看';
+}
+
+// 获取操作按钮样式类
+function getActionClass(status) {
+  const actionMap = {
+    '1': 'assign-btn',
+    '2': 'follow-btn',
+    '3': 'evaluate-btn'
+  };
+  return actionMap[status] || 'view-btn';
+}
+
+// 格式化日期时间
+function formatDate(date) {
+  if (!date) return '';
+
+  const d = new Date(date);
+  if (isNaN(d.getTime())) return '';
+
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  const hours = String(d.getHours()).padStart(2, '0');
+  const minutes = String(d.getMinutes()).padStart(2, '0');
+
+  return `${year}-${month}-${day} ${hours}:${minutes}`;
+}
+
+// 获取抢修任务列表
+defineExpose({ getTaskList });
+async function getTaskList() {
+  loading.value = true;
+  try {
+    // 构建请求参数，包含筛选条件
+    const requestParams = {
+      projectId: 1,
+      pageNum: currentPage.value,
+      pageSize: pageSize.value
+    };
+
+    // 添加任务状态筛选条件
+    if (taskStatus.value && taskStatus.value !== 'all') {
+      requestParams.status = taskStatus.value;
+    }
+
+    // 添加计划类型筛选条件
+    if (planType.value && planType.value !== 'all') {
+      requestParams.planType = planType.value;
+    }
+
+    // 添加执行人筛选条件
+    if (executor.value && executor.value !== 'all') {
+      requestParams.executor = executor.value;
+    }
+
+    const res = await qiangxiulist(requestParams);
+
+    if (res.code === 200 && res.rows) {
+      total.value = res.total || 0;
+      // 将API返回的数据转换为前端显示所需的格式
+      tasks.value = res.rows.map((item) => ({
+        id: item.id,
+        title: item.name || '未命名抢修任务',
+        status: mapStatusToKey(item.status),
+        statusText: getStatusText(item.status),
+        leftLineClass: getLeftLineClass(item.status, item.level),
+        priorityClass: getPriorityClass(item.level),
+        priority: getPriorityText(item.level),
+        // 修复报修时间字段名，使用与模板一致的createTime
+        createTime: formatDate(item.createTime),
+        // 修复报修人字段，使用reportName
+        reporter: item.reportName || '未知报修人',
+        // 修复维修人字段，从sendPersonVo对象中获取用户名
+        maintainer: item.sendPersonVo?.userName || '未分配',
+
+        completeTime: item.reportFinishTime ? formatDate(item.reportFinishTime) : '',
+        actionText: getActionText(item.status),
+        actionClass: getActionClass(item.status),
+        reportInfo: item.reportInfo,
+        position: item.position,
+        fileUrl: item.fileUrl,
+
+        reportPhone: item.reportPhone || '',
+        type: item.type || '',
+        // 保留原始数据用于详情查看
+        sendPersonVo: item.sendPersonVo,
+        faultType: getFaultTypeText(item.type),
+        // 保留expectedTime字段用于任务修改
+        expectedTime: item.expectedTime || '',
+        // 添加needSupport字段，确保从API返回数据中获取实际值
+        needSupport: item.support || ''
+      }));
+    } else {
+      tasks.value = [];
+      total.value = 0;
+      console.error('获取抢修任务列表失败:', res.msg);
+    }
+  } catch (error) {
+    console.error('获取抢修任务列表异常:', error);
+    tasks.value = [];
+    total.value = 0;
+  } finally {
+    loading.value = false;
+  }
+}
+
+// 根据类型获取故障类型文本
+function getFaultTypeText(type) {
+  const typeMap = {
+    '1': '电力故障',
+    '2': '设备故障',
+    '3': '供水问题',
+    '4': '网络故障',
+    '5': '设施故障'
+  };
+  return typeMap[type] || '其他故障';
+}
+
+// 初始化时调用接口获取数据
+setTimeout(() => {
+  getTaskList();
+}, 0);
 </script>
 
 <style scoped>
@@ -519,6 +1163,7 @@ const handleInspection7 = () => {
   min-height: 100vh;
 }
 
+/* 任务卡片样式 - 恢复优先级标签背景色 */
 .task-cards {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(310px, 1fr));
@@ -534,10 +1179,10 @@ const handleInspection7 = () => {
   transition: all 0.3s ease;
   position: relative;
   overflow: hidden;
-  min-height: 300px;
+  min-height: 260px; /* 增加高度以适应新增的预计完成时间 */
 }
 
-/* 左侧状态线样式 - 与报修管理页面保持一致 */
+/* 左侧状态线基础样式 */
 .task-card::before {
   content: '';
   position: absolute;
@@ -546,49 +1191,508 @@ const handleInspection7 = () => {
   bottom: 0;
   width: 4px;
 }
-
-.left-line-high::before {
-  background-color: #ff4d4f;
+/* 详情弹窗样式 - 与保修管理页面保持一致 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
 }
 
-.left-line-medium::before {
+.task-detail-container {
+  padding: 10px 0;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+}
+
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
+  font-size: 14px;
+}
+
+/* 图片容器样式 */
+.images-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-top: 12px;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 8px;
+}
+
+/* 单个图片项样式 */
+.image-item {
+  flex: 0 0 auto;
+  width: 200px; /* 固定宽度 */
+  height: 160px; /* 固定高度 */
+  border-radius: 6px;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: transform 0.3s ease;
+}
+
+.image-item:hover {
+  transform: scale(1.03);
+}
+
+/* 图片样式 */
+.detail-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持比例填充容器 */
+  display: block;
+  border-radius: 4px;
+  transition: transform 0.3s ease;
+}
+
+.detail-image:hover {
+  transform: scale(1.02);
+}
+
+/* 图片加载失败样式 */
+.detail-image[src=''] {
+  background-color: #f0f0f0;
+  display: flex;
+}
+
+/* 骨架屏样式 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.skeleton-card {
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.skeleton-header {
+  height: 20px;
+  width: 30%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 12px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-row {
+  height: 16px;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+/* 无数据提示 */
+.no-info {
+  text-align: center;
+  color: #909399;
+  padding: 60px 20px;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .custom-experiment-dialog {
+    width: 95% !important;
+  }
+
+  .info-item {
+    flex: 0 0 100%;
+  }
+}
+
+/* 加载状态 */
+.loading-state {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: #909399;
+}
+
+.loading-state .el-icon {
+  margin-right: 8px;
+}
+
+/* 动画效果 */
+@keyframes skeleton-loading {
+  0% {
+    opacity: 0.6;
+  }
+  50% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0.6;
+  }
+}
+
+/* 响应式设计 */
+@media (max-width: 1200px) {
+  .task-cards {
+    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+  }
+}
+
+@media (max-width: 768px) {
+  .inspection-tasks {
+    padding: 16px;
+  }
+
+  .filter-container {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .filter-actions {
+    margin-left: 0;
+    justify-content: flex-end;
+  }
+
+  .filter-bar .el-select {
+    width: 100%;
+  }
+
+  .task-cards {
+    grid-template-columns: 1fr;
+  }
+
+  .custom-experiment-dialog {
+    width: 95% !important;
+  }
+
+  .info-item {
+    flex: 0 0 100%;
+  }
+
+  .image-item {
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+}
+
+/* 美化按钮样式 */
+.dialog-footer .el-button {
+  min-width: 80px;
+  height: 36px;
+  border-radius: 6px;
+  font-size: 14px;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  margin: 0 8px;
+}
+
+.dialog-footer .el-button--primary {
+  background-color: #409eff;
+  border-color: #409eff;
+  color: #fff;
+  font-weight: 500;
+}
+
+.dialog-footer .el-button--primary:hover {
+  background-color: #66b1ff;
+  border-color: #66b1ff;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(64, 158, 255, 0.3);
+}
+
+.dialog-footer .el-button--default {
+  background-color: #fff;
+  border-color: #dcdfe6;
+  color: #606266;
+}
+
+.dialog-footer .el-button--default:hover {
+  background-color: #f5f7fa;
+  border-color: #c6e2ff;
+  color: #409eff;
+  transform: translateY(-1px);
+}
+
+/* 分页区域样式 */
+.pagination-section {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
+
+.pagination-controls .el-pagination {
+  margin: 0;
+}
+
+.pagination-controls .el-pagination button,
+.pagination-controls .el-pagination .el-pager li {
+  min-width: 36px;
+  height: 36px;
+  line-height: 36px;
+  border-radius: 4px;
+}
+
+.pagination-controls .el-pagination .el-pager li.active {
+  background-color: #165dff;
+  color: #fff;
+}
+
+/* 左侧状态线颜色样式 */
+.left-line-pending::before {
+  background-color: #1890ff;
+}
+
+.left-line-executing::before {
   background-color: #fa8c16;
 }
 
-.left-line-low::before {
-  background-color: #1677ff;
-}
-
 .left-line-completed::before {
   background-color: #52c41a;
 }
 
-/* 滚动内容容器 */
+/* 优先级状态线颜色样式 - 与getLeftLineClass函数返回类名匹配 */
+.left-line-low::before {
+  background-color: #1677ff;
+}
+
+.left-line-medium::before {
+  background-color: #fa8c16;
+}
+
+.left-line-high::before {
+  background-color: #ff4d4f;
+}
+
+.task-card:hover {
+  transform: translateY(-3px);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
+}
+
+.task-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #f0f2f5;
+}
+
+.task-title {
+  font-size: 16px;
+  font-weight: 500;
+  color: #1d2129;
+  line-height: 1.4;
+}
+
+/* 优先级标签样式 */
+.task-status {
+  padding: 4px 10px;
+  border-radius: 6px;
+  font-size: 12px;
+  font-weight: 500;
+  border: 1px solid transparent;
+}
+
+.priority-high {
+  background-color: #ffebee;
+  border: 1px solid #f44336;
+  color: #f44336;
+}
+
+.priority-medium {
+  background-color: #fff8e1;
+  border: 1px solid #ffc107;
+  color: #ffc107;
+}
+
+.priority-low {
+  background-color: #e8f5e9;
+  border: 1px solid #4caf50;
+  color: #4caf50;
+}
+
+.task-details {
+  margin-bottom: 16px;
+}
+
+.detail-item {
+  display: flex;
+  margin-bottom: 10px;
+  font-size: 13px;
+}
+
+.detail-label {
+  flex: 0 0 80px;
+  color: #86909c;
+}
+
+.detail-value {
+  flex: 1;
+  color: #4e5969;
+  word-break: break-all;
+}
+
+.task-result {
+  display: flex;
+  margin: 10px 0;
+  font-size: 13px;
+  padding-top: 8px;
+  border-top: 1px dashed #f0f2f5;
+}
+
+.task-actions {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding-top: 12px;
+  border-top: 1px solid #f0f2f5;
+  position: absolute;
+  bottom: 16px;
+  right: 16px;
+  left: 16px;
+  background-color: #fff;
+  padding: 12px 0 0 0;
+  z-index: 10;
+}
+
+.action-btn {
+  font-size: 13px;
+  padding: 4px 10px;
+}
+
+.view-btn {
+  color: #165dff;
+}
+
+.view-btn:hover {
+  color: #0e42d2;
+  background-color: #e8f3ff;
+}
+
+.follow-btn {
+  background-color: #165dff;
+  border-color: #165dff;
+}
+
+.follow-btn:hover {
+  background-color: #0e42d2;
+  border-color: #0e42d2;
+}
+
+.assign-btn {
+  background-color: #ff7d00;
+  border-color: #ff7d00;
+}
+
+.assign-btn:hover {
+  background-color: #e86a00;
+  border-color: #e86a00;
+}
+
+.evaluate-btn {
+  background-color: #00b42a;
+  border-color: #00b42a;
+}
+
+.evaluate-btn:hover {
+  background-color: #008718;
+  border-color: #008718;
+}
+
+.task-card.status-low::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 4px;
+}
+
+.task-card.status-completed::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 4px;
+}
+
+/* 添加滚动内容容器 */
 .task-content-scroll {
   flex: 1;
   overflow-y: auto;
   padding-right: 8px; /* 为滚动条预留空间 */
   margin-bottom: 10px;
+  /* 限制最大高度，超出则显示滚动条 */
   max-height: 180px;
 }
 
+/* 滚动条样式保持不变 */
 .task-content-scroll::-webkit-scrollbar {
   width: 6px;
-  height: 6px;
 }
 
 .task-content-scroll::-webkit-scrollbar-track {
-  background: #f5f7fa;
+  background: #f1f1f1;
   border-radius: 3px;
 }
 
 .task-content-scroll::-webkit-scrollbar-thumb {
-  background: #c0c4cc;
+  background: #c1c1c1;
   border-radius: 3px;
 }
 
 .task-content-scroll::-webkit-scrollbar-thumb:hover {
-  background: #909399;
+  background: #a8a8a8;
 }
 
 .task-header {
@@ -617,21 +1721,16 @@ const handleInspection7 = () => {
   border: 1px solid transparent;
 }
 
-/* 故障类型标签样式 */
-.task-type-tag {
-  background-color: #f6ffed;
-  color: #52c41a;
-  border-color: #b7eb8f;
-}
-
+/* 不同故障类型的颜色 */
+/* 电力，设备故障为红色 */
 .task-type-tag.electric,
-.task-type-tag.equipment,
-.task-type-tag.cooling {
+.task-type-tag.equipment {
   background-color: #fff2f0;
   color: #ff4d4f;
   border-color: #ffccc7;
 }
 
+/* 供水，设备损坏为黄色 */
 .task-type-tag.water,
 .task-type-tag.damage {
   background-color: #fffbe6;
@@ -639,11 +1738,25 @@ const handleInspection7 = () => {
   border-color: #ffe58f;
 }
 
+/* 其余为绿色 */
+.task-type-tag {
+  background-color: #f6ffed;
+  color: #52c41a;
+  border-color: #b7eb8f;
+}
+
 .task-card:hover {
   transform: translateY(-3px);
   box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
 }
-
+.task-card[data-v-2668390e]::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 4px;
+}
 .task-details {
   margin-bottom: 16px;
 }
@@ -689,11 +1802,14 @@ const handleInspection7 = () => {
   z-index: 10;
 }
 
-/* 统一按钮样式 - 与报修管理页面保持一致 */
-.action-btn {
-  font-size: 13px;
-  padding: 4px 10px;
+.task-actions .el-button {
   border-radius: 16px;
+  padding: 6px 16px;
+}
+
+.action-btn {
+  font-size: 12px;
+  padding: 4px 12px;
 }
 
 .view-btn {
@@ -708,8 +1824,6 @@ const handleInspection7 = () => {
 .follow-btn {
   background-color: #165dff;
   border-color: #165dff;
-  border-radius: 16px;
-  padding: 6px 16px;
 }
 
 .follow-btn:hover {
@@ -720,8 +1834,6 @@ const handleInspection7 = () => {
 .assign-btn {
   background-color: #ff7d00;
   border-color: #ff7d00;
-  border-radius: 16px;
-  padding: 6px 16px;
 }
 
 .assign-btn:hover {
@@ -729,18 +1841,6 @@ const handleInspection7 = () => {
   border-color: #e86a00;
 }
 
-.evaluate-btn {
-  background-color: #00b42a;
-  border-color: #00b42a;
-  border-radius: 16px;
-  padding: 6px 16px;
-}
-
-.evaluate-btn:hover {
-  background-color: #008718;
-  border-color: #008718;
-}
-
 /* 其他样式保持不变 */
 .tabs-wrapper {
   background-color: #fff;
@@ -754,7 +1854,7 @@ const handleInspection7 = () => {
   background-color: #fff;
   border-radius: 8px;
   margin-bottom: 24px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
   padding: 16px 24px;
 }
 
@@ -782,31 +1882,12 @@ const handleInspection7 = () => {
   flex-shrink: 0;
 }
 
-.search-btn {
-  background-color: #f2f3f5;
-  color: #303133;
-  border-color: #f2f3f5;
-  transition: all 0.2s ease;
-  border-radius: 4px;
-}
-
-.search-btn:hover {
-  background-color: #e5e6eb;
-  border-color: #e5e6eb;
-}
-
+.search-btn,
 .create-btn {
-  background-color: #165dff;
-  border-color: #165dff;
-  transition: all 0.2s ease;
+  height: 36px;
   border-radius: 4px;
 }
 
-.create-btn:hover {
-  background-color: #0e42d2;
-  border-color: #0e42d2;
-}
-
 .pagination-section {
   display: flex;
   justify-content: center;
@@ -881,7 +1962,7 @@ const handleInspection7 = () => {
   color: #909399;
 }
 
-/* 弹窗和表单样式 */
+/* 弹窗和表单样式保持不变 */
 .beautiful-dialog {
   border-radius: 12px;
   overflow: hidden;
@@ -893,16 +1974,6 @@ const handleInspection7 = () => {
   margin-bottom: 24px;
 }
 
-/* 弹窗按钮样式保持一致 */
-.dialog-footer .el-button {
-  min-width: 80px;
-  height: 36px;
-  border-radius: 6px;
-  font-size: 14px;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  margin: 0 8px;
-}
-
 /* 响应式设计 */
 @media (max-width: 1200px) {
   .task-cards {
diff --git a/src/views/zhinengxunjian/qiangxiujilu.vue b/src/views/zhinengxunjian/qiangxiujilu.vue
index b87eb59..8484586 100644
--- a/src/views/zhinengxunjian/qiangxiujilu.vue
+++ b/src/views/zhinengxunjian/qiangxiujilu.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="inspection-tasks">
       <!-- 导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,19 +10,7 @@
         <div class="nav-tab active" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <!-- 页面标题和操作区 -->
-      <div class="header-section">
-        <TitleComponent title="抢修管理模块" subtitle="处理紧急抢修任务，跟踪抢修进度和记录"></TitleComponent>
-        <div class="header-actions">
-          <el-button class="filter-btn" @click="showFilter = !showFilter">
-            筛选
-            <i class="el-icon-arrow-down ml-1"></i>
-          </el-button>
-          <el-button type="primary" class="export-btn" @click="handleExport"> 导出数据 </el-button>
-        </div>
-      </div>
+      </div> -->
 
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -32,7 +20,7 @@
       </div>
 
       <!-- 筛选栏 (默认隐藏) -->
-      <div class="filter-bar" v-if="showFilter">
+      <div class="filter-bar">
         <div class="filter-container">
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
@@ -65,7 +53,7 @@
             />
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
           </div>
         </div>
       </div>
@@ -75,8 +63,8 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">本月抢修总数</p>
-            <p class="stat-value">18</p>
-            <p class="stat-trend up">较上月 +8.7%</p>
+            <p class="stat-value">{{ isCardLoading ? '加载中...' : statisticsData.totalCount }}</p>
+            <p class="stat-trend up">较上月:{{ statisticsData.monthChange }}</p>
           </div>
           <div class="stat-icon">
             <img src="@/assets/images/qiangxiu.png" alt="本月抢修总数" class="stat-image" />
@@ -86,8 +74,8 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">平均抢修时长</p>
-            <p class="stat-value">58分钟</p>
-            <p class="stat-trend down">较上月 -2.5分钟</p>
+            <p class="stat-value">{{ isCardLoading ? '加载中...' : statisticsData.avgDuration }}</p>
+            <p class="stat-trend down">较上月:{{ statisticsData.durationChange }}</p>
           </div>
           <div class="stat-icon">
             <img src="@/assets/images/qiangxiushijian.png" alt="平均抢修时长" class="stat-image" />
@@ -97,7 +85,7 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">待处理抢修</p>
-            <p class="stat-value">3</p>
+            <p class="stat-value">{{ isCardLoading ? '加载中...' : statisticsData.pendingCount }}</p>
             <p class="stat-trend warning">需要尽快处理</p>
           </div>
           <div class="stat-icon warning">
@@ -108,8 +96,8 @@
         <div class="stat-card">
           <div class="stat-info">
             <p class="stat-label">按时完成率</p>
-            <p class="stat-value">92%</p>
-            <p class="stat-trend up">较上月 +2.4%</p>
+            <p class="stat-value">{{ isCardLoading ? '加载中...' : statisticsData.completionRate }}</p>
+            <p class="stat-trend up">{{ statisticsData.rateChange }}</p>
           </div>
           <div class="stat-icon success">
             <img src="@/assets/images/qiangxiuwancheng.png" alt="按时完成率" class="stat-image" />
@@ -119,7 +107,7 @@
 
       <!-- 抢修记录表格 -->
       <div class="table-container">
-        <el-table :data="repairRecords" border style="width: 100%" class="record-table">
+        <el-table v-loading="isLoading" :data="repairRecords" border style="width: 100%" class="record-table">
           <el-table-column align="center" prop="reportNo" label="抢修单号" min-width="120"></el-table-column>
           <el-table-column align="center" prop="content" label="抢修内容" min-width="200"></el-table-column>
           <el-table-column align="center" prop="reporter" label="报修人" min-width="80"></el-table-column>
@@ -164,14 +152,208 @@
         </div>
       </div>
     </div>
+
+    <!-- 任务详情弹窗 -->
+    <el-dialog
+      v-model="detailDialogVisible"
+      title="抢修任务详情"
+      width="800px"
+      :before-close="handleCloseDetailDialog"
+      class="custom-experiment-dialog"
+    >
+      <div v-if="detailData" class="task-detail-container">
+        <!-- 加载状态骨架屏 -->
+        <div v-if="isDetailLoading" class="skeleton-loading">
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 任务基本信息卡片 -->
+        <div class="detail-card">
+          <h3 class="card-title">任务基本信息</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">任务ID：</span>
+                <span class="info-value">{{ detailData.id || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">任务名称：</span>
+                <span class="info-value">{{ detailData.name || '未命名' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">任务状态：</span>
+                <span class="info-value">{{ getStatusText(detailData.status) }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">任务等级：</span>
+                <span class="info-value">{{ getPriorityText(detailData.level) }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">任务类型：</span>
+                <span class="info-value">{{ getFaultTypeText(detailData.type) }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">创建时间：</span>
+                <span class="info-value">{{ formatDate(detailData.createTime) }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 报修人信息卡片 -->
+        <div class="detail-card">
+          <h3 class="card-title">报修人信息</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">报修人：</span>
+                <span class="info-value">{{ detailData.reportName || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">联系电话：</span>
+                <span class="info-value">{{ detailData.reportPhone || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">维修人：</span>
+                <span class="info-value">{{ detailData.sendPersonVo?.userName || '-' }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="detail-card">
+          <h3 class="card-title">报修详情</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item full-width">
+                <span class="info-label">故障位置：</span>
+                <span class="info-value">{{ detailData.position || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item full-width">
+                <span class="info-label">详细描述：</span>
+                <span class="info-value">{{ detailData.reportInfo || '-' }}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <div class="info-item">
+                <span class="info-label">期望处理时间：</span>
+                <span class="info-value">{{ detailData.expectedTime || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">现场支持：</span>
+                <span class="info-value">{{ detailData.support || '-' }}</span>
+              </div>
+            </div>
+            <!-- 已完成状态的额外信息 -->
+            <div v-if="detailData.status === '3'" class="info-row">
+              <div class="info-item">
+                <span class="info-label">完成时间：</span>
+                <span class="info-value">{{ formatDate(detailData.reportFinishTime) }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 故障图片 -->
+        <div v-if="detailData.fileUrl && detailData.fileUrl.length > 0" class="detail-card">
+          <h3 class="card-title">故障图片</h3>
+          <div class="card-content">
+            <div class="images-container">
+              <!-- 将逗号分隔的URL字符串拆分为数组并循环展示 -->
+              <div v-for="(url, index) in splitImageUrls(detailData.fileUrl)" :key="index" class="image-item">
+                <img
+                  :src="url"
+                  :alt="`故障图片 ${index + 1}`"
+                  class="detail-image"
+                  @error="handleImageError($event, index)"
+                  style="max-width: 100%; max-height: 200px; border-radius: 4px"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-else class="loading-state">
+        <i class="el-icon-loading el-icon--loading"></i>
+        <span>加载中...</span>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseDetailDialog">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 分配任务弹窗 -->
+    <el-dialog title="分配抢修任务" v-model="assignDialogVisible" width="400px" :before-close="handleCloseAssign">
+      <el-form ref="assignTaskFormRef" :model="{ sendPerson: selectedExecutor }" :rules="assignTaskRules" label-width="100px">
+        <el-form-item label="维修人员" prop="sendPerson">
+          <el-select v-model="selectedExecutor" placeholder="请选择维修人" :loading="loadingUsers">
+            <el-option v-for="item in executors" :key="item.userId" :label="item.userName" :value="item.userId.toString()" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseAssign">取消</el-button>
+          <el-button type="primary" :loading="assignLoading" @click="confirmAssign">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 处理结果弹窗 -->
+    <el-dialog v-model="followDialogVisible" title="处理结果" width="400px" :before-close="handleCloseFollow">
+      <el-form ref="resultFormRef" :model="{ reportFinal: reportFinal }" :rules="resultFormRules" label-width="100px">
+        <el-form-item label="处理结果" prop="reportFinal">
+          <el-input v-model="reportFinal" type="textarea" placeholder="请输入处理结果" :rows="4" resize="none"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseFollow">取消</el-button>
+          <el-button type="primary" :loading="followLoading" @click="submitFollow">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import { ref, computed } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
-
+import { qiangxiuDetail, qiangxiuRecord, qiangxiulist, updateqiangxiu } from '@/api/zhinengxunjian/qiangxiu';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
+import { ElMessage } from 'element-plus';
 // 筛选条件
 const taskStatus = ref('');
 const priority = ref('');
@@ -179,117 +361,264 @@ const executor = ref('');
 const dateRange = ref([]);
 const showFilter = ref(false);
 
+// 表单验证规则
+const assignTaskRules = {
+  sendPerson: [{ required: true, message: '请选择维修人', trigger: 'change' }]
+};
+
+const resultFormRules = {
+  reportFinal: [
+    {
+      required: true,
+      message: '请输入处理结果',
+      trigger: 'blur'
+    },
+    {
+      min: 5,
+      max: 500,
+      message: '处理结果长度在 5 到 500 个字符之间',
+      trigger: 'blur'
+    }
+  ]
+};
+
+// 表单引用
+const assignTaskFormRef = ref(null);
+const resultFormRef = ref(null);
+const loadingUsers = ref(false);
+
 // 分页相关
-const currentPage = ref(3);
+const currentPage = ref(1);
 const pageSize = ref(10);
-const total = ref(187);
+const total = ref(0);
+
+// 加载状态
+const isLoading = ref(false);
+const isCardLoading = ref(false);
 
 // 抢修记录数据
-const repairRecords = ref([
-  {
-    reportNo: 'R-2025-0620-001',
-    content: '网络主干交换机故障AAAAAA',
-    reporter: '陈明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李明',
-    priority: '紧急',
-    priorityClass: 'urgent',
-    status: '已完成',
-    statusClass: 'completed',
-    duration: '10分钟',
-    actionText: '详情',
-    actionClass: 'detail-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-002',
-    content: '实验室水管爆裂',
-    reporter: '陈明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李明',
-    priority: '紧急',
-    priorityClass: 'urgent',
-    status: '抢修中',
-    statusClass: 'processing',
-    duration: '4分钟',
-    actionText: '查看',
-    actionClass: 'follow-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-003',
-    content: '主配电室线路故障',
-    reporter: '陈明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李明',
-    priority: '紧急',
-    priorityClass: 'urgent',
-    status: '已完成',
-    statusClass: 'completed',
-    duration: '10分钟',
-    actionText: '详情',
-    actionClass: 'detail-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-004',
-    content: '网络主干交换机故障AAAAAA',
-    reporter: '陈明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李明',
-    priority: '常规',
-    priorityClass: 'normal',
-    status: '已完成',
-    statusClass: 'completed',
-    duration: '10分钟',
-    actionText: '详情',
-    actionClass: 'detail-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-005',
-    content: '网络主干交换机故障AAAAAA',
-    reporter: '陈明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李明',
-    priority: '紧急',
-    priorityClass: 'urgent',
-    status: '已完成',
-    statusClass: 'completed',
-    duration: '10分钟',
-    actionText: '详情',
-    actionClass: 'detail-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-006',
-    content: '网络主干交换机故障AAAAAA',
-    reporter: '陈明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李明',
-    priority: '紧急',
-    priorityClass: 'urgent',
-    status: '已完成',
-    statusClass: 'completed',
-    duration: '10分钟',
-    actionText: '详情',
-    actionClass: 'detail-btn'
-  },
-  {
-    reportNo: 'R-2025-0620-007',
-    content: '网络主干交换机故障AAAAAA',
-    reporter: '陈明',
-    reportTime: '2025-06-20 08:30',
-    handler: '李明',
-    priority: '紧急',
-    priorityClass: 'urgent',
-    status: '已完成',
-    statusClass: 'completed',
-    duration: '10分钟',
-    actionText: '详情',
-    actionClass: 'detail-btn'
+const repairRecords = ref([]);
+
+// 统计卡片数据
+const statisticsData = ref({
+  totalCount: 0,
+  avgDuration: '0分钟',
+  pendingCount: 0,
+  completionRate: '0%',
+  monthChange: '+0%',
+  durationChange: '-0分钟',
+  rateChange: '+0%'
+});
+
+// 获取抢修记录列表数据
+const getTaskList = async () => {
+  try {
+    isLoading.value = true;
+
+    // 构建查询参数
+    const params = {
+      projectId: 1,
+      pageNum: currentPage.value,
+      pageSize: pageSize.value
+    };
+
+    // 调用接口获取数据
+    const res = await qiangxiulist(params);
+
+    if (res && res.code === 200) {
+      // 更新表格数据，将接口返回的字段映射到表格期望的字段
+      repairRecords.value = Array.isArray(res.rows)
+        ? res.rows.map((item) => ({
+            // 映射抢修单号
+            reportNo: `R-${item.id || '000'}`,
+            // 映射抢修内容
+            content: item.reportInfo || item.name || '无内容',
+            // 映射报修人
+            reporter: item.reportName || '未知',
+            // 映射报修时间
+            reportTime: formatDate(item.createTime),
+            // 映射抢修人员
+            handler: item.sendPersonVo?.userName || '未分配',
+            // 映射紧急程度
+            priority: mapPriority(item.level),
+            priorityClass: getPriorityClass(item.level),
+            // 映射处理状态
+            status: mapStatus(item.status),
+            statusClass: getStatusClass(item.status),
+            // 映射处理时长
+            duration: item.minute ? `${item.minute}分钟` : '0分钟',
+            // 操作按钮相关
+            actionText: getActionText(item.status),
+            actionClass: getActionClass(item.status),
+            // 保留原始数据用于操作
+            originalData: item
+          }))
+        : [];
+      total.value = res.total || 0;
+    } else {
+      ElMessage.error(`获取抢修记录失败：${res?.msg || '未知错误'}`);
+      repairRecords.value = [];
+      total.value = 0;
+    }
+  } catch (error) {
+    console.error('获取抢修记录失败:', error);
+    ElMessage.error('获取抢修记录失败，请稍后重试');
+    repairRecords.value = [];
+    total.value = 0;
+  } finally {
+    isLoading.value = false;
   }
-]);
+};
+
+// 格式化日期时间
+function formatDate(date) {
+  if (!date) return '';
+
+  const d = new Date(date);
+  if (isNaN(d.getTime())) return '';
+
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  const hours = String(d.getHours()).padStart(2, '0');
+  const minutes = String(d.getMinutes()).padStart(2, '0');
+
+  return `${year}-${month}-${day} ${hours}:${minutes}`;
+}
+
+// 映射优先级
+function mapPriority(level) {
+  const priorityMap = {
+    '1': '常规',
+    '2': '紧急',
+    '3': '致命'
+  };
+  return priorityMap[level] || '未知';
+}
+
+// 获取优先级样式类
+function getPriorityClass(level) {
+  const classMap = {
+    '1': 'priority-normal',
+    '2': 'priority-urgent',
+    '3': 'priority-fatal'
+  };
+  return classMap[level] || 'priority-normal';
+}
+
+// 获取优先级文本
+function getPriorityText(level) {
+  const priorityMap = {
+    '1': '常规',
+    '2': '紧急',
+    '3': '致命'
+  };
+  return priorityMap[level] || '未知';
+}
+
+// 映射状态
+function mapStatus(status) {
+  const statusMap = {
+    '1': '待处理',
+    '2': '处理中',
+    '3': '已完成'
+  };
+  return statusMap[status] || '未知状态';
+}
+
+// 获取状态文本
+function getStatusText(status) {
+  const statusMap = {
+    '1': '待处理',
+    '2': '处理中',
+    '3': '已完成'
+  };
+  return statusMap[status] || '未知状态';
+}
+
+// 获取故障类型文本
+function getFaultTypeText(type) {
+  const typeMap = {
+    '1': '设备故障',
+    '2': '线路故障',
+    '3': '软件故障',
+    '4': '其他故障'
+  };
+  return typeMap[type] || '未知类型';
+}
+
+// 获取状态样式类
+function getStatusClass(status) {
+  const classMap = {
+    '1': 'status-pending',
+    '2': 'status-processing',
+    '3': 'status-completed'
+  };
+  return classMap[status] || 'status-pending';
+}
+
+// 获取操作按钮文本
+function getActionText(status) {
+  const actionMap = {
+    '1': '分配',
+    '2': '跟进',
+    '3': '评价'
+  };
+  return actionMap[status] || '查看';
+}
+
+// 获取操作按钮样式类
+function getActionClass(status) {
+  const classMap = {
+    '1': 'assign-btn',
+    '2': 'follow-btn',
+    '3': 'evaluate-btn'
+  };
+  return classMap[status] || 'view-btn';
+}
+
+// 获取统计卡片数据
+const getStatisticsData = async () => {
+  try {
+    isCardLoading.value = true;
+
+    // 调用接口获取统计数据
+    const res = await qiangxiuRecord({ projectId: 1 });
+
+    if (res && res.code === 200) {
+      // 更新统计卡片数据
+      statisticsData.value = {
+        totalCount: res.totalCount || 0,
+        avgDuration: res.avgDuration || '0分钟',
+        pendingCount: res.pendingCount || 0,
+        completionRate: res.completionRate || '0%',
+        monthChange: res.monthChange || '+0%',
+        durationChange: res.durationChange || '-0分钟',
+        rateChange: res.rateChange || '+0%'
+      };
+    } else {
+      ElMessage.error(`获取统计数据失败：${res?.msg || '未知错误'}`);
+    }
+  } catch (error) {
+    console.error('获取统计数据失败:', error);
+    ElMessage.error('获取统计数据失败，请稍后重试');
+  } finally {
+    isCardLoading.value = false;
+  }
+};
+
+// 初始化数据
+const initData = async () => {
+  await Promise.all([getTaskList(), getStatisticsData()]);
+};
+
+// 组件挂载时初始化数据
+initData();
 
 // 搜索处理
 const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
-  // 实际应用中这里会根据筛选条件过滤数据
+  getTaskList(); // 调用接口获取数据
 };
 
 // 导出数据
@@ -308,14 +637,304 @@ const handleCurrentChange = (val) => {
   currentPage.value = val;
 };
 
-// 查看详情
-const handleDetail = (record) => {
-  console.log('查看详情:', record);
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const currentRecord = ref(null);
+const isDetailLoading = ref(false);
+
+// 分配弹窗相关
+const assignDialogVisible = ref(false);
+const selectedExecutor = ref('');
+const executors = ref([]);
+const assignLoading = ref(false);
+
+// 跟进弹窗相关
+const followDialogVisible = ref(false);
+const reportFinal = ref('');
+const currentTaskId = ref('');
+const followLoading = ref(false);
+
+// 关闭详情弹窗处理
+const handleCloseDetailDialog = () => {
+  detailDialogVisible.value = false;
 };
 
+// 关闭分配弹窗
+const handleCloseAssign = () => {
+  assignDialogVisible.value = false;
+};
+
+// 关闭跟进弹窗
+const handleCloseFollow = () => {
+  followDialogVisible.value = false;
+  reportFinal.value = '';
+};
+
+// 拆分图片URL字符串为数组
+const splitImageUrls = (urlString) => {
+  if (!urlString) return [];
+  // 清理字符串，移除可能的空格和反引号，然后拆分并过滤空字符串
+  const cleanedString = urlString.replace(/[`\s]/g, '');
+  return cleanedString.split(',').filter((url) => url.trim().length > 0);
+};
+
+// 处理图片加载失败
+const handleImageError = (event, index) => {
+  // 可以设置一个默认图片占位符
+  event.target.src = '';
+  console.error(`图片加载失败: 索引 ${index}`);
+};
+
+// 查看详情
+const handleDetail = async (record) => {
+  currentRecord.value = { ...record };
+  detailData.value = null;
+  try {
+    isDetailLoading.value = true;
+    const res = await qiangxiuDetail(record.originalData.id);
+    if (res && res.code === 200) {
+      detailData.value = res.data;
+    }
+  } catch (error) {
+    console.error('获取详情失败:', error);
+    ElMessage.error('获取详情失败，请稍后重试');
+  } finally {
+    isDetailLoading.value = false;
+  }
+  detailDialogVisible.value = true;
+};
+
+// 优先级映射辅助函数
+function mapPriorityLevel(level) {
+  // 确保传入的值是字符串类型
+  const levelStr = String(level);
+  // 1常规、2紧急、3致命
+  const priorityMap = {
+    '1': '1',
+    '2': '2',
+    '3': '3'
+  };
+  return priorityMap[levelStr] || '1'; // 默认返回常规
+}
+
 // 处理操作
 const handleAction = (record) => {
-  console.log('执行操作:', record.actionText, record);
+  if (record.actionText === '分配') {
+    handleAssign(record);
+  } else if (record.actionText === '跟进') {
+    handleFollow(record);
+  } else if (record.actionText === '评价') {
+    handleEvaluate(record);
+  }
+};
+
+const handleAssign = async (record) => {
+  currentRecord.value = { ...record };
+  try {
+    const res = await xunjianUserlist();
+    if (res && res.code === 200) {
+      // 过滤无效数据+统一userId为字符串
+      executors.value = (res.rows || [])
+        .filter((item) => item.userId && item.userName)
+        .map((item) => ({
+          userId: item.userId.toString(), // 使用userId字段
+          userName: item.userName || '未知用户'
+        }));
+    }
+  } catch (error) {
+    console.error('获取人员列表失败:', error);
+    ElMessage.error('获取人员列表失败，请稍后重试');
+  }
+  selectedExecutor.value = ''; // 重置为空字符串
+  assignDialogVisible.value = true;
+};
+
+const confirmAssign = async () => {
+  if (!selectedExecutor.value) {
+    // 空字符串直接判断
+    ElMessage.warning('请选择抢修人员');
+    return;
+  }
+  try {
+    assignLoading.value = true;
+
+    // 找到原始任务数据
+    const originalTask = repairRecords.value.find((t) => t.originalData.id === currentRecord.value.originalData.id);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      return;
+    }
+
+    // 找到选中的维修人员
+    const selectedUser = executors.value.find((u) => u.userId === selectedExecutor.value);
+    if (!selectedUser) {
+      ElMessage.error('未找到选中的维修人员');
+      return;
+    }
+
+    // 直接使用originalData，因为这是从qiangxiulist接口获取的完整数据
+    const taskData = originalTask.originalData || originalTask;
+
+    // 打印日志帮助调试
+    console.log('任务原始数据:', taskData);
+
+    // 构造完整的更新参数，确保包含所有必要字段
+    const updateData = {
+      id: currentRecord.value.originalData.id,
+      status: '2', // 处理中状态
+      sendPerson: selectedUser.userId,
+      sendPersonName: selectedUser.userName,
+      sendPersonVo: {
+        id: selectedUser.userId,
+        userName: selectedUser.userName
+      },
+      // 任务基本信息
+      type: originalTask.type || taskData.type || '1',
+      level: mapPriorityLevel(originalTask.level || taskData.level || '1'),
+      reportName: originalTask.reporter || taskData.reporter || '',
+      reportPhone: originalTask.reportPhone || taskData.reportPhone || '',
+      position: originalTask.position || taskData.position || '',
+      reportInfo: originalTask.reportInfo || taskData.reportInfo || '',
+      projectId: 1,
+      expectedTime: originalTask.expectedTime || taskData.expectedTime || '',
+      name: taskData.name || originalTask.name || originalTask.title || taskData.title || '',
+      support: taskData.support || originalTask.support || originalTask.needSupport || taskData.needSupport || ''
+    };
+
+    // 打印最终的请求参数，用于调试
+    console.log('最终请求参数:', updateData);
+
+    const res = await updateqiangxiu(updateData);
+    if (res && res.code === 200) {
+      ElMessage.success(`任务已分配给【${selectedUser.userName}】，状态更新为处理中`);
+      assignDialogVisible.value = false;
+      getTaskList(); // 刷新列表
+    } else {
+      const errorMsg = res?.msg || '未知错误';
+      console.error(`任务分配失败：${errorMsg}，请求参数：`, updateData);
+      ElMessage.error(`分配失败：${errorMsg}`);
+    }
+  } catch (error) {
+    if (error instanceof Error) {
+      ElMessage.error(`操作失败：${error.message}`);
+    } else if (error !== false) {
+      ElMessage.error('操作失败：未知错误');
+    }
+    console.error('任务分配异常:', error);
+  } finally {
+    assignLoading.value = false;
+  }
+};
+
+// 处理跟进
+const handleFollow = (record) => {
+  currentRecord.value = { ...record };
+  currentTaskId.value = record.originalData.id;
+  reportFinal.value = '';
+  followDialogVisible.value = true;
+};
+
+// 提交跟进信息
+const submitFollow = async () => {
+  try {
+    // 表单验证
+    if (!resultFormRef.value) {
+      ElMessage.warning('表单引用未初始化');
+      return;
+    }
+
+    const validateResult = await resultFormRef.value.validate();
+    if (!validateResult) {
+      return; // 验证失败，不继续执行
+    }
+
+    if (!currentTaskId.value) {
+      ElMessage.warning('任务ID不存在');
+      return;
+    }
+
+    // 1. 查找当前任务的完整数据
+    const originalTask = repairRecords.value.find((t) => t.originalData.id === currentTaskId.value);
+    if (!originalTask) {
+      ElMessage.warning('未找到任务完整数据，请刷新重试');
+      console.error('未找到任务完整数据，任务ID：', currentTaskId.value);
+      return;
+    }
+
+    // 验证原始任务数据的完整性
+    console.log('找到的原始任务数据:', originalTask);
+
+    // 2. 生成当前时间作为完成时间
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, '0');
+    const day = String(now.getDate()).padStart(2, '0');
+    const hours = String(now.getHours()).padStart(2, '0');
+    const minutes = String(now.getMinutes()).padStart(2, '0');
+    const completeTime = `${year}-${month}-${day} ${hours}:${minutes}`;
+
+    // 3. 构造更新参数，确保包含所有必要字段
+    // 直接使用originalData，因为这是从qiangxiulist接口获取的完整数据
+    const taskData = originalTask.originalData || originalTask;
+
+    // 打印日志帮助调试
+    console.log('任务原始数据:', taskData);
+
+    const updateData = {
+      id: currentTaskId.value,
+      status: '3', // 已完成状态
+      reportFinishTime: completeTime,
+      reportFinal: reportFinal.value,
+      expectedTime: originalTask.expectedTime || taskData.expectedTime || '',
+
+      // 任务基本信息
+      position: originalTask.position || taskData.position || '',
+      // 重点修改：直接从originalData获取name字段
+      name: taskData.name || originalTask.name || originalTask.title || taskData.title || '',
+      type: originalTask.type || taskData.type || '1',
+      level: mapPriorityLevel(originalTask.level || taskData.level || '1'),
+      reportName: originalTask.reporter || taskData.reporter || '',
+      reportPhone: originalTask.reportPhone || taskData.reportPhone || '',
+      reportInfo: originalTask.reportInfo || taskData.reportInfo || '',
+      projectId: 1,
+
+      // 其他必填字段 - 重点修改：从originalData获取support字段
+      support: taskData.support || originalTask.support || originalTask.needSupport || taskData.needSupport || '',
+
+      // 维修人员信息
+      sendPerson: originalTask.sendPersonVo?.id || taskData.sendPersonVo?.id || '',
+      sendPersonName: originalTask.sendPersonVo?.userName || taskData.sendPersonVo?.userName || '',
+      sendPersonVo: originalTask.sendPersonVo || taskData.sendPersonVo || {}
+    };
+
+    // 打印最终的请求参数，用于调试
+    console.log('最终请求参数:', updateData);
+
+    followLoading.value = true;
+    const res = await updateqiangxiu(updateData);
+    if (res && res.code === 200) {
+      ElMessage.success('处理结果保存成功');
+      followDialogVisible.value = false;
+      reportFinal.value = '';
+      getTaskList(); // 重新加载列表
+    } else {
+      const errorMsg = res?.msg || '未知错误';
+      console.error(`保存结果失败：${errorMsg}，请求参数：`, updateData);
+      ElMessage.error(`保存失败：${errorMsg}`);
+    }
+  } catch (error) {
+    console.error('保存处理结果失败:', error);
+    ElMessage.error('保存失败，请联系技术支持');
+  } finally {
+    followLoading.value = false;
+  }
+};
+
+// 处理评价
+const handleEvaluate = (record) => {
+  console.log('评价功能待实现:', record);
+  ElMessage.info('评价功能待实现');
 };
 
 // 选项卡切换
@@ -379,22 +998,6 @@ const handleInspectionManagement2 = () => {
   margin-bottom: 20px;
 }
 
-.header-actions {
-  display: flex;
-  gap: 12px;
-}
-
-.filter-btn {
-  background-color: #fff;
-  color: #303133;
-  border-color: #dcdfe6;
-}
-
-.export-btn {
-  background-color: #165dff;
-  border-color: #165dff;
-}
-
 /* 选项卡样式 */
 .tabs-wrapper {
   background-color: #fff;
@@ -448,21 +1051,14 @@ const handleInspectionManagement2 = () => {
 .filter-actions {
   margin-left: auto;
   display: flex;
-  gap: 12px;
-  flex-shrink: 0;
+  gap: 10px;
 }
 
-.search-btn {
-  background-color: #f2f3f5;
-  color: #303133;
-  border-color: #f2f3f5;
-  transition: all 0.2s ease;
-}
-
-.search-btn:hover {
-  background-color: #e5e6eb;
-  color: #303133;
-  border-color: #e5e6eb;
+.search-btn,
+.export-btn,
+.create-btn {
+  height: 36px;
+  border-radius: 4px;
 }
 
 /* 统计卡片样式 */
@@ -549,6 +1145,50 @@ const handleInspectionManagement2 = () => {
   height: 45px;
   object-fit: contain;
 }
+.images-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-top: 12px;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 8px;
+}
+
+/* 单个图片项样式 */
+.image-item {
+  flex: 0 0 auto;
+  width: 200px; /* 固定宽度 */
+  height: 160px; /* 固定高度 */
+  border-radius: 6px;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: transform 0.3s ease;
+}
+
+.image-item:hover {
+  transform: scale(1.03);
+}
+
+/* 图片样式 */
+.detail-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持比例填充容器 */
+  display: block;
+  border-radius: 4px;
+  transition: transform 0.3s ease;
+}
+
+.detail-image:hover {
+  transform: scale(1.02);
+}
+
+/* 图片加载失败样式 */
+.detail-image[src=''] {
+  background-color: #f0f0f0;
+  display: flex;
+}
 .table-container {
   background-color: #fff;
   border-radius: 8px;
@@ -730,4 +1370,196 @@ const handleInspectionManagement2 = () => {
     overflow-x: auto;
   }
 }
+
+/* 详情弹窗样式 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
+}
+
+.task-detail-container {
+  padding: 10px 0;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+}
+
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
+  font-size: 14px;
+}
+
+/* 图片容器样式 */
+.images-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-top: 12px;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 8px;
+}
+
+/* 单个图片项样式 */
+.image-item {
+  flex: 0 0 auto;
+  width: 200px; /* 固定宽度 */
+  height: 160px; /* 固定高度 */
+  border-radius: 6px;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: transform 0.3s ease;
+}
+
+.image-item:hover {
+  transform: scale(1.03);
+}
+
+/* 图片样式 */
+.detail-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持比例填充容器 */
+  display: block;
+  border-radius: 4px;
+  transition: transform 0.3s ease;
+}
+
+.detail-image:hover {
+  transform: scale(1.02);
+}
+
+/* 图片加载失败样式 */
+.detail-image[src=''] {
+  background-color: #f0f0f0;
+  display: flex;
+}
+
+/* 骨架屏样式 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.skeleton-card {
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.skeleton-header {
+  height: 20px;
+  width: 30%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 12px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-row {
+  height: 16px;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+/* */
+
+/* 分配弹窗样式 */
+.assign-container {
+  padding: 8px 0;
+}
+
+.assign-info {
+  margin-bottom: 16px;
+  padding: 12px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+}
+
+.assign-info p {
+  margin: 8px 0;
+  font-size: 14px;
+  color: #606266;
+}
+
+/* 跟进弹窗样式 */
+.follow-container {
+  padding: 8px 0;
+}
+
+.follow-info {
+  margin-bottom: 16px;
+  padding: 12px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+}
+
+.follow-info p {
+  margin: 8px 0;
+  font-size: 14px;
+  color: #606266;
+}
+
+.follow-form {
+  margin-top: 16px;
+}
+
+.follow-form .el-form-item {
+  margin-bottom: 16px;
+}
 </style>
diff --git a/src/views/zhinengxunjian/renyuanzhuangtai.vue b/src/views/zhinengxunjian/renyuanzhuangtai.vue
index 1a04cd1..08ec4a6 100644
--- a/src/views/zhinengxunjian/renyuanzhuangtai.vue
+++ b/src/views/zhinengxunjian/renyuanzhuangtai.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="operation-organization">
       <!-- 顶部导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,10 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab active" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <!-- 页面标题 -->
-      <TitleComponent title="运维组织模块" subtitle="实时监控人员状态、车辆状态和班组状态"></TitleComponent>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -133,11 +130,9 @@
 <script setup>
 import { ref, watch, onMounted } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
 import * as echarts from 'echarts';
 
-// 激活的选项卡
-const activeTab = ref('personnel');
+//
 
 // 统计数据（保持原有数据不变）
 const totalPersonnel = ref(36);
@@ -449,36 +444,7 @@ const handleInspectionManagement3 = () => {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
-.custom-tabs {
-  padding-top: 1px;
-}
-
-.custom-tabs .el-tabs__header {
-  margin: 0 -20px;
-  padding: 0 20px;
-  border-bottom: 1px solid #e4e7ed;
-}
-
-.custom-tabs .el-tabs__nav-wrap::after {
-  height: 0;
-}
-
-.custom-tabs .el-tabs__item {
-  font-size: 14px;
-  color: #606266;
-  padding: 16px 20px;
-  margin-right: 20px;
-}
-
-.custom-tabs .el-tabs__item.is-active {
-  color: #165dff;
-  font-weight: 500;
-  border-bottom: 2px solid #165dff;
-}
-
-.custom-tabs .el-tabs__item:hover {
-  color: #165dff;
-}
+/* */
 
 /* 内容容器样式 */
 .content-container {
diff --git a/src/views/zhinengxunjian/shiyanguanli.vue b/src/views/zhinengxunjian/shiyanguanli.vue
index c5d072b..2f9d050 100644
--- a/src/views/zhinengxunjian/shiyanguanli.vue
+++ b/src/views/zhinengxunjian/shiyanguanli.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="operation-inspection">
       <!-- 1. 顶部导航选项卡（对应原试验系统的外层导航） -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab active" @click="handleInspection3">试验管理</div>
@@ -10,7 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
+      </div> -->
 
       <!-- 选项卡和按钮组合 -->
       <div class="tabs-wrapper">
@@ -49,8 +49,8 @@
           ></el-date-picker>
         </div>
         <div class="action-buttons">
-          <el-button type="primary" class="search-btn"> 搜索 </el-button>
-          <el-button type="primary" class="create-btn" @click="openRecordDialog"> <i class="fas fa-plus"></i> 新增实验记录 </el-button>
+          <el-button type="primary" icon="Search" class="search-btn"> 搜索 </el-button>
+          <el-button type="primary" icon="Plus" class="create-btn" @click="openRecordDialog"> <i class="fas fa-plus"></i> 新增实验记录 </el-button>
         </div>
       </div>
 
@@ -67,13 +67,7 @@
             <el-table-column align="center" prop="type" label="巡检类型" width="120"></el-table-column>
             <el-table-column align="center" prop="cycle" label="巡检周期" width="120"></el-table-column>
             <el-table-column align="center" prop="dateRange" label="执行时间范围"></el-table-column>
-            <el-table-column align="center" prop="progress" label="完成进度" width="120">
-              <template #default="scope">
-                <div class="progress-bar">
-                  <div class="progress-fill" :style="{ width: scope.row.progress + '%', backgroundColor: getProgressColor(scope.row.status) }"></div>
-                </div>
-              </template>
-            </el-table-column>
+
             <el-table-column align="center" prop="status" label="状态" width="100">
               <template #default="scope">
                 <span :class="['status-tag', `status-${scope.row.status}`]">
@@ -374,10 +368,10 @@
             </el-form-item>
             <el-form-item label="实验对象类型" class="form-item">
               <el-select v-model="formData.testObject" placeholder="请选择实验对象类型" class="form-input">
-                <el-option label="1安全试验" value="1" />
-                <el-option label="2网络实验" value="2" />
-                <el-option label="3性能试验" value="3" />
-                <el-option label="4" value="4" />
+                <el-option label="安全试验" value="1" />
+                <el-option label="网络实验" value="2" />
+                <el-option label="性能试验" value="3" />
+                <el-option label="其他试验" value="4" />
               </el-select>
             </el-form-item>
           </div>
@@ -418,17 +412,6 @@
             </el-select>
           </el-form-item>
 
-          <!-- 试验步骤 -->
-          <el-form-item label="试验步骤" class="form-item" style="width: 100%">
-            <div class="steps-container">
-              <div class="step-item" v-for="(step, index) in formData.steps" :key="index">
-                <div class="step-number">{{ index + 1 }}</div>
-                <el-input v-model="step.content" placeholder="输入试验步骤" />
-              </div>
-              <el-button type="text" size="small" class="add-step-btn" @click="addStep">添加步骤</el-button>
-            </div>
-          </el-form-item>
-
           <!-- 所需设备与准备 -->
           <el-form-item label="所需资源与设备" class="form-item" style="width: 100%">
             <div class="equipment-list">
@@ -471,99 +454,113 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       class="custom-experiment-dialog"
+      center
     >
-      <div class="detail-content">
-        <!-- 基础信息 -->
-        <div class="detail-section">
-          <h3 class="section-title">基础信息</h3>
-          <div class="detail-grid">
-            <div class="detail-item">
-              <label class="detail-label">计划名称:</label>
-              <span class="detail-value">{{ detailData.planName || '-' }}</span>
+      <div v-if="detailData" class="task-detail-container">
+        <!-- 基础信息卡片 -->
+        <div class="detail-card">
+          <h3 class="card-title">基础信息</h3>
+          <div class="card-content">
+            <div class="info-row">
+              <div class="info-item">
+                <label class="info-label">计划名称:</label>
+                <span class="info-value">{{ detailData.planName || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <label class="info-label">计划编号:</label>
+                <span class="info-value">{{ detailData.planCode || '-' }}</span>
+              </div>
             </div>
-            <div class="detail-item">
-              <label class="detail-label">计划编号:</label>
-              <span class="detail-value">{{ detailData.planCode || '-' }}</span>
+            <div class="info-row">
+              <div class="info-item">
+                <label class="info-label">实验对象:</label>
+                <span class="info-value">{{ getTestObjectText(detailData.testObject) || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <label class="info-label">负责人:</label>
+                <span class="info-value">{{ detailData.person?.userName || '-' }}</span>
+              </div>
             </div>
-            <div class="detail-item">
-              <label class="detail-label">实验对象:</label>
-              <span class="detail-value">{{ getTestObjectText(detailData.testObject) || '-' }}</span>
-            </div>
-            <div class="detail-item">
-              <label class="detail-label">负责人:</label>
-              <span class="detail-value">{{ detailData.person?.userName || '-' }}</span>
-            </div>
-            <div class="detail-item">
-              <label class="detail-label">开始时间:</label>
-              <span class="detail-value">{{ detailData.beginTime ? formatDate(detailData.beginTime) : '-' }}</span>
-            </div>
-            <div class="detail-item">
-              <label class="detail-label">结束时间:</label>
-              <span class="detail-value">{{ detailData.endTime ? formatDate(detailData.endTime) : '-' }}</span>
+            <div class="info-row">
+              <div class="info-item">
+                <label class="info-label">开始时间:</label>
+                <span class="info-value">{{ detailData.beginTime ? formatDate(detailData.beginTime) : '-' }}</span>
+              </div>
+              <div class="info-item">
+                <label class="info-label">结束时间:</label>
+                <span class="info-value">{{ detailData.endTime ? formatDate(detailData.endTime) : '-' }}</span>
+              </div>
             </div>
           </div>
         </div>
 
         <!-- 实验设备 -->
-        <div v-if="detailData.testDevice" class="detail-section">
-          <h3 class="section-title">实验设备</h3>
-          <div class="device-list">
-            <span v-for="(device, index) in detailData.testDevice.split(',')" :key="index" class="device-tag">
-              {{ device.trim() }}
-            </span>
-          </div>
-        </div>
-
-        <!-- 实验步骤 -->
-        <div v-if="detailData.testStep" class="detail-section">
-          <h3 class="section-title">实验步骤</h3>
-          <div class="steps-container">
-            <div v-for="(step, index) in detailData.testStep.split(',')" :key="index" class="step-item">
-              <div class="step-number">{{ index + 1 }}</div>
-              <div class="step-content">{{ step.trim() }}</div>
+        <div v-if="detailData.testDevice" class="detail-card">
+          <h3 class="card-title">实验设备</h3>
+          <div class="card-content">
+            <div v-for="(device, index) in detailData.testDevice.split(',')" :key="index" class="info-item">
+              <label class="info-label">设备{{ index + 1 }}:</label>
+              <span class="info-value">{{ device.trim() }}</span>
             </div>
           </div>
         </div>
 
         <!-- 实验信息 -->
-        <div class="detail-section">
-          <h3 class="section-title">实验信息</h3>
-          <div class="detail-textarea">
-            <label class="detail-label">实验说明:</label>
-            <div class="detail-text">{{ detailData.testInfo || '-' }}</div>
-          </div>
-          <div class="detail-textarea">
-            <label class="detail-label">实验设置:</label>
-            <div class="detail-text">{{ detailData.testSetting || '-' }}</div>
-          </div>
-          <div class="detail-textarea">
-            <label class="detail-label">解决方案:</label>
-            <div class="detail-text">{{ detailData.testSolutions || '-' }}</div>
+        <div class="detail-card">
+          <h3 class="card-title">实验信息</h3>
+          <div class="card-content">
+            <div class="info-item full-width">
+              <label class="info-label">实验说明:</label>
+              <div class="info-value">{{ detailData.testInfo || '-' }}</div>
+            </div>
+            <div class="info-item full-width">
+              <label class="info-label">实验设置:</label>
+              <div class="info-value">{{ detailData.testSetting || '-' }}</div>
+            </div>
+            <div class="info-item full-width">
+              <label class="info-label">解决方案:</label>
+              <div class="info-value">{{ detailData.testSolutions || '-' }}</div>
+            </div>
           </div>
         </div>
 
         <!-- 参与人员 -->
-        <div v-if="detailData.persons && detailData.persons.length > 0" class="detail-section">
-          <h3 class="section-title">参与人员</h3>
-          <div class="participant-list">
-            <div v-for="(person, index) in detailData.persons" :key="person.id" class="participant-item">
-              <span class="participant-name">{{ person.userName }}</span>
-              <span class="participant-team">{{ person.teamName }}</span>
+        <div v-if="detailData.persons && detailData.persons.length > 0" class="detail-card">
+          <h3 class="card-title">参与人员</h3>
+          <div class="card-content">
+            <div v-for="(person, index) in detailData.persons" :key="person.id" class="info-row">
+              <div class="info-item">
+                <label class="info-label">姓名:</label>
+                <span class="info-value">{{ person.userName }}</span>
+              </div>
+              <div class="info-item">
+                <label class="info-label">团队:</label>
+                <span class="info-value">{{ person.teamName }}</span>
+              </div>
             </div>
           </div>
         </div>
 
         <!-- 巡检项目 -->
-        <div v-if="detailData.inspectionItemList && detailData.inspectionItemList.length > 0" class="detail-section">
-          <h3 class="section-title">巡检项目</h3>
-          <div class="inspection-list">
-            <div v-for="(item, index) in detailData.inspectionItemList" :key="item.id" class="inspection-item">
-              <span class="inspection-name">{{ item.name }}</span>
-              <span class="inspection-type">{{ item.type }}</span>
+        <div v-if="detailData.inspectionItemList && detailData.inspectionItemList.length > 0" class="detail-card">
+          <h3 class="card-title">巡检项目</h3>
+          <div class="card-content">
+            <div v-for="(item, index) in detailData.inspectionItemList" :key="item.id" class="info-row">
+              <div class="info-item">
+                <label class="info-label">项目名称:</label>
+                <span class="info-value">{{ item.name }}</span>
+              </div>
+              <div class="info-item">
+                <label class="info-label">项目类型:</label>
+                <span class="info-value">{{ item.type }}</span>
+              </div>
             </div>
           </div>
         </div>
       </div>
+      <div v-else class="loading-details">
+        <el-skeleton :count="6" :columns="2" />
+      </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="showDetailDialog = false">关闭</el-button>
@@ -811,7 +808,11 @@ const formData = ref({
   envRequirements: '',
   manager: '',
   participants: [], // 改为数组存储多选的用户ID
-  steps: [{ content: '' }, { content: '' }, { content: '' }],
+  steps: [
+    { name: '', intendedPurpose: '', intendedTime: '' },
+    { name: '', intendedPurpose: '', intendedTime: '' },
+    { name: '', intendedPurpose: '', intendedTime: '' }
+  ],
   equipments: [
     { name: '服务器(型号:XYZ-9000)', selected: false },
     { name: '网络测试仪(型号:NT-5000)', selected: false },
@@ -839,20 +840,14 @@ const userList = ref([]);
 const getUsersList = async () => {
   try {
     const response = await xunjianUserlist();
-    const userRows =
-      response?.data?.rows && Array.isArray(response.data.rows)
-        ? response.data.rows
-        : response?.rows && Array.isArray(response.rows)
-        ? response.rows
-        : Array.isArray(response)
-        ? response
-        : [];
+    // 适配新接口格式：检查code为200且rows为数组
+    const userRows = response.code === 200 && response.rows && Array.isArray(response.rows) ? response.rows : [];
 
     userList.value = userRows
       .filter((item) => item && typeof item === 'object')
-      .map((item, index) => ({
-        label: item.userName || `用户${index + 1}`,
-        value: item.id || `id_${index}`
+      .map((item) => ({
+        label: item.userName || '未知用户',
+        value: String(item.userId || '') // 使用userId作为唯一标识
       }));
 
     if (userList.value.length === 0) {
@@ -914,10 +909,6 @@ const handleSave = async () => {
       personIds: formData.value.participants.join(','),
       inspectionItems: '',
       testSolutions: formData.value.riskMitigation,
-      testStep: formData.value.steps
-        .filter((step) => step.content.trim())
-        .map((step) => step.content)
-        .join(','),
       testDevice: formData.value.equipments
         .filter((equip) => equip.selected)
         .map((equip) => equip.name)
@@ -927,8 +918,9 @@ const handleSave = async () => {
       id: editRecordId.value // 若后端用planId等，需改为对应字段名
     };
 
-    // 4. 调用接口
+    // 调用接口
     let response;
+
     if (editRecordId.value) {
       // 编辑模式：调用更新接口
       response = await updateshiyan(requestData);
@@ -965,7 +957,6 @@ const resetForm = () => {
     envRequirements: '', // 环境要求为空
     manager: '', // 负责人为空
     participants: [], // 参与人员为空数组
-    steps: [{ content: '' }, { content: '' }, { content: '' }], // 步骤内容为空
     equipments: [
       { name: '服务器(型号:XYZ-9000)', selected: false },
       { name: '网络测试仪(型号:NT-5000)', selected: false },
@@ -1041,24 +1032,6 @@ const handleEditRecord = async (row) => {
     const recordDetail = detailResponse.data.rows?.[0] || detailResponse.data;
     // 兼容两种数据结构：可能在rows数组中，也可能直接在data中
 
-    // 3. 处理testStep：将逗号分隔的字符串转换为步骤数组
-    const steps = [];
-    if (recordDetail.testStep) {
-      // 拆分字符串（例如 "1. 213,2. 321" → ["1. 213", "2. 321"]）
-      const stepItems = recordDetail.testStep.split(',');
-      stepItems.forEach((stepText) => {
-        // 移除序号前缀（如"1. "），只保留内容
-        const content = stepText.replace(/^\d+\.\s*/, '').trim();
-        if (content) {
-          steps.push({ content });
-        }
-      });
-    }
-    // 确保至少有3个步骤（如果解析后为空）
-    while (steps.length < 3) {
-      steps.push({ content: '' });
-    }
-
     // 4. 处理testDevice：将逗号分隔的字符串转换为设备数组
     const equipments = [];
     if (recordDetail.testDevice) {
@@ -1104,7 +1077,6 @@ const handleEditRecord = async (row) => {
       envRequirements: recordDetail.envRequirements || recordDetail.testSetting || '',
       manager: recordDetail.manager || recordDetail.personCharge || '',
       participants: participants, // 从personIds解析的数组
-      steps: steps, // 解析后的步骤数组
       equipments: equipments, // 解析并合并后的设备数组
       riskMitigation: recordDetail.riskMitigation || recordDetail.testSolutions || ''
     };
@@ -1134,7 +1106,18 @@ const handleEditRecord = async (row) => {
 };
 // 添加新步骤
 const addStep = () => {
-  formData.value.steps.push({ content: '' });
+  formData.value.steps.push({ name: '', intendedPurpose: '', intendedTime: '' });
+};
+
+// 删除步骤
+const deleteStep = (index) => {
+  // 确保至少保留一个步骤
+  if (formData.value.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  // 从数组中删除指定索引的步骤
+  formData.value.steps.splice(index, 1);
 };
 
 // 添加新设备
@@ -1231,10 +1214,24 @@ const formatDate = (dateString) => {
   const seconds = String(date.getSeconds()).padStart(2, '0');
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 };
+
+// 日期时间格式化函数
+const formatDateTime = (dateString) => {
+  if (!dateString) return '';
+  const date = new Date(dateString);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
 </script>
 
 <style scoped>
-/* 1. 基础容器样式（继承试验系统） */
+@import url('./css/detail-dialog.css');
+
 .operation-inspection {
   padding: 20px;
   background-color: #f9fbfd;
@@ -1276,7 +1273,7 @@ const formatDate = (dateString) => {
   box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
 }
 
-/* 3. 页面标题（与试验系统一致） */
+/* 3. 页面标题 */
 .page-header {
   margin-bottom: 20px;
 }
@@ -1908,53 +1905,6 @@ const formatDate = (dateString) => {
   box-shadow: 0 0 0 2px rgba(22, 93, 255, 0.1);
 }
 
-/* 试验步骤样式 */
-.steps-container {
-  border: 1px solid #e4e7ed;
-  border-radius: 8px;
-  padding: 16px;
-  width: 100%;
-}
-
-.step-item {
-  display: flex;
-  align-items: center;
-  margin-bottom: 16px;
-  width: 100%;
-}
-
-.step-item:last-child {
-  margin-bottom: 0;
-}
-
-.step-number {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-  background-color: #165dff;
-  color: white;
-  font-size: 16px;
-  font-weight: 600;
-  margin-right: 16px;
-  flex-shrink: 0;
-}
-
-.step-input:focus {
-  border-color: #165dff;
-  outline: none;
-}
-
-.add-step-btn {
-  color: #165dff;
-  margin-top: 12px;
-  width: 100%;
-  text-align: center;
-  font-size: 14px;
-}
-
 /* 设备列表样式 */
 .equipment-list {
   border: 1px solid #e4e7ed;
@@ -2013,7 +1963,7 @@ const formatDate = (dateString) => {
   border-color: #0d47a1;
 }
 
-/* 响应式设计 */
+/* 响应式设计 - 保留必要的覆盖样式 */
 @media (max-width: 768px) {
   .custom-experiment-dialog {
     width: 90% !important;
@@ -2033,222 +1983,13 @@ const formatDate = (dateString) => {
   .new-equipment-input {
     width: 100%;
   }
-}
 
-/* 详情弹窗样式 */
-.custom-experiment-dialog .el-dialog__body {
-  padding: 20px;
-  overflow: hidden;
-}
-
-.detail-content {
-  max-height: 600px;
-  overflow-y: auto;
-  padding-right: 8px;
-}
-
-/* 详情区块 */
-.detail-section {
-  margin-bottom: 24px;
-  padding: 16px;
-  border: 1px solid #e4e7ed;
-  border-radius: 8px;
-  background-color: #ffffff;
-}
-
-.section-title {
-  font-size: 16px;
-  font-weight: 600;
-  color: #1890ff;
-  margin-bottom: 16px;
-  padding-bottom: 8px;
-  border-bottom: 1px solid #e8f4ff;
-}
-
-/* 基础信息网格 */
-.detail-grid {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 16px;
-}
-
-.detail-item {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.detail-label {
-  font-size: 13px;
-  font-weight: 500;
-  color: #6c757d;
-}
-
-.detail-value {
-  font-size: 14px;
-  color: #2c3e50;
-  padding: 4px 0;
-}
-
-/* 文本区域 */
-.detail-textarea {
-  margin-bottom: 16px;
-}
-
-.detail-text {
-  font-size: 14px;
-  color: #495057;
-  line-height: 1.6;
-  padding: 8px 0;
-  min-height: 60px;
-  white-space: pre-wrap;
-  word-break: break-word;
-}
-
-/* 设备列表样式 */
-.device-list {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-}
-
-.device-tag {
-  display: inline-block;
-  padding: 6px 12px;
-  background-color: #f0f9ff;
-  color: #1890ff;
-  border: 1px solid #bae7ff;
-  border-radius: 16px;
-  font-size: 13px;
-}
-
-/* 步骤条样式 */
-.steps-container {
-  padding-left: 8px;
-}
-
-.step-item {
-  display: flex;
-  align-items: flex-start;
-  margin-bottom: 16px;
-  position: relative;
-}
-
-.step-item:last-child {
-  margin-bottom: 0;
-}
-
-.step-item:not(:last-child)::after {
-  content: '';
-  position: absolute;
-  left: 17px;
-  top: 36px;
-  bottom: -16px;
-  width: 2px;
-  background-color: #e4e7ed;
-  z-index: 1;
-}
-
-.step-number {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-  background-color: #1890ff;
-  color: white;
-  font-size: 14px;
-  font-weight: 600;
-  margin-right: 16px;
-  flex-shrink: 0;
-  z-index: 2;
-}
-
-.step-content {
-  flex: 1;
-  padding: 8px 16px;
-  background-color: #fafafa;
-  border-radius: 6px;
-  font-size: 14px;
-  color: #2c3e50;
-  line-height: 1.5;
-}
-
-/* 列表样式 */
-.participant-list,
-.inspection-list {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.participant-item,
-.inspection-item {
-  display: flex;
-  align-items: center;
-  gap: 24px;
-  padding: 12px 16px;
-  background-color: #f8f9fa;
-  border-radius: 8px;
-}
-
-.participant-name,
-.inspection-name {
-  font-size: 14px;
-  font-weight: 500;
-  color: #2c3e50;
-  min-width: 120px;
-}
-
-.participant-team,
-.participant-role,
-.inspection-type {
-  font-size: 13px;
-  color: #6c757d;
-}
-
-.participant-item,
-.inspection-item {
-  display: flex;
-  align-items: center;
-  gap: 24px;
-  padding: 12px 16px;
-  background-color: #f8f9fa;
-  border-radius: 8px;
-}
-
-.participant-name,
-.inspection-name {
-  font-size: 14px;
-  font-weight: 500;
-  color: #2c3e50;
-  min-width: 120px;
-}
-
-.participant-team,
-.participant-role,
-.inspection-type {
-  font-size: 13px;
-  color: #6c757d;
-}
-
-/* 详情弹窗响应式设计 */
-@media (max-width: 768px) {
-  .detail-grid {
-    grid-template-columns: 1fr;
-  }
-
-  .participant-item,
-  .inspection-item {
+  .info-row {
     flex-direction: column;
-    align-items: flex-start;
-    gap: 8px;
   }
 
-  .participant-name,
-  .inspection-name {
-    min-width: auto;
+  .info-item {
+    min-width: 100%;
   }
 }
 </style>
diff --git a/src/views/zhinengxunjian/shiyanjilu.vue b/src/views/zhinengxunjian/shiyanjilu.vue
index 584bdfa..31d7711 100644
--- a/src/views/zhinengxunjian/shiyanjilu.vue
+++ b/src/views/zhinengxunjian/shiyanjilu.vue
@@ -1,7 +1,8 @@
 <template>
   <div>
     <div class="operation-inspection">
-      <div class="navigation-tabs">
+      <!-- 顶部导航选项卡 -->
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab active" @click="handleInspection3">试验管理</div>
@@ -9,15 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
-
-      <div class="header-container">
-        <div class="header-actions">
-          <el-button type="primary" class="export-btn">筛选</el-button>
-          <el-button type="primary" class="create-btn">导入数据</el-button>
-        </div>
-      </div>
-
+      </div> -->
       <!-- 选项卡和按钮组合 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -27,7 +20,7 @@
         </div>
       </div>
 
-      <!-- 4. 筛选和操作区域 -->
+      <!-- 筛选和操作区域 -->
       <div class="filter-and-actions">
         <div class="filters">
           <el-select v-model="filterStatus" placeholder="巡检状态" clearable>
@@ -54,13 +47,13 @@
             class="date-picker"
           ></el-date-picker>
 
-          <el-button type="primary" class="search-btn"> 搜索 </el-button>
+          <el-button icon="Search" type="primary" class="search-btn"> 搜索 </el-button>
         </div>
       </div>
 
-      <!-- 5. 主内容区 -->
+      <!-- 主内容区 -->
       <div class="content-container">
-        <!-- 5.3 巡检记录（根据图片调整） -->
+        <!-- 试验记录 -->
         <div v-if="activeTab === 'record'" class="record-container">
           <h2 class="section-title">试验记录与报告</h2>
           <p class="section-subtitle">截止至 {{ currentDate }}</p>
@@ -69,11 +62,44 @@
           <div class="stat-grid">
             <div class="stat-card">
               <p class="stat-label">本月完成试验</p>
-              <p class="stat-value">{{ statData.completed }}<span class="stat-change up">较上月 ↑2.4%</span></p>
+              <p class="stat-value">
+                {{ statData.completed
+                }}<span
+                  class="stat-change"
+                  :class="{
+                    'green': statData.completedGrowth > 0,
+                    'gray': Math.abs(statData.completedGrowth - 100) < 0.01,
+                    'red': statData.completedGrowth < 0
+                  }"
+                >
+                  较上月
+                  {{
+                    Math.abs(statData.completedGrowth - 100) < 0.01
+                      ? '无增长'
+                      : (statData.completedGrowth >= 0 ? '↑' : '↓') + Math.abs(statData.completedGrowth) + '%'
+                  }}
+                </span>
+              </p>
             </div>
             <div class="stat-card">
               <p class="stat-label">试验通过率</p>
-              <p class="stat-value">{{ statData.passRate }}%<span class="stat-change up">较上月 ↑5.6%</span></p>
+              <p class="stat-value">
+                {{ statData.passRate }}%<span
+                  class="stat-change"
+                  :class="{
+                    'green': statData.passRateGrowth > 0,
+                    'gray': Math.abs(statData.passRateGrowth - 100) < 0.01,
+                    'red': statData.passRateGrowth < 0
+                  }"
+                >
+                  较上月
+                  {{
+                    Math.abs(statData.passRateGrowth - 100) < 0.01
+                      ? '无增长'
+                      : (statData.passRateGrowth >= 0 ? '↑' : '↓') + Math.abs(statData.passRateGrowth) + '%'
+                  }}
+                </span>
+              </p>
             </div>
             <div class="stat-card">
               <p class="stat-label">待分析记录</p>
@@ -81,114 +107,100 @@
             </div>
             <div class="stat-card">
               <p class="stat-label">平均试验时长</p>
-              <p class="stat-value">{{ statData.avgDuration }}<span class="stat-change down">较上月 ↓9.4分钟</span></p>
+              <p class="stat-value">
+                {{ statData.avgDuration
+                }}<span
+                  class="stat-change"
+                  :class="{
+                    'green': statData.avgDurationGrowth > 100, // 数据大于100（上升）时显示绿色
+                    'gray': Math.abs(statData.avgDurationGrowth - 100) < 0.01,
+                    'red': statData.avgDurationGrowth < 100 // 数据小于100（下降）时显示红色
+                  }"
+                >
+                  较上月
+                  {{
+                    Math.abs(statData.avgDurationGrowth - 100) < 0.01
+                      ? '无增长'
+                      : (statData.avgDurationGrowth <= 0 ? '↓' : '↑') + Math.abs(statData.avgDurationGrowth) + '%'
+                  }}
+                </span>
+              </p>
             </div>
           </div>
 
           <!-- 试验记录列表 -->
           <div class="test-records">
-            <!-- 数据库性能巡检记录 -->
-            <div class="test-record-card passed">
+            <!-- 动态生成试验记录卡片 -->
+            <div
+              v-for="(record, recordIndex) in testRecords"
+              :key="record.id"
+              class="test-record-card"
+              :class="{ 'passed': record.status === 'completed', 'failed': record.status === 'failed' }"
+            >
               <div class="record-header">
-                <h3 class="record-title">数据库性能巡检</h3>
+                <h3 class="record-title">{{ record.taskName || '试验任务' }}</h3>
                 <p class="record-date">
-                  {{ testRecords[0].date }} <span class="record-time">耗时: {{ testRecords[0].duration }}</span>
+                  开始时间
+                  {{ formatDate(record.beginTime) }}
+                  <span class="record-time">计划完成时间: {{ record.planFinishTime ? formatDate(record.planFinishTime) : '未知' }}</span>
                 </p>
-                <span class="status-tag status-passed">通过</span>
+                <span class="status-tag" :class="getStatusClass(record.status)">
+                  {{ getStatusText(record.status) }}
+                </span>
               </div>
 
-              <!-- 试验进度 -->
-              <div class="test-progress">
-                <div class="progress-step active">
-                  <div class="step-number">1</div>
-                  <div class="step-name">准备环境</div>
-                </div>
-                <div class="progress-line active"></div>
-                <div class="progress-step active">
-                  <div class="step-number">2</div>
-                  <div class="step-name">50%负载</div>
-                </div>
-                <div class="progress-line active"></div>
-                <div class="progress-step active">
-                  <div class="step-number">3</div>
-                  <div class="step-name">80%负载</div>
-                </div>
-                <div class="progress-line active"></div>
-                <div class="progress-step active">
-                  <div class="step-number">4</div>
-                  <div class="step-name">100%负载</div>
-                </div>
+              <!-- 动态生成试验进度步骤条 -->
+              <div class="test-progress" v-if="record.nodes && record.nodes.length">
+                <template v-for="(node, index) in sortedNodes(record.nodes)" :key="node.id">
+                  <div class="progress-step" :class="getNodeStatusClass(node.status, record.status)">
+                    <div class="step-number">{{ node.code }}</div>
+                    <div class="step-name">步骤名称：{{ node.name }}</div>
+                    <div class="step-name">预期试验目的：{{ node.intendedPurpose }}</div>
+                  </div>
+
+                  <!-- 进度线，最后一个节点没有线 -->
+                  <div
+                    v-if="index < sortedNodes(record.nodes).length - 1"
+                    class="progress-line"
+                    :class="getLineStatusClass(index, sortedNodes(record.nodes), record.status)"
+                  ></div>
+                </template>
               </div>
 
               <!-- 试验结果 -->
-              <div class="test-result">
-                <h4 class="result-title">试验结果</h4>
-                <p class="result-content">系统在100%负载下稳定运行1小时，CPU平均使用率92%，内存使用率88%，无崩溃或异常重启现象。</p>
-                <p class="result-details">
-                  平均响应时间: {{ testRecords[0].responseTime }} | 错误率: {{ testRecords[0].errorRate }} | 温度值: {{ testRecords[0].temperature }}
+              <div class="test-result" :class="{ 'failure-analysis': record.status === 'failed' }">
+                <h4 class="result-title">
+                  {{ record.status === '3' ? '失败原因分析' : '试验结果' }}
+                </h4>
+
+                <p class="result-content">
+                  {{ record.status === '3' ? record.failReason || '未提供失败原因' : record.testFinal || '试验未完成，未提供详细结果' }}
                 </p>
-              </div>
 
-              <div class="record-actions">
-                <button class="operate-btn view-btn">查看详情</button>
-                <button class="operate-btn report-btn">生成报告</button>
-              </div>
-            </div>
-
-            <!-- 1000用户并发测试记录 -->
-            <div class="test-record-card failed">
-              <div class="record-header">
-                <h3 class="record-title">1000用户并发测试</h3>
-                <p class="record-date">
-                  {{ testRecords[1].date }} <span class="record-time">耗时: {{ testRecords[1].duration }}</span>
+                <p class="result-details" v-if="record.status !== 'failed'">
+                  计划时间: {{ formatDate(record.planBeginTime) }} | 进度: {{ record.progress }}% | 负责人:
+                  {{ record.personInfo?.userName || '未知' }}
                 </p>
-                <span class="status-tag status-failed">失败</span>
-              </div>
 
-              <!-- 试验进度 -->
-              <div class="test-progress">
-                <div class="progress-step active">
-                  <div class="step-number">1</div>
-                  <div class="step-name">准备环境</div>
-                </div>
-                <div class="progress-line active"></div>
-                <div class="progress-step active">
-                  <div class="step-number">2</div>
-                  <div class="step-name">300用户</div>
-                </div>
-                <div class="progress-line active"></div>
-                <div class="progress-step active">
-                  <div class="step-number">3</div>
-                  <div class="step-name">500用户</div>
-                </div>
-                <div class="progress-line failed"></div>
-                <div class="progress-step failed">
-                  <div class="step-number">4</div>
-                  <div class="step-name">800用户</div>
-                </div>
-              </div>
-
-              <!-- 失败原因分析 -->
-              <div class="test-result failure-analysis">
-                <h4 class="result-title">失败原因分析</h4>
-                <p class="result-content">当并发用户数达到780人时，数据库连接耗尽，新用户无法建立数据库连接，导致系统响应超时。</p>
-
-                <!-- 改进建议 -->
-                <div class="improvement-suggestion">
+                <!-- 改进建议（仅失败时显示） -->
+                <div class="improvement-suggestion" v-if="record.status === 'failed' && record.faileTips">
                   <i class="fas fa-lightbulb"></i>
-                  <p>建议: 增加数据库连接池最大连接数，优化长连接超时时间，增加连接复用机制分析评估。</p>
+                  <p>建议: {{ record.faileTips }}</p>
                 </div>
               </div>
 
               <div class="record-actions">
-                <button class="operate-btn view-btn">查看详情</button>
+                <button class="operate-btn view-btn" @click="handleViewDetail(record)">查看详情</button>
                 <button class="operate-btn report-btn">生成报告</button>
               </div>
             </div>
+
+            <!-- 无数据提示 -->
+            <div v-if="!testRecords.length" class="no-records">暂无试验记录数据</div>
           </div>
         </div>
 
-        <!-- 5.1 巡检计划表格 -->
+        <!-- 巡检计划表格 -->
         <div v-if="activeTab === 'plan'" class="table-container">
           <el-table :data="planTableData" border>
             <el-table-column prop="name" label="计划名称" width="220">
@@ -221,14 +233,14 @@
                   <button class="operate-btn execute-btn" v-if="scope.row.status === 'drafted'">执行</button>
                   <button class="operate-btn pause-btn" v-if="scope.row.status === 'in-progress'">暂停</button>
                   <button class="operate-btn resume-btn" v-if="scope.row.status === 'paused'">恢复</button>
-                  <button class="operate-btn view-btn">查看详情</button>
+                  <button class="operate-btn view-btn" @click="handleViewDetail(scope.row)">查看详情</button>
                 </div>
               </template>
             </el-table-column>
           </el-table>
         </div>
 
-        <!-- 5.2 巡检任务表格 -->
+        <!-- 巡检任务表格 -->
         <div v-if="activeTab === 'task'" class="table-container">
           <el-table :data="taskTableData" border>
             <el-table-column prop="name" label="任务名称" width="220"></el-table-column>
@@ -249,7 +261,7 @@
                 <div class="operation-buttons">
                   <button class="operate-btn accept-btn" v-if="scope.row.status === 'pending'">接受</button>
                   <button class="operate-btn complete-btn" v-if="scope.row.status === 'accepted'">完成</button>
-                  <button class="operate-btn view-btn">查看详情</button>
+                  <button class="operate-btn view-btn" @click="handleViewDetail(scope.row)">查看详情</button>
                 </div>
               </template>
             </el-table-column>
@@ -257,7 +269,7 @@
         </div>
       </div>
 
-      <!-- 6. 分页 -->
+      <!-- 分页 -->
       <div class="pagination" v-if="activeTab !== 'record'">
         <p class="total-records">显示1到{{ pageSize }}条，共{{ totalRecords }}条记录</p>
         <el-pagination
@@ -270,23 +282,129 @@
           @size-change="handleSizeChange"
         ></el-pagination>
       </div>
+
+      <!-- 详情弹窗 -->
+      <el-dialog v-model="detailDialogVisible" title="任务详情" width="800px" :close-on-click-modal="false" center>
+        <div v-if="detailData" class="task-detail-container">
+          <div class="detail-card">
+            <h3 class="card-title">基本信息</h3>
+            <div class="info-row">
+              <span class="info-label">任务名称</span>
+              <span class="info-value">{{ detailData.taskName }}</span>
+              <span class="info-label">任务状态</span>
+              <span class="info-value" :class="getStatusClass(detailData.status)">
+                {{ getStatusText(detailData.status) }}
+              </span>
+            </div>
+            <div class="info-row">
+              <span class="info-label">测试对象</span>
+              <span class="info-value">{{ detailData.testObject }}</span>
+              <span class="info-label">完成进度</span>
+              <span class="info-value">{{ detailData.progress }}%</span>
+            </div>
+            <div class="info-row">
+              <span class="info-label">开始时间</span>
+              <span class="info-value">{{ detailData.beginTime }}</span>
+              <span class="info-label">结束时间</span>
+              <span class="info-value">{{ detailData.endTime }}</span>
+            </div>
+            <div class="info-row">
+              <span class="info-label">时间信息</span>
+              <span class="info-value">{{ detailData.timeInfo ? detailData.timeInfo.replace(/,/g, '—') : '-' }}</span>
+            </div>
+          </div>
+
+          <div class="detail-card">
+            <h3 class="card-title">执行人信息</h3>
+            <div v-if="detailData.personInfo" class="info-row">
+              <span class="info-label">执行人姓名</span>
+              <span class="info-value">{{ detailData.personInfo.userName }}</span>
+              <span class="info-label">联系电话</span>
+              <span class="info-value">{{ detailData.personInfo.phonenumber }}</span>
+            </div>
+            <div v-if="detailData.personInfo" class="info-row">
+              <span class="info-label">性别</span>
+              <span class="info-value">{{ detailData.personInfo.sex === '1' ? '男' : '女' }}</span>
+            </div>
+          </div>
+
+          <div class="detail-card">
+            <h3 class="card-title">关联计划</h3>
+            <div v-if="detailData.testPlan" class="info-row">
+              <span class="info-label">计划名称</span>
+              <span class="info-value">{{ detailData.testPlan.planName }}</span>
+              <span class="info-label">计划编号</span>
+              <span class="info-value">{{ detailData.testPlan.planCode }}</span>
+            </div>
+            <div v-if="detailData.testPlan" class="info-row">
+              <span class="info-label">计划时间</span>
+              <span class="info-value">{{ detailData.testPlan.beginTime }} — {{ detailData.testPlan.endTime }}</span>
+            </div>
+            <div v-if="detailData.testPlan && detailData.testPlan.testDevice" class="info-row">
+              <span class="info-label">测试设备</span>
+              <span class="info-value">{{ detailData.testPlan.testDevice }}</span>
+            </div>
+          </div>
+          <div v-if="detailData.nodes && detailData.nodes.length > 0" class="detail-card">
+            <h3 class="card-title">执行步骤</h3>
+            <div class="steps-container">
+              <div v-for="(node, index) in detailData.nodes" :key="node.id || index" class="step-item">
+                <div class="step-number">{{ node.code || index + 1 }}</div>
+                <div class="step-info">
+                  <div class="step-name">{{ node.name || '未命名步骤' }}</div>
+                  <div class="step-purpose">{{ node.intendedPurpose || '无说明' }}</div>
+                  <div class="step-time">计划时间：{{ formatDateTime(node.intendedTime) }}</div>
+                  <div v-if="node.finishTime" class="step-finish-time">完成时间：{{ formatDateTime(node.finishTime) }}</div>
+                  <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
+                </div>
+                <div class="step-status" :class="getStatusClass(node.status)">
+                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                </div>
+              </div>
+            </div>
+          </div>
+          <div v-if="detailData.testFinal || detailData.failReason" class="detail-card">
+            <h3 class="card-title">执行结果</h3>
+            <div v-if="detailData.testFinal" class="info-row">
+              <span class="info-label">测试结果</span>
+              <span class="info-value">{{ detailData.testFinal }}</span>
+            </div>
+            <div v-if="detailData.failReason" class="info-row">
+              <span class="info-label">失败原因</span>
+              <span class="info-value fail-reason">{{ detailData.failReason }}</span>
+            </div>
+          </div>
+        </div>
+        <div v-else class="loading-details">
+          <p>加载中...</p>
+        </div>
+        <template #footer>
+          <el-button @click="detailDialogVisible = false">关闭</el-button>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import router from '@/router';
+import { ElMessage } from 'element-plus';
+import { syrenwulist, syrenwujilu, syrenwuDetail } from '@/api/zhinengxunjian/shiyan/renwu';
 
 // 1. 选项卡状态管理
-const activeTab = ref('record'); // 默认显示"巡检记录"
-const showFilter = ref(false);
+const activeTab = ref('record'); // 默认显示"试验记录"
 
 // 2. 筛选条件
 const filterStatus = ref('all');
 const filterType = ref('all');
 const dateRange = ref([]);
 
+// 3. 试验记录数据
+const testRecords = ref([]);
+const planTableData = ref([]);
+const taskTableData = ref([]);
+
 // 4. 当前日期
 const currentDate = computed(() => {
   const date = new Date();
@@ -297,28 +415,219 @@ const currentDate = computed(() => {
 
 // 5. 统计数据
 const statData = ref({
-  completed: 12,
-  passRate: 83,
-  pendingAnalysis: 3,
-  avgDuration: '42分钟'
+  completed: 0,
+  passRate: 0,
+  pendingAnalysis: 0,
+  avgDuration: '0分钟',
+  // 新增：增长率相关数据
+  completedGrowth: 0,
+  passRateGrowth: 0,
+  avgDurationGrowth: 0
 });
 
-// 6. 试验记录数据
-const testRecords = ref([
-  {
-    date: '2025-06-15',
-    duration: '1小时45分钟',
-    responseTime: '1.2s',
-    errorRate: '0%',
-    temperature: '72°C'
-  },
-  {
-    date: '2025-06-12',
-    duration: '2小时10分钟'
-  }
-]);
+// 6. 分页相关
+const currentPage = ref(1);
+const pageSize = ref(20);
+const totalRecords = ref(0);
 
-// 9. 方法：切换顶部导航
+// 7. 方法：获取试验记录数据
+const getTestRecords = async () => {
+  try {
+    const response = await syrenwulist({
+      projectId: 1,
+      page: currentPage.value,
+      size: pageSize.value
+    });
+    console.log('syrenwulist API响应:', response);
+
+    if (response && response.code === 200 && response.rows) {
+      testRecords.value = response.rows;
+      totalRecords.value = response.total;
+    }
+  } catch (error) {
+    console.error('获取试验记录失败:', error);
+  }
+};
+
+// 8. 方法：获取统计数据
+const getStatisticsData = async () => {
+  try {
+    const response = await syrenwujilu({ projectId: 1 });
+    console.log('syrenwujilu API响应:', response);
+
+    // 确保接口返回成功状态码(code=200)且有数据
+    if (response && response.code === 200 && response.data) {
+      // 映射API返回的数据到statData
+      const apiData = response.data;
+
+      statData.value.completed = parseInt(apiData.finishCount) || 0;
+      statData.value.passRate = parseFloat(apiData.passValue) || 0;
+      statData.value.pendingAnalysis = parseInt(apiData.failCount) || 0;
+
+      // 格式化平均试验时长
+      const avgTime = parseFloat(apiData.averageTestTime) || 0;
+      statData.value.avgDuration = `${avgTime}分钟`;
+
+      // 处理增长率数据
+      statData.value.completedGrowth = parseInt(apiData.finishCountAdd) || 0;
+      statData.value.passRateGrowth = parseFloat(apiData.passValueAdd) || 0;
+
+      // 对于平均试验时长，时长减少是好的，所以我们需要反转逻辑
+      // 这里直接使用从API获取的增长率值，但在显示时根据正负来判断样式
+      statData.value.avgDurationGrowth = parseFloat(apiData.averageTestTimeAdd) || 0;
+    } else {
+      console.warn('获取统计数据失败或返回格式不正确:', response);
+      // 可以在这里添加错误提示或默认值处理
+      ElMessage.warning('获取统计数据失败，请稍后重试');
+    }
+  } catch (error) {
+    console.error('获取统计数据异常:', error);
+    ElMessage.error('获取统计数据异常，请稍后重试');
+  }
+};
+
+// 9. 辅助方法：对节点按code排序
+const sortedNodes = (nodes) => {
+  return [...nodes].sort((a, b) => a.code - b.code);
+};
+
+// 10. 辅助方法：格式化日期
+const formatDate = (dateString) => {
+  if (!dateString) return '未知日期';
+  const date = new Date(dateString);
+  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+};
+
+// 11. 辅助方法：格式化日期时间
+const formatDateTime = (dateTimeString) => {
+  if (!dateTimeString) return '未知时间';
+  const date = new Date(dateTimeString);
+  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(
+    date.getHours()
+  ).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+};
+
+// 12. 辅助方法：获取节点状态类名
+const getNodeStatusClass = (nodeStatus, recordStatus) => {
+  // 节点状态: 2-未完成, 3-失败, 其他假设为已完成
+  // 记录状态: 'failed'-失败, 'completed'-完成, 其他为进行中
+
+  // 如果节点本身状态为3（失败），直接返回failed类名
+  if (nodeStatus === '3') {
+    return 'failed';
+  }
+
+  if (recordStatus === 'failed') {
+    // 如果记录失败，找到失败阶段的节点
+    return nodeStatus === '2' ? 'failed' : 'active';
+  } else if (recordStatus === 'completed') {
+    return 'active';
+  } else {
+    // 进行中状态，已完成的节点标记为active
+    return nodeStatus !== '2' ? 'active' : '';
+  }
+};
+
+// 13. 辅助方法：获取进度线状态类名
+const getLineStatusClass = (index, nodes, recordStatus) => {
+  // 如果记录失败，找到第一个未完成的节点前的线为active
+
+  // 检查当前节点状态是否为3（失败）
+  if (nodes[index].status === '3') {
+    return 'failed';
+  }
+
+  if (recordStatus === 'failed') {
+    return nodes[index].status !== '2' ? 'active' : 'failed';
+  } else if (recordStatus === 'completed') {
+    return 'active';
+  } else {
+    // 进行中状态，已完成节点之间的线为active
+    return nodes[index].status !== '2' ? 'active' : '';
+  }
+};
+
+// 14. 辅助方法：获取进度颜色
+const getProgressColor = (status) => {
+  const colorMap = {
+    'drafted': '#e5e7eb',
+    'in-progress': '#165dff',
+    'completed': '#00b42a',
+    'paused': '#86909c'
+  };
+  return colorMap[status] || '#e5e7eb';
+};
+
+// 15. 辅助方法：获取状态文本
+const getStatusText = (status) => {
+  const statusMap = {
+    '1': '待执行',
+    '4': '执行中',
+    '2': '已延期',
+    '5': '已完成',
+    '3': '失败',
+    'completed': '已完成',
+    'failed': '失败',
+    'paused': '已延期',
+    'drafted': '待执行',
+    'in-progress': '执行中',
+    'normal': '已完成',
+    'attention': '执行中',
+    'problem': '失败'
+  };
+  return statusMap[status] || '未知状态';
+};
+
+// 16. 辅助方法：获取任务状态文本
+const getTaskStatusText = (status) => {
+  const statusMap = {
+    'pending': '待执行',
+    'accepted': '执行中',
+    'completed': '已完成',
+    'rejected': '已拒绝',
+    '1': '待执行',
+    '4': '执行中',
+    '2': '已延期',
+    '5': '已完成',
+    '3': '失败'
+  };
+  return statusMap[status] || '未知状态';
+};
+
+// 17. 辅助方法：获取状态类名
+const getStatusClass = (status) => {
+  const classMap = {
+    '1': 'tag-pending', // 待执行
+    '4': 'tag-executing', // 执行中
+    '2': 'tag-delayed', // 已延期
+    '5': 'tag-completed', // 已完成
+    '3': 'status-failed', // 失败
+    'completed': 'tag-completed',
+    'failed': 'status-failed',
+    'paused': 'tag-delayed',
+    'pending': 'tag-pending',
+    'accepted': 'tag-pending',
+    'rejected': 'status-failed',
+    'normal': 'tag-completed',
+    'attention': 'tag-executing',
+    'problem': 'status-failed'
+  };
+  return classMap[status] || 'tag-pending';
+};
+
+// 18. 分页事件处理
+const handlePageChange = (page) => {
+  currentPage.value = page;
+  getTestRecords();
+};
+
+const handleSizeChange = (size) => {
+  pageSize.value = size;
+  currentPage.value = 1;
+  getTestRecords();
+};
+
+// 19. 导航方法
 const handleInspection1 = () => {
   router.push('/rili/rili');
 };
@@ -341,17 +650,64 @@ const handleInspection7 = () => {
   router.push('/rili/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
+  activeTab.value = 'plan';
   router.push('/rili/shiyanguanli');
 };
 const handleInspectionManagement2 = () => {
+  activeTab.value = 'task';
   router.push('/rili/shiyanrenwu');
 };
 const handleInspectionManagement3 = () => {
+  activeTab.value = 'record';
   router.push('/rili/shiyanjilu');
 };
+
+// 20. 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const isDetailLoading = ref(false);
+
+// 22. 处理查看详情
+const handleViewDetail = async (row) => {
+  try {
+    if (!row || !row.id) {
+      ElMessage.error('记录ID不存在，无法查看详情');
+      return;
+    }
+
+    isDetailLoading.value = true;
+    const response = await syrenwuDetail(row.id);
+
+    if (response && response.code === 200) {
+      detailData.value = response.data;
+      detailDialogVisible.value = true;
+    } else {
+      ElMessage.error(response?.msg || '获取任务详情失败');
+    }
+  } catch (error) {
+    console.error('查看详情失败:', error);
+    ElMessage.error('获取任务详情失败');
+  } finally {
+    isDetailLoading.value = false;
+  }
+};
+
+// 24. 组件挂载时获取数据 - 确保页面进入时立即调用接口
+onMounted(async () => {
+  // 直接并立即调用数据接口，确保页面加载时能获取到最新数据
+  try {
+    // 并行调用两个数据接口以提高加载速度
+    await Promise.all([getStatisticsData(), getTestRecords()]);
+  } catch (error) {
+    console.error('数据加载失败:', error);
+    ElMessage.error('数据加载失败，请刷新页面重试');
+  }
+});
 </script>
 
 <style scoped>
+@import url('./css/detail-dialog.css');
+@import url('./css/step-bars.css');
 /* 1. 基础容器样式 */
 .operation-inspection {
   padding: 20px;
@@ -359,7 +715,6 @@ const handleInspectionManagement3 = () => {
   min-height: 100vh;
 }
 
-/* 导航栏样式 */
 .navigation-tabs {
   display: flex;
   margin-bottom: 20px;
@@ -396,7 +751,7 @@ const handleInspectionManagement3 = () => {
   box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
 }
 
-/* 选项卡样式 */
+/* 3. 选项卡样式 */
 .tabs-wrapper {
   background-color: #fff;
   padding: 20px;
@@ -405,34 +760,20 @@ const handleInspectionManagement3 = () => {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
-/* 筛选栏样式 */
-.filter-bar {
-  background-color: #fff;
-  padding: 20px;
-  border-radius: 8px;
+/* 4. 头部容器 */
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   margin-bottom: 16px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.header-actions {
   display: flex;
   align-items: center;
-  flex-wrap: wrap;
-  gap: 16px;
-}
-
-.filter-item {
-  flex-shrink: 0;
-}
-
-.filter-bar .el-select,
-.filter-bar .el-date-picker {
-  width: 150px;
-  height: 36px;
-}
-
-.filter-actions {
-  margin-left: auto;
-  display: flex;
   gap: 10px;
 }
+
 /* 5. 筛选和操作区域 */
 .filter-and-actions {
   display: flex;
@@ -452,24 +793,10 @@ const handleInspectionManagement3 = () => {
   align-items: center;
   flex-wrap: wrap;
 }
-.action-buttons {
-  display: flex;
-  gap: 12px;
-}
 .el-select,
 .date-picker {
   width: 160px;
 }
-.search-btn,
-.export-btn {
-  height: 36px;
-  border-radius: 4px;
-}
-.filter-btn {
-  background-color: #f3f4f6;
-  color: #6b7280;
-  border-color: #e5e7eb;
-}
 
 /* 6. 表格容器 */
 .table-container {
@@ -505,57 +832,58 @@ const handleInspectionManagement3 = () => {
 /* 8. 状态标签样式 */
 .status-tag {
   display: inline-block;
-  padding: 2px 8px;
-  border-radius: 4px;
+  padding: 4px 10px;
+  border-radius: 6px;
   font-size: 12px;
+  font-weight: 500;
+  border: 1px solid transparent;
 }
-.status-drafted {
-  background-color: #e0efff;
-  color: #165dff;
+
+/* 与试验任务页面相同的标签样式 */
+.tag-pending {
+  background-color: #e6f7ff;
+  color: #1677ff;
+  border-color: #91d5ff;
 }
+
+.tag-delayed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border-color: #ffccc7;
+}
+
+.tag-executing {
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border-color: #ffe58f;
+}
+
+.tag-completed {
+  background-color: #f6ffed;
+  color: #52c41a;
+  border-color: #b7eb8f;
+}
+
+/* 保留原有的部分样式以确保兼容性 */
 .status-in-progress {
-  background-color: #e0f2fe;
-  color: #0284c7;
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border-color: #ffe58f;
 }
 .status-completed {
-  background-color: #e6ffed;
-  color: #00b42a;
-}
-.status-paused {
-  background-color: #f2f3f5;
-  color: #86909c;
+  background-color: #f6ffed;
+  color: #52c41a;
+  border-color: #b7eb8f;
 }
 .status-pending {
-  background-color: #f9fafb;
-  color: #6b7280;
-}
-.status-accepted {
-  background-color: #eff6ff;
-  color: #2563eb;
-}
-.status-rejected {
-  background-color: #fee2e2;
-  color: #dc2626;
-}
-.status-normal {
-  background-color: #e6ffed;
-  color: #00b42a;
-}
-.status-attention {
-  background-color: #fff7e0;
-  color: #ff7d00;
-}
-.status-problem {
-  background-color: #fff2f0;
-  color: #f5222d;
-}
-.status-passed {
-  background-color: #e6ffed;
-  color: #00b42a;
+  background-color: #e6f7ff;
+  color: #1677ff;
+  border-color: #91d5ff;
 }
 .status-failed {
-  background-color: #fee2e2;
-  color: #dc2626;
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border-color: #ffccc7;
 }
 
 /* 9. 操作按钮样式 */
@@ -573,30 +901,6 @@ const handleInspectionManagement3 = () => {
   background: none;
   transition: all 0.2s;
 }
-.edit-btn {
-  color: #165dff;
-}
-.edit-btn:hover {
-  background-color: #e8f3ff;
-}
-.execute-btn {
-  color: #00b42a;
-}
-.execute-btn:hover {
-  background-color: #e6ffed;
-}
-.pause-btn {
-  color: #ff7d00;
-}
-.pause-btn:hover {
-  background-color: #fff7e0;
-}
-.resume-btn {
-  color: #722ed1;
-}
-.resume-btn:hover {
-  background-color: #f3e8ff;
-}
 .view-btn {
   color: #165dff;
 }
@@ -662,17 +966,7 @@ const handleInspectionManagement3 = () => {
   margin: 0 0 20px 0;
   text-align: right;
 }
-/* 头部容器 - 替换了固定gap的flex布局 */
-.header-container {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
 
-.header-actions {
-  display: flex;
-  gap: 10px;
-}
 /* 12. 统计卡片样式 */
 .stat-grid {
   display: grid;
@@ -719,6 +1013,21 @@ const handleInspectionManagement3 = () => {
   color: #ff7d00;
 }
 
+.stat-change.green {
+  background-color: #e6ffed;
+  color: #00b42a;
+}
+
+.stat-change.red {
+  background-color: #fff1f0;
+  color: #f5222d;
+}
+
+.stat-change.gray {
+  background-color: #f5f5f5;
+  color: #999;
+}
+
 /* 13. 试验记录样式 */
 .test-records {
   display: flex;
@@ -803,44 +1112,37 @@ const handleInspectionManagement3 = () => {
   margin-bottom: 8px;
 }
 
-.step-name {
-  font-size: 12px;
-  color: #6b7280;
-  text-align: center;
-}
-
 .progress-line {
   flex: 1;
-  height: 0;
-  border-top: 2px dashed #e5e7eb;
-  margin: 10px 0;
+  height: 2px;
+  background-color: #e5e7eb;
 }
 
 .progress-step.active .step-number {
-  background-color: #10b981;
+  background-color: #00b42a;
   color: white;
 }
 
 .progress-step.active .step-name {
-  color: #10b981;
+  color: #00b42a;
   font-weight: 500;
 }
 
 .progress-line.active {
-  border-top-color: #10b981;
+  background-color: #00b42a;
 }
 
 .progress-step.failed .step-number {
-  background-color: red;
+  background-color: #dc2626;
   color: white;
 }
 
 .progress-step.failed .step-name {
-  color: red;
+  color: #dc2626;
 }
 
 .progress-line.failed {
-  border-top-color: red;
+  background-color: #dc2626;
 }
 
 /* 15. 试验结果样式 */
@@ -906,7 +1208,17 @@ const handleInspectionManagement3 = () => {
   border-top: 1px solid #e5e7eb;
 }
 
-/* 17. 响应式适配 */
+/* 17. 无数据提示样式 */
+.no-records {
+  text-align: center;
+  padding: 40px 0;
+  color: #6b7280;
+  background-color: #fff;
+  border-radius: 8px;
+  border: 1px solid #e5e7eb;
+}
+
+/* 18. 响应式适配 */
 @media (max-width: 1200px) {
   .stat-grid {
     grid-template-columns: repeat(2, 1fr);
diff --git a/src/views/zhinengxunjian/shiyanrenwu.vue b/src/views/zhinengxunjian/shiyanrenwu.vue
index b4fcced..9dec2e3 100644
--- a/src/views/zhinengxunjian/shiyanrenwu.vue
+++ b/src/views/zhinengxunjian/shiyanrenwu.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="inspection-tasks">
       <!-- 导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab active" @click="handleInspection3">试验管理</div>
@@ -10,7 +10,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -29,7 +29,7 @@
               <el-option label="待执行" value="1"></el-option>
               <el-option label="执行中" value="4"></el-option>
               <el-option label="已延期" value="2"></el-option>
-              <!-- 接口“暂停”对应页面“已延期” -->
+
               <el-option label="已完成" value="5"></el-option>
               <el-option label="失败" value="3"></el-option>
             </el-select>
@@ -49,8 +49,8 @@
             </el-select>
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch">搜索</el-button>
-            <el-button type="primary" icon="el-icon-plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
       </div>
@@ -72,49 +72,83 @@
           </div>
 
           <div class="task-details">
-            <div class="detail-item">
-              <span class="detail-label">计划时间</span>
-              <span class="detail-value">{{ task.planTime }}</span>
-            </div>
-            <div class="detail-item">
-              <span class="detail-label">测试对象</span>
-              <span class="detail-value">{{ task.target }}</span>
-            </div>
-            <div class="detail-item">
-              <span class="detail-label">执行人</span>
-              <span class="detail-value">{{ task.executor }}</span>
-            </div>
-            <div class="detail-item">
-              <span class="detail-label">关联计划</span>
-              <span class="detail-value">{{ task.relatedPlan }}</span>
-            </div>
-
-            <!-- 已延期（暂停）原因 -->
-            <div v-if="task.status === '2'" class="delay-reason">
-              <span class="detail-label">延期原因</span>
-              <span class="detail-value">{{ task.delayReason || '未填写' }}</span>
-            </div>
-
-            <!-- 执行中进度 -->
-            <div v-if="task.status === '4'" class="progress-container">
-              <span class="detail-label">完成进度</span>
-              <div class="progress-bar" style="flex: 1; padding-left: 0; margin-top: 0">
-                <el-progress :percentage="task.progress || 0" stroke-width="6" :stroke-color="task.progressColor"></el-progress>
+            <!-- 失败卡片特殊展示 -->
+            <div v-if="task.status === '3'" class="failed-task-details">
+              <div class="detail-item">
+                <span class="detail-label">失败时间</span>
+                <span class="detail-value">{{ task.failTime || '未记录' }}</span>
+              </div>
+              <div class="detail-item">
+                <span class="detail-label">试验阶段</span>
+                <span class="detail-value">{{ task.testStage || '未记录' }}</span>
+              </div>
+              <div class="detail-item">
+                <span class="detail-label">执行人</span>
+                <span class="detail-value">{{ task.executor }}</span>
+              </div>
+              <div class="detail-item failed-reason-item">
+                <span class="detail-label">失败原因</span>
+                <span class="detail-value failed-reason">{{ task.originalData?.failReason || '未填写' }}</span>
               </div>
             </div>
 
-            <!-- 已完成/失败结果 -->
-            <div v-if="task.status === '5' || task.status === '3'" class="task-result">
-              <span class="detail-label">结果</span>
-              <span class="detail-value" :class="task.resultClass">{{ task.result }}</span>
+            <!-- 其他状态的卡片展示 -->
+            <div v-else>
+              <div class="detail-item">
+                <span class="detail-label">计划时间</span>
+                <span class="detail-value">{{ task.planTime }}</span>
+              </div>
+              <div class="detail-item">
+                <span class="detail-label">测试对象</span>
+                <span class="detail-value">{{ task.target }}</span>
+              </div>
+              <div class="detail-item">
+                <span class="detail-label">执行人</span>
+                <span class="detail-value">{{ task.executor }}</span>
+              </div>
+              <div class="detail-item">
+                <span class="detail-label">关联计划</span>
+                <span class="detail-value">{{ task.relatedPlan }}</span>
+              </div>
+
+              <!-- 已延期（暂停）原因 -->
+              <div v-if="task.status === '2'" class="delay-reason">
+                <span class="detail-label">延期原因</span>
+                <span class="detail-value">{{ task.delayReason || '未填写' }}</span>
+              </div>
+
+              <!-- 执行中进度 -->
+              <div v-if="task.status === '4'" class="progress-container">
+                <span class="detail-label">完成进度</span>
+                <div class="progress-bar" style="flex: 1; padding-left: 0; margin-top: 0">
+                  <el-progress :percentage="task.progress || 0" stroke-width="6" :stroke-color="task.progressColor"></el-progress>
+                </div>
+              </div>
+
+              <!-- 已完成结果 -->
+              <div v-if="task.status === '5'" class="task-result">
+                <span class="detail-label">结果</span>
+                <span class="detail-value" :class="task.resultClass">{{ task.result }}</span>
+              </div>
             </div>
           </div>
 
           <div class="task-actions">
-            <el-button type="text" class="action-btn view-btn" @click="handleView(task)"> 详情 </el-button>
-            <el-button type="primary" :class="task.actionClass" @click="handleAction(task)">
-              {{ task.actionText }}
-            </el-button>
+            <!-- 失败卡片的特殊操作按钮 -->
+            <div v-if="task.status === '3'" class="failed-task-actions">
+              <el-button type="text" class="action-btn view-btn" @click="handleView(task)"> 详情 </el-button>
+              <el-button type="primary" :class="task.actionClass" @click="handleAction(task)">
+                {{ task.actionText }}
+              </el-button>
+            </div>
+
+            <!-- 其他状态的操作按钮 -->
+            <div v-else>
+              <el-button type="text" class="action-btn view-btn" @click="handleView(task)"> 详情 </el-button>
+              <el-button type="primary" :class="task.actionClass" @click="handleAction(task)">
+                {{ task.actionText }}
+              </el-button>
+            </div>
           </div>
         </div>
       </div>
@@ -137,7 +171,7 @@
       </div>
 
       <!-- 添加新任务弹窗 -->
-      <el-dialog v-model="createTaskDialogVisible" title="添加新任务" width="500px" :before-close="handleCancelCreateTask">
+      <el-dialog v-model="createTaskDialogVisible" title="添加新任务" width="750px" :before-close="handleCancelCreateTask">
         <el-form ref="createTaskFormRef" :model="createTaskForm" :rules="createTaskRules" label-width="80px">
           <el-form-item label="任务名称" prop="taskName">
             <el-input v-model="createTaskForm.taskName" placeholder="输入任务名称" />
@@ -192,6 +226,27 @@
               style="width: 100%"
             />
           </el-form-item>
+
+          <!-- 步骤条区域 -->
+          <el-form-item label="执行步骤" prop="steps">
+            <div class="steps-container">
+              <div class="step-item" v-for="(step, index) in createTaskForm.steps" :key="index">
+                <div class="step-number">{{ index + 1 }}</div>
+                <el-input v-model="step.name" placeholder="输入步骤名称" style="flex: 1; margin-right: 10px" />
+                <el-input v-model="step.intendedPurpose" placeholder="输入预期目的" style="flex: 1; margin-right: 10px" />
+                <el-date-picker
+                  v-model="step.intendedTime"
+                  type="datetime"
+                  placeholder="选择计划时间"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                  style="width: 180px; margin-right: 10px"
+                />
+                <el-button v-if="createTaskForm.steps.length > 1" type="text" @click="removeStep(index)" style="color: #f56c6c"> 删除 </el-button>
+              </div>
+              <el-button type="text" class="add-step-btn" @click="addStep">添加步骤</el-button>
+            </div>
+          </el-form-item>
         </el-form>
         <template #footer>
           <span class="dialog-footer">
@@ -215,7 +270,7 @@
                 </div>
                 <div class="info-item">
                   <span class="info-label">任务状态：</span>
-                  <span class="info-value" :class="getStatusClass(detailData.status)">
+                  <span class="info-value" :class="getTaskStatusClass(detailData.status)">
                     {{ getStatusText(detailData.status) }}
                   </span>
                 </div>
@@ -260,7 +315,7 @@
                 </div>
                 <div class="info-item">
                   <span class="info-label">联系电话：</span>
-                  <span class="info-value">{{ detailData.personInfo.phone }}</span>
+                  <span class="info-value">{{ detailData.personInfo.phonenumber }}</span>
                 </div>
               </div>
               <div v-if="detailData.personInfo" class="info-row">
@@ -268,10 +323,6 @@
                   <span class="info-label">性别：</span>
                   <span class="info-value">{{ detailData.personInfo.sex === '1' ? '男' : '女' }}</span>
                 </div>
-                <div class="info-item">
-                  <span class="info-label">民族：</span>
-                  <span class="info-value">{{ detailData.personInfo.nation }}</span>
-                </div>
               </div>
               <div v-else class="no-info">暂无执行人信息</div>
             </div>
@@ -307,6 +358,26 @@
             </div>
           </div>
 
+          <!-- 步骤条 -->
+          <div v-if="detailData.nodes && detailData.nodes.length > 0" class="detail-card">
+            <h3 class="card-title">执行步骤</h3>
+            <div class="steps-container">
+              <div v-for="(node, index) in detailData.nodes" :key="node.id || index" class="step-item">
+                <div class="step-number">{{ node.code || index + 1 }}</div>
+                <div class="step-info">
+                  <div class="step-name">{{ node.name || '未命名步骤' }}</div>
+                  <div class="step-purpose">{{ node.intendedPurpose || '无说明' }}</div>
+                  <div class="step-time">计划时间：{{ formatDateTime(node.intendedTime) }}</div>
+                  <div v-if="node.finishTime" class="step-finish-time">完成时间：{{ formatDateTime(node.finishTime) }}</div>
+                  <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
+                </div>
+                <div class="step-status" :class="getStatusClass(node.status)">
+                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                </div>
+              </div>
+            </div>
+          </div>
+
           <!-- 任务执行结果信息卡片（如果有） -->
           <div v-if="detailData.testFinal || detailData.failReason" class="detail-card">
             <h3 class="card-title">执行结果信息</h3>
@@ -335,19 +406,48 @@
           </span>
         </template>
       </el-dialog>
+
+      <!-- 日志弹窗 -->
+      <el-dialog v-model="logsDialogVisible" title="任务执行日志" width="700px" :close-on-click-modal="false">
+        <div v-if="!logsLoading" class="logs-container">
+          <div v-if="logsData.length > 0" class="logs-list">
+            <div v-for="(log, index) in logsData" :key="index" class="log-item">
+              <div class="log-time">{{ log.timestamp || '-' }}</div>
+              <div class="log-content">{{ log.content || '-' }}</div>
+            </div>
+          </div>
+          <div v-else class="no-logs">
+            <el-empty description="暂无执行日志" />
+          </div>
+        </div>
+        <div v-else class="loading-logs">
+          <el-skeleton :count="5" class="log-skeleton" />
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="logsDialogVisible = false">关闭</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, computed, onMounted, getCurrentInstance } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import router from '@/router';
 // 引入已定义的接口函数
 import { syrenwulist, syrenwuDetail, addsyrenwu, updatesyrenwu } from '@/api/zhinengxunjian/shiyan/renwu';
 import { shiyanlist } from '@/api/zhinengxunjian/shiyan';
 import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian/index';
+import { addjiedian } from '@/api/zhinengxunjian/jiedian/index';
 // 引入Element Plus组件（提示/空状态/骨架屏/弹窗）
-import { ElMessage, ElEmpty, ElSkeleton, ElForm, ElMessageBox } from 'element-plus';
+import { ElMessage, ElEmpty, ElSkeleton, ElForm, ElMessageBox, ElDialog } from 'element-plus';
+
+// 日志弹窗相关变量
+const logsDialogVisible = ref(false);
+const logsData = ref([]);
+const logsLoading = ref(false);
 
 /**
  * 根据任务ID获取完整的任务详情数据
@@ -379,6 +479,24 @@ const loading = ref(false);
 // 筛选条件（与接口参数对应）
 const taskStatus = ref(''); // 任务状态：1=待执行，2=暂停（已延期），3=失败，4=执行中，5=已完成
 const planType = ref(''); // 关联计划ID：1=每日，2=每周，3=每月
+
+/**
+ * 将节点数据按模块分组
+ * @param {Array} nodes - 节点数据数组
+ * @returns {Array} 分组后的模块数组
+ */
+const groupNodesByModule = (nodes) => {
+  if (!nodes || !Array.isArray(nodes)) {
+    return [];
+  }
+  // 这里简单地将所有节点放在一个默认模块下，实际应用中可以根据节点数据的module字段进行分组
+  const defaultGroup = {
+    module: '测试步骤',
+    items: nodes
+  };
+
+  return [defaultGroup];
+};
 const executor = ref('all'); // 执行人ID：all=全部
 
 // 用户列表（通过xunjianUserlist接口获取）
@@ -420,15 +538,58 @@ const getStatusText = (status) => {
  * @param {string} status - 任务状态码
  * @returns {string} 样式类名
  */
+
+/**
+ * 获取步骤状态对应的样式类
+ * @param {string|number} status - 步骤状态码
+ * @returns {string} 样式类名
+ */
 const getStatusClass = (status) => {
+  // 处理可能的数字输入
+  const statusStr = status?.toString() || '';
   const statusClassMap = {
     '1': 'status-pending',
     '2': 'status-delayed',
-    '3': 'status-failed',
-    '4': 'status-running',
-    '5': 'status-completed'
+    '3': 'status-executing',
+    '4': 'status-completed'
   };
-  return statusClassMap[status] || '';
+  return statusClassMap[statusStr] || 'status-unknown';
+};
+
+/**
+ * 格式化日期时间（用于步骤条）
+ * @param {string} dateTime - 日期时间字符串
+ * @returns {string} 格式化后的日期时间
+ */
+const formatDateTime = (dateTime) => {
+  if (!dateTime) return '-';
+  try {
+    const date = new Date(dateTime);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } catch (error) {
+    return dateTime;
+  }
+};
+
+/**
+ * 获取步骤状态文本
+ * @param {string|number} status - 步骤状态码
+ * @returns {string} 状态文本
+ */
+const getStepStatusText = (status) => {
+  const statusStr = status?.toString() || '';
+  const statusMap = {
+    '1': '待执行',
+    '2': '执行中',
+    '3': '已完成',
+    '4': '已延期'
+  };
+  return statusMap[statusStr] || '未知状态';
 };
 
 // 创建任务弹窗
@@ -441,7 +602,8 @@ const createTaskForm = ref({
   relatedPlan: '', // 关联计划ID（接口testPlanId）
   executor: '', // 执行人ID（接口person）
   workTimeRange1: null, // 工作时间段1
-  workTimeRange2: null // 工作时间段2
+  workTimeRange2: null, // 工作时间段2
+  steps: [{ name: '', intendedPurpose: '', intendedTime: '' }] // 步骤数据数组
 });
 // 创建任务表单规则
 const createTaskRules = {
@@ -453,6 +615,21 @@ const createTaskRules = {
   executor: [{ required: true, message: '请选择执行人', trigger: 'change' }]
 };
 
+// 添加步骤
+const addStep = () => {
+  createTaskForm.value.steps.push({ name: '', intendedPurpose: '', intendedTime: '' });
+};
+
+// 删除步骤
+const removeStep = (index) => {
+  // 确保至少保留一个步骤
+  if (createTaskForm.value.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  createTaskForm.value.steps.splice(index, 1);
+};
+
 // 构建timeInfo字符串
 const getTaskTimeInfoString = () => {
   const timeInfoArray = [];
@@ -482,36 +659,13 @@ const getUsersList = async () => {
   try {
     const response = await xunjianUserlist({});
     if (response.code === 200) {
-      // 从任务数据中提取用户信息
-      const usersMap = new Map(); // 使用Map确保id唯一
-      const tasks = response.rows || [];
+      // 直接从接口返回的用户列表中提取信息
+      const users = response.rows || [];
 
-      tasks.forEach((task) => {
-        // 提取personInfo中的用户信息
-        if (task.personInfo && task.personInfo.id && task.personInfo.userName) {
-          usersMap.set(task.personInfo.id, {
-            id: task.personInfo.id,
-            userName: task.personInfo.userName
-          });
-        }
-
-        // 提取testPlan.persons中的用户信息
-        if (task.testPlan && task.testPlan.persons && Array.isArray(task.testPlan.persons)) {
-          task.testPlan.persons.forEach((person) => {
-            if (person.id && person.userName) {
-              usersMap.set(person.id, {
-                id: person.id,
-                userName: person.userName
-              });
-            }
-          });
-        }
-      });
-
-      // 将Map转换为下拉选择器需要的格式：{ label, value }
-      userList.value = Array.from(usersMap.values()).map((user) => ({
-        label: user.userName, // 显示在下拉框中的文本
-        value: user.id // 选中后的值
+      // 将用户数据转换为所需格式：包含id和userName以适配模板和getUserById函数
+      userList.value = users.map((user) => ({
+        id: user.userId, // 用于标识和查找
+        userName: user.userName // 显示名称
       }));
 
       // 调试信息，确认数据格式正确
@@ -604,9 +758,9 @@ const mapApiToView = (apiData) => {
     },
     '3': {
       statusText: '失败',
-      cardClass: 'card-delayed',
-      tagClass: 'tag-delayed',
-      actionText: '重试',
+      cardClass: 'card-failed',
+      tagClass: 'tag-failed',
+      actionText: '重新执行',
       actionClass: 'reschedule-btn',
       result: '失败',
       resultClass: 'result-abnormal'
@@ -663,6 +817,46 @@ const mapApiToView = (apiData) => {
     executorName = getUserById(apiData.person);
   }
 
+  // 格式化失败时间
+  const formatFailTime = (timeStr) => {
+    if (timeStr) {
+      const date = new Date(timeStr);
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(
+        date.getHours()
+      ).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+    }
+    return '未记录';
+  };
+
+  // 生成试验阶段信息
+  const getTestStage = () => {
+    try {
+      // 优先查找nodes数组中status为2的第一条数据
+      if (apiData && apiData.nodes && Array.isArray(apiData.nodes)) {
+        const firstStatusTwoNode = apiData.nodes.find((node) => {
+          // 确保node存在且有status属性
+          if (!node || node.status === undefined) return false;
+          // 处理status可能是字符串或数字的情况
+          return node.status === '2' || node.status === 2;
+        });
+        if (firstStatusTwoNode && firstStatusTwoNode.name) {
+          return firstStatusTwoNode.name;
+        }
+      }
+      // 如果没有找到符合条件的nodes数据，检查是否有明确的试验阶段信息
+      if (apiData && apiData.testStage) {
+        return apiData.testStage;
+      }
+      // 如果没有明确的阶段信息，尝试从关联计划中获取
+      if (apiData && apiData.testPlan && apiData.testPlan.stage) {
+        return apiData.testPlan.stage;
+      }
+    } catch (error) {
+      console.error('获取试验阶段信息失败:', error);
+    }
+    return '未记录';
+  };
+
   return {
     id: apiData.id, // 任务ID（v-for的key，唯一标识）
     title: apiData.taskName || '未命名任务', // 任务名称
@@ -682,7 +876,10 @@ const mapApiToView = (apiData) => {
     actionText: statusConfig.actionText,
     actionClass: statusConfig.actionClass,
     testFinal: apiData.testFinal, // 结果（用于详情页）
-    originalData: apiData // 保存原始数据，用于后续操作
+    originalData: apiData, // 保存原始数据，用于后续操作
+    // 失败卡片特有字段
+    failTime: formatFailTime(apiData.failTime),
+    testStage: getTestStage()
   };
 };
 
@@ -762,9 +959,18 @@ const handleAction = async (task) => {
       id: task.id
     };
 
+    // 声明resultType变量，提升作用域
+    let resultType = null;
+
     // 3. 根据任务状态只修改状态相关的字段
     if (task.status === '4') {
       // 执行中 → 完成：使用弹窗确认结果
+      try {
+        // 保持原有结构
+      } catch (error) {
+        console.error('捕获到异常:', error);
+      }
+
       try {
         const confirmResult = await ElMessageBox.confirm('请选择试验结果', '完成试验', {
           confirmButtonText: '正常',
@@ -776,12 +982,47 @@ const handleAction = async (task) => {
         updateParams.status = '5';
         updateParams.progress = 100;
         updateParams.testFinal = '正常';
+        resultType = 'normal'; // 现在在外部作用域中定义
       } catch (error) {
         if (error === 'cancel') {
-          // 用户点击取消（异常）
-          updateParams.status = '5';
-          updateParams.progress = 100;
-          updateParams.testFinal = '异常';
+          // 用户点击取消（异常），弹出失败原因输入框
+          try {
+            const failReasonResult = await ElMessageBox.prompt('请输入失败原因', '试验异常', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+              inputPlaceholder: '请详细描述失败原因...',
+              inputValidator: (value) => {
+                if (!value || value.trim() === '') {
+                  return '失败原因不能为空';
+                }
+                return true;
+              }
+            });
+
+            // 用户输入了失败原因并确认
+            updateParams.status = '3';
+            updateParams.progress = '';
+            updateParams.testFinal = '异常';
+            updateParams.failReason = failReasonResult.value; // 绑定失败原因参数
+            updateParams.failTime = formatLocalDateTime(new Date()); // 记录失败时间
+            resultType = 'abnormal';
+
+            // 将第一条未完成的步骤状态改为3（失败）
+            if (taskDetails.nodes && Array.isArray(taskDetails.nodes)) {
+              const firstUnfinishedNode = taskDetails.nodes.find((node) => {
+                return node.status === '2' || node.status === 2;
+              });
+              if (firstUnfinishedNode) {
+                firstUnfinishedNode.status = '3';
+                // 确保更新到updateParams中
+                updateParams.nodes = taskDetails.nodes;
+              }
+            }
+          } catch (innerError) {
+            // 用户取消了失败原因输入
+            return;
+          }
         } else {
           // 关闭弹窗，不执行操作
           return;
@@ -792,21 +1033,48 @@ const handleAction = async (task) => {
       switch (task.status) {
         case '1': // 待执行 → 开始执行（状态改为4）
           updateParams.status = '4';
-          updateParams.progress = 10; // 初始进度10%
+          updateParams.progress = 0; // 初始进度10%
+          // 设置开始时间为当前时间（使用本地时间而非UTC时间）
+          updateParams.planBeginTime = formatLocalDateTime(new Date());
           break;
         case '2': // 已延期 → 重新安排（状态改为1，重置时间）
           updateParams.status = '1';
-          updateParams.beginTime = new Date().toISOString().slice(0, 16).replace('T', ' ');
+          updateParams.beginTime = formatLocalDateTime(new Date());
           break;
         case '3': // 失败 → 重试（状态改为1）
           updateParams.status = '1';
+          // 清空失败相关字段，使用适合各字段数据类型的默认值
+          updateParams.failReason = '';
+          updateParams.failTime = ''; // 时间类型字段使用null
+          updateParams.failPhase = ''; // 整数类型字段使用0
+
+          // 将失败的步骤状态改回2（未完成）
+          if (taskDetails.nodes && Array.isArray(taskDetails.nodes)) {
+            taskDetails.nodes.forEach((node) => {
+              if (node.status === '3' || node.status === 3) {
+                node.status = '2';
+              }
+            });
+            // 确保更新到updateParams中
+            updateParams.nodes = taskDetails.nodes;
+          }
           break;
         default:
           return;
       }
     }
 
-    // 调用更新接口
+    // 对于执行中状态('4')的任务，预先设置好时间字段
+    if (task.status === '4') {
+      // 根据结果类型设置相应的时间（使用本地时间而非UTC时间）
+      if (resultType === 'normal') {
+        updateParams.planFinishTime = formatLocalDateTime(new Date());
+      } else if (resultType === 'abnormal') {
+        updateParams.failTime = formatLocalDateTime(new Date());
+      }
+    }
+
+    // 调用更新接口（只调用一次）
     const response = await updatesyrenwu(updateParams);
     if (response.code === 200) {
       ElMessage.success(`任务${task.actionText}成功`);
@@ -819,6 +1087,20 @@ const handleAction = async (task) => {
   }
 };
 
+/**
+ * 格式化本地日期时间为 'YYYY-MM-DD HH:mm' 格式
+ * @param {Date} date - 日期对象
+ * @returns {string} 格式化后的日期时间字符串
+ */
+const formatLocalDateTime = (date) => {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hours}:${minutes}`;
+};
+
 /**
  * 打开创建任务弹窗
  */
@@ -854,6 +1136,48 @@ const handleSaveTask = async () => {
           return;
         }
 
+        // 验证所有步骤
+        const hasEmptyStep = createTaskForm.value.steps.some((step) => !step.name.trim() || !step.intendedPurpose.trim());
+        if (hasEmptyStep) {
+          ElMessage.warning('请填写完整所有步骤信息');
+          return;
+        }
+
+        // 处理步骤数据
+        let nodeIds = '';
+        if (createTaskForm.value.steps && createTaskForm.value.steps.length > 0) {
+          // 过滤非空步骤并映射为所需格式
+          const validSteps = createTaskForm.value.steps
+            .filter((step) => step.name.trim() && step.intendedPurpose.trim())
+            .map((step, index) => ({
+              createTime: new Date().toISOString(),
+              updateTime: new Date().toISOString(),
+              params: {},
+              module: 3,
+              code: index + 1,
+              name: step.name,
+              intendedPurpose: step.intendedPurpose,
+              intendedTime: step.intendedTime ? new Date(step.intendedTime).toISOString() : new Date().toISOString(),
+              finishTime: '',
+              remark: '',
+              status: 2
+            }));
+
+          if (validSteps.length > 0) {
+            try {
+              // 调用addjiedian接口获取nodeIds
+              const jiedianResponse = await addjiedian(validSteps);
+              if (jiedianResponse.code === 200 && jiedianResponse.msg) {
+                nodeIds = jiedianResponse.msg; // 直接使用字符串格式，不转换为数组
+              }
+            } catch (error) {
+              console.error('添加节点失败:', error);
+              ElMessage.error('添加执行步骤失败');
+              return;
+            }
+          }
+        }
+
         const createParams = {
           createDept: 0, // 可根据实际情况从全局状态获取
           createBy: 0, // 可根据实际情况从全局状态获取当前用户ID
@@ -874,19 +1198,20 @@ const handleSaveTask = async () => {
           status: '1', // 初始状态：待执行（必需）
           testPlanId: createTaskForm.value.relatedPlan, // 关联计划ID（必需）
           testSetting: '', // 测试设置
-          planBeginTime: createTaskForm.value.timeRange[0], // 计划开始时间
+          planBeginTime: '', // 计划开始时间（新增时为空）
           progress: 0, // 初始进度0%
           failReason: '',
-          failTime: now.toISOString(),
-          failPhase: 0,
+          failTime: '', // 失败时间（新增时为空）
+          failPhase: '',
           faileAnalyze: '',
           faileTips: '',
           testLongTime: 0,
           testFinal: '',
           finalInfo: '',
           pauseFor: '',
-          pauseTime: now.toISOString(),
-          planFinishTime: createTaskForm.value.timeRange[1] // 计划完成时间
+          pauseTime: '', // 暂停时间（新增时为空）
+          planFinishTime: '', // 计划完成时间（新增时为空）
+          nodeIds: nodeIds // 步骤节点ID数组
         };
 
         // 3. 调用创建接口
@@ -927,7 +1252,10 @@ const handleCancelCreateTask = () => {
     inspectionTarget: '',
     timeRange: [],
     relatedPlan: '',
-    executor: ''
+    executor: '',
+    workTimeRange1: null,
+    workTimeRange2: null,
+    steps: [{ name: '', intendedPurpose: '', intendedTime: '' }]
   };
 };
 
@@ -974,9 +1302,24 @@ onMounted(() => {
 const pagedTasks = computed(() => {
   return tasks.value;
 });
+// 获取任务状态对应的CSS类
+const getTaskStatusClass = (status) => {
+  const statusStr = status?.toString() || '';
+  const statusMap = {
+    '1': 'status-pending',
+    '2': 'status-delayed',
+    '3': 'status-failed',
+    '4': 'status-running',
+    '5': 'status-completed'
+  };
+  return statusMap[statusStr] || 'status-pending';
+};
 </script>
 
 <style scoped>
+@import url('./css/step-bars.css');
+@import url('./css/detail-dialog.css');
+
 /* 原有样式不变，新增无数据提示样式 */
 .inspection-tasks {
   padding: 20px;
@@ -1077,6 +1420,10 @@ const pagedTasks = computed(() => {
   box-shadow: 0 4px 16px rgba(82, 196, 26, 0.15);
 }
 
+.card-failed {
+  box-shadow: 0 4px 16px rgba(255, 77, 79, 0.15);
+}
+
 /* 左侧状态线颜色 */
 .card-pending::before {
   background-color: #1677ff;
@@ -1090,6 +1437,9 @@ const pagedTasks = computed(() => {
 .card-completed::before {
   background-color: #52c41a;
 }
+.card-failed::before {
+  background-color: #ff4d4f;
+}
 
 /* 卡片悬停效果 */
 .task-card:hover {
@@ -1146,6 +1496,12 @@ const pagedTasks = computed(() => {
   border-color: #b7eb8f;
 }
 
+.tag-failed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border-color: #ffccc7;
+}
+
 .task-details {
   margin-bottom: 16px;
 }
@@ -1229,24 +1585,26 @@ const pagedTasks = computed(() => {
   color: #165dff;
 }
 
-.start-btn {
-  background-color: #165dff;
-  border-color: #165dff;
+/* 失败卡片特殊样式 */
+.failed-task-details {
+  margin-bottom: 16px;
 }
 
-.reschedule-btn {
-  background-color: #ff7d00;
-  border-color: #ff7d00;
+.failed-reason-item {
+  padding-top: 8px;
+  border-top: 1px dashed #f0f2f5;
 }
 
-.complete-btn {
-  background-color: #00b42a;
-  border-color: #00b42a;
+.failed-reason {
+  color: #f53f3f;
+  font-weight: 500;
 }
 
-.report-btn {
-  background-color: #86909c;
-  border-color: #86909c;
+.failed-task-actions {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  gap: 10px;
 }
 
 /* 分页区域样式 */
@@ -1302,6 +1660,46 @@ const pagedTasks = computed(() => {
   margin-bottom: 30px;
 }
 
+/* 日志弹窗样式 */
+.logs-container {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.logs-list {
+  padding: 10px 0;
+}
+
+.log-item {
+  padding: 12px 0;
+  border-bottom: 1px solid #f0f2f5;
+}
+
+.log-item:last-child {
+  border-bottom: none;
+}
+
+.log-time {
+  font-size: 12px;
+  color: #86909c;
+  margin-bottom: 4px;
+}
+
+.log-content {
+  font-size: 14px;
+  color: #1d2129;
+  line-height: 1.6;
+}
+
+.no-logs {
+  text-align: center;
+  padding: 60px 0;
+}
+
+.log-skeleton {
+  margin: 12px 0;
+}
+
 /* 任务详情弹窗样式 */
 .task-detail-container {
   max-height: 600px;
@@ -1376,10 +1774,6 @@ const pagedTasks = computed(() => {
   color: #e6a23c;
 }
 
-.status-running {
-  color: #409eff;
-}
-
 .status-completed {
   color: #67c23a;
 }
diff --git a/src/views/zhinengxunjian/xunjianjihua.vue b/src/views/zhinengxunjian/xunjianjihua.vue
index b7df85b..11db92c 100644
--- a/src/views/zhinengxunjian/xunjianjihua.vue
+++ b/src/views/zhinengxunjian/xunjianjihua.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="operation-inspection">
-    <div class="navigation-tabs">
+    <!-- <div class="navigation-tabs">
       <div class="nav-tab" @click="handleInspection1">待办事项</div>
       <div class="nav-tab active" @click="handleInspection2">巡检管理</div>
       <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -8,11 +8,11 @@
       <div class="nav-tab" @click="handleInspection5">抢修管理</div>
       <div class="nav-tab" @click="handleInspection6">工单管理</div>
       <div class="nav-tab" @click="handleInspection7">运维组织</div>
-    </div>
+    </div> -->
     <div class="header-container">
       <div class="header-actions">
         <el-button type="primary" class="export-btn">筛选</el-button>
-        <el-button type="primary" class="create-btn">导出数据</el-button>
+        <el-button type="primary" icon="UploadFilled" class="create-btn">导出数据</el-button>
       </div>
     </div>
 
@@ -54,7 +54,7 @@
         ></el-date-picker>
       </div>
       <div class="filter-actions">
-        <el-button type="primary" class="search-btn" @click="fetchDashboardData">搜索</el-button>
+        <el-button type="primary" icon="Search" class="search-btn" @click="fetchDashboardData">搜索</el-button>
       </div>
     </div>
 
@@ -127,14 +127,14 @@
                 <div class="space-y-4">
                   <div>
                     <div class="flex justify-between text-sm mb-1">
-                      <span class="text-gray-600">完成率</span>
+                      <span class="text-gray-600">巡检完成率</span>
                       <span class="font-medium text-gray-800">{{ completionRate }}%</span>
                     </div>
                     <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
                       <div class="bg-blue-500 h-2 rounded-full transition-all duration-1500 ease-out" :style="{ width: completionRate + '%' }"></div>
                     </div>
                   </div>
-                  <div>
+                  <!-- <div>
                     <div class="flex justify-between text-sm mb-1">
                       <span class="text-gray-600">解决率</span>
                       <span class="font-medium text-gray-800">{{ resolutionRate }}%</span>
@@ -142,10 +142,10 @@
                     <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
                       <div class="bg-red-500 h-2 rounded-full transition-all duration-1500 ease-out" :style="{ width: resolutionRate + '%' }"></div>
                     </div>
-                  </div>
+                  </div> -->
                   <div>
                     <div class="flex justify-between text-sm mb-1">
-                      <span class="text-gray-600">及时率</span>
+                      <span class="text-gray-600">解决效率</span>
                       <span class="font-medium text-gray-800">{{ timelinessRate }}%</span>
                     </div>
                     <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
@@ -161,65 +161,8 @@
             <!-- 发现问题种类 -->
             <div class="py-4">
               <h3 class="section-title">发现问题种类</h3>
-              <div class="space-y-4">
-                <div>
-                  <div class="flex justify-between text-sm mb-1">
-                    <span class="text-gray-600">温度异常率</span>
-                    <span class="text-gray-500">{{ problemTypes.temperature }}%</span>
-                  </div>
-                  <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
-                    <div
-                      class="bg-blue-500 h-2 rounded-full transition-all duration-1500 ease-out"
-                      :style="{ width: problemTypes.temperature + '%' }"
-                    ></div>
-                  </div>
-                </div>
-                <div>
-                  <div class="flex justify-between text-sm mb-1">
-                    <span class="text-gray-600">内存使用率</span>
-                    <span class="text-gray-500">{{ problemTypes.memory }}%</span>
-                  </div>
-                  <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
-                    <div
-                      class="bg-blue-500 h-2 rounded-full transition-all duration-1500 ease-out"
-                      :style="{ width: problemTypes.memory + '%' }"
-                    ></div>
-                  </div>
-                </div>
-                <div>
-                  <div class="flex justify-between text-sm mb-1">
-                    <span class="text-gray-600">CPU负载</span>
-                    <span class="text-gray-500">{{ problemTypes.cpu }}%</span>
-                  </div>
-                  <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
-                    <div class="bg-blue-500 h-2 rounded-full transition-all duration-1500 ease-out" :style="{ width: problemTypes.cpu + '%' }"></div>
-                  </div>
-                </div>
-                <div>
-                  <div class="flex justify-between text-sm mb-1">
-                    <span class="text-gray-600">响应时间</span>
-                    <span class="text-gray-500">{{ problemTypes.responseTime }}%</span>
-                  </div>
-                  <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
-                    <div
-                      class="bg-blue-500 h-2 rounded-full transition-all duration-1500 ease-out"
-                      :style="{ width: problemTypes.responseTime + '%' }"
-                    ></div>
-                  </div>
-                </div>
-                <div>
-                  <div class="flex justify-between text-sm mb-1">
-                    <span class="text-gray-600">磁盘空间状态</span>
-                    <span class="text-gray-500">{{ problemTypes.diskSpace }}%</span>
-                  </div>
-                  <div class="w-full bg-gray-200 rounded-full h-2 overflow-hidden">
-                    <div
-                      class="bg-blue-500 h-2 rounded-full transition-all duration-1500 ease-out"
-                      :style="{ width: problemTypes.diskSpace + '%' }"
-                    ></div>
-                  </div>
-                </div>
-              </div>
+              <!-- 柱状图容器 -->
+              <div id="problemTypesChart" class="bar-chart-container"></div>
             </div>
           </div>
         </div>
@@ -388,16 +331,17 @@ const avgCompletionTime = ref('45分钟');
 
 // 问题类型数据
 const problemTypes = ref({
-  temperature: 85, // 温度异常率
-  memory: 62, // 内存使用率
-  cpu: 45, // CPU负载
-  responseTime: 30, // 响应时间
-  diskSpace: 15 // 磁盘空间状态
+  temperature: 0, // 温度异常数量
+  memory: 0, // 内存使用率问题数量
+  cpu: 0, // CPU负载问题数量
+  responseTime: 0, // 响应时间问题数量
+  diskSpace: 0 // 磁盘空间问题数量
 });
 
-// ECharts 饼图相关
+// ECharts 图表相关
 const pieChartRef = ref(null);
 let pieChart = null;
+let barChart = null;
 
 // 计算平均完成度
 const averageRate = computed(() => (completionRate.value + resolutionRate.value + timelinessRate.value) / 3);
@@ -426,7 +370,7 @@ const initPieChart = () => {
     },
     series: [
       {
-        name: '进度指标',
+        name: '指标对比',
         type: 'pie',
         radius: ['40%', '70%'],
         avoidLabelOverlap: false,
@@ -442,20 +386,15 @@ const initPieChart = () => {
           label: {
             show: true,
             fontSize: 40,
-            fontWeight: 'bold',
-            formatter: function (params) {
-              // 鼠标悬停时显示当前指标的百分比
-              return params.value + '%';
-            }
+            fontWeight: 'bold'
           }
         },
         labelLine: {
           show: false
         },
         data: [
-          { value: completionRate.value, name: '完成率', itemStyle: { color: '#5470c6' } },
-          { value: resolutionRate.value, name: '解决率', itemStyle: { color: '#f56c6c' } },
-          { value: timelinessRate.value, name: '及时率', itemStyle: { color: '#67c23a' } }
+          { value: completionRate.value, name: '巡检完成率', itemStyle: { color: '#409eff' } },
+          { value: timelinessRate.value, name: '解决效率', itemStyle: { color: '#67c23a' } }
         ]
       }
     ]
@@ -506,11 +445,7 @@ const fetchDashboardData = async () => {
     // 构建查询参数
     const queryParams = {
       projectId: 1,
-      type: type,
-      status: filterStatus.value !== 'all' ? filterStatus.value : undefined,
-      inspectionType: filterType.value !== 'all' ? filterType.value : undefined,
-      startTime: dateRange.value.length > 0 ? dateRange.value[0] : undefined,
-      endTime: dateRange.value.length > 0 ? dateRange.value[1] : undefined
+      type: type
     };
 
     // 调用接口获取数据
@@ -526,22 +461,26 @@ const fetchDashboardData = async () => {
       solvedProblems.value = data.solvedProblemCount || 0;
       avgCompletionTime.value = data.averageCompletionTime ? `${data.averageCompletionTime}分钟` : '0分钟';
 
-      // 计算完成率、解决率、及时率
-      completionRate.value = data.finishInspectionCount && data.finishInspectionCount > 0 ? Math.round(Math.random() * 30 + 60) : 0;
-      resolutionRate.value = data.solvedProblemCount && data.problemCount ? Math.round((data.solvedProblemCount / data.problemCount) * 100) : 0;
-      timelinessRate.value = data.finishInspectionCount && data.finishInspectionCount > 0 ? Math.round(Math.random() * 30 + 50) : 0;
+      // 使用接口返回的xjwcl(巡检完成率)和jjxl(解决效率)
+      completionRate.value = data.xjwcl ? parseFloat(data.xjwcl) : 0;
+      timelinessRate.value = data.jjxl ? parseFloat(data.jjxl) : 0;
 
-      // 更新问题类型数据
+      // 由于接口不再返回解决率，将其设置为0或保持原值
+      resolutionRate.value = 0;
+
+      // 更新问题类型数据 - 直接使用接口返回的数值，不再计算为百分比
       problemTypes.value = {
-        temperature: data.sbyxzt ? Math.min(100, Math.round(data.sbyxzt * 5)) : 0, // 设备运行状态映射为温度异常
-        memory: data.ncsyl ? Math.min(100, data.ncsyl * 10) : 0, // 内存使用率
-        cpu: Math.round(Math.random() * 50 + 20), // CPU负载（模拟数据）
-        responseTime: data.xysj ? Math.min(100, data.xysj * 5) : 0, // 响应时间
-        diskSpace: data.cpsyl ? Math.min(100, data.cpsyl * 8) : 0 // 磁盘使用率
+        temperature: data.sbyxzt || 0, // 设备运行状态类型问题数量
+        memory: data.ncsyl || 0, // 内存使用率类型问题数量
+        cpu: data.fwzt || 0, // 服务状态类型问题数量
+        responseTime: data.xysj || 0, // 响应时间类型问题数量
+        diskSpace: data.cpsyl || 0 // 磁盘使用率类型问题数量
       };
 
       // 更新饼图
       initPieChart();
+      // 更新柱状图
+      initBarChart();
     } else {
       ElMessage.error(response.msg || '获取数据失败');
     }
@@ -551,17 +490,115 @@ const fetchDashboardData = async () => {
   }
 };
 
-// 页面加载时获取数据
+// 页面加载时直接获取数据
 onMounted(() => {
   fetchDashboardData();
 });
 
+// 初始化柱状图
+const initBarChart = () => {
+  const chartDom = document.getElementById('problemTypesChart');
+  if (!chartDom) return;
+
+  // 销毁旧实例
+  if (barChart) {
+    barChart.dispose();
+  }
+
+  // 创建新实例
+  barChart = echarts.init(chartDom);
+
+  const option = {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + ': ' + params[0].value + '个';
+      }
+    },
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '10%',
+      top: '5%',
+      containLabel: true
+    },
+    xAxis: {
+      type: 'value',
+      name: '问题数量',
+      axisLabel: {
+        formatter: '{value}个'
+      },
+      splitLine: {
+        lineStyle: {
+          type: 'dashed'
+        }
+      }
+    },
+    yAxis: {
+      type: 'category',
+      data: ['温度异常', '内存使用率', 'CPU负载', '响应时间', '磁盘空间'],
+      axisLabel: {
+        interval: 0
+      }
+    },
+    series: [
+      {
+        name: '问题数量',
+        type: 'bar',
+        barWidth: '40%',
+        data: [
+          problemTypes.value.temperature,
+          problemTypes.value.memory,
+          problemTypes.value.cpu,
+          problemTypes.value.responseTime,
+          problemTypes.value.diskSpace
+        ],
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
+            { offset: 0, color: '#5470c6' },
+            { offset: 1, color: '#91cc75' }
+          ]),
+          borderRadius: [0, 4, 4, 0]
+        },
+        label: {
+          show: true,
+          position: 'right',
+          formatter: '{c}个'
+        }
+      }
+    ]
+  };
+
+  barChart.setOption(option);
+
+  // 响应式处理
+  const handleResize = () => {
+    if (barChart) {
+      barChart.resize();
+    }
+  };
+
+  window.addEventListener('resize', handleResize);
+
+  // 组件卸载时移除事件监听
+  onUnmounted(() => {
+    window.removeEventListener('resize', handleResize);
+  });
+};
+
 // 组件卸载时销毁图表实例
 onUnmounted(() => {
   if (pieChart) {
     pieChart.dispose();
     pieChart = null;
   }
+  if (barChart) {
+    barChart.dispose();
+    barChart = null;
+  }
 });
 
 // 导航方法
@@ -802,6 +839,17 @@ const handleInspectionManagement3 = () => {
   margin: 0 auto;
 }
 
+/* 柱状图容器 */
+.bar-chart-container {
+  width: 100%;
+  height: 350px;
+  margin: 0 auto;
+  background-color: #fafafa;
+  border-radius: 8px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
 /* 区域标题 */
 .section-title {
   font-size: 14px;
diff --git a/src/views/zhinengxunjian/xunjianrenwu.vue b/src/views/zhinengxunjian/xunjianrenwu.vue
index b982e51..5ee1185 100644
--- a/src/views/zhinengxunjian/xunjianrenwu.vue
+++ b/src/views/zhinengxunjian/xunjianrenwu.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="inspection-tasks">
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab active" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -9,7 +9,7 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
+      </div> -->
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -42,8 +42,8 @@
             <el-input v-model="executor" placeholder="执行人"></el-input>
           </div>
           <div class="filter-actions">
-            <el-button type="primary" class="search-btn" @click="handleSearch">搜索</el-button>
-            <el-button type="primary" icon="el-icon-plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
       </div>
@@ -133,7 +133,7 @@
       </div>
 
       <!-- 添加新任务弹窗 -->
-      <el-dialog v-model="createTaskDialogVisible" title="添加新任务" width="500px" :before-close="handleCancelCreateTask">
+      <el-dialog v-model="createTaskDialogVisible" title="添加新任务" width="750px" :before-close="handleCancelCreateTask">
         <el-form ref="createTaskFormRef" :model="createTaskForm" :rules="createTaskRules" label-width="80px">
           <el-form-item label="任务名称" prop="taskName">
             <el-input v-model="createTaskForm.taskName" placeholder="输入任务名称" />
@@ -202,7 +202,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="问题类型" prop="problemType">
+          <!-- <el-form-item label="问题类型" prop="problemType">
             <el-select v-model="createTaskForm.problemType" placeholder="选择问题类型">
               <el-option label="磁盘使用率" value="1" />
               <el-option label="内存使用率" value="2" />
@@ -210,6 +210,27 @@
               <el-option label="响应时间" value="4" />
               <el-option label="设备运行状态" value="5" />
             </el-select>
+          </el-form-item> -->
+
+          <!-- 步骤条 -->
+          <el-form-item label="执行步骤" class="form-item" style="width: 100%">
+            <div class="steps-container">
+              <div class="step-item" v-for="(step, index) in createTaskForm.steps" :key="index">
+                <div class="step-number">{{ index + 1 }}</div>
+                <el-input v-model="step.name" placeholder="输入步骤名称" style="flex: 1; margin-right: 10px" />
+                <el-input v-model="step.intendedPurpose" placeholder="输入预期目的" style="flex: 1; margin-right: 10px" />
+                <el-date-picker
+                  v-model="step.intendedTime"
+                  type="datetime"
+                  placeholder="选择计划时间"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                  style="width: 180px; margin-right: 10px"
+                />
+                <el-button v-if="createTaskForm.steps.length > 1" type="text" @click="removeStep(index)" style="color: #f56c6c"> 删除 </el-button>
+              </div>
+              <el-button type="text" class="add-step-btn" @click="addStep">添加步骤</el-button>
+            </div>
           </el-form-item>
         </el-form>
 
@@ -304,7 +325,7 @@
                 </div>
                 <div class="info-item">
                   <span class="info-label">联系电话：</span>
-                  <span class="info-value">{{ detailData.person?.phone || '-' }}</span>
+                  <span class="info-value">{{ detailData.person?.phonenumber || '-' }}</span>
                 </div>
               </div>
               <div class="info-row">
@@ -312,10 +333,6 @@
                   <span class="info-label">性别：</span>
                   <span class="info-value">{{ detailData.person?.sex === '1' ? '男' : detailData.person?.sex === '2' ? '女' : '-' }}</span>
                 </div>
-                <div class="info-item">
-                  <span class="info-label">民族：</span>
-                  <span class="info-value">{{ detailData.person?.nation || '-' }}</span>
-                </div>
               </div>
             </div>
           </div>
@@ -356,6 +373,26 @@
             </div>
           </div>
 
+          <!-- 执行步骤信息卡片 -->
+          <div v-if="detailData.nodes && detailData.nodes.length > 0" class="detail-card">
+            <h3 class="card-title">执行步骤</h3>
+            <div class="steps-container">
+              <div v-for="(node, index) in detailData.nodes" :key="node.id || index" class="step-item">
+                <div class="step-number">{{ node.code || index + 1 }}</div>
+                <div class="step-info">
+                  <div class="step-name">{{ node.name || '未命名步骤' }}</div>
+                  <div class="step-purpose">{{ node.intendedPurpose || '无说明' }}</div>
+                  <div class="step-time">计划时间：{{ formatDateTime(node.intendedTime) }}</div>
+                  <div v-if="node.finishTime" class="step-finish-time">完成时间：{{ formatDateTime(node.finishTime) }}</div>
+                  <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
+                </div>
+                <div class="step-status" :class="getStatusClass(node.status)">
+                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                </div>
+              </div>
+            </div>
+          </div>
+
           <!-- 执行结果信息卡片 -->
           <div v-if="detailData.taskType === '2' || detailData.taskType === 2" class="detail-card">
             <h3 class="card-title">延期信息</h3>
@@ -388,37 +425,10 @@
 import { ref, computed, onMounted } from 'vue';
 import router from '@/router';
 
-import { xjrenwuDetail, xjrenwuExport, xjrenwulist, addxjrenwu, updatexjrenwu, delxjrenwu } from '@/api/zhinengxunjian/xunjian/renwu';
+import { xjrenwuDetail, xjrenwulist, addxjrenwu, updatexjrenwu } from '@/api/zhinengxunjian/xunjian/renwu';
 import { xunjianUserlist, xunjianlist } from '@/api/zhinengxunjian/xunjian/index';
-import { ElMessage, ElLoading } from 'element-plus';
-
-// 根据任务类型获取对应的文本（1待执行2已延期3执行中4已完成）
-const getTaskTypeText = (type) => {
-  const typeMap = {
-    '1': '待执行',
-    '2': '已延期',
-    '3': '执行中',
-    '4': '已完成'
-  };
-  // 处理可能的数字输入
-  return typeMap[type.toString()] || '未知类型';
-};
-
-// 根据问题类型获取对应的文本（1磁盘使用率2内存使用率3服务状态4响应时间5设备运行状态）
-const getProblemTypeText = (type) => {
-  const problemTypeMap = {
-    '1': '磁盘使用率',
-    '2': '内存使用率',
-    '3': '服务状态',
-    '4': '响应时间',
-    '5': '设备运行状态'
-  };
-  // 处理可能的数字输入
-  return problemTypeMap[type.toString()] || '未知问题';
-};
-
-// 激活的选项卡
-const activeTab = ref('task');
+import { addjiedian } from '@/api/zhinengxunjian/jiedian/index';
+import { ElMessage, ElLoading, ElForm } from 'element-plus';
 
 // 筛选条件
 const taskStatus = ref('');
@@ -428,7 +438,7 @@ const executor = ref('');
 // 任务数据 - 初始为空数组，通过API获取
 const tasks = ref([]);
 
-// 详情弹窗相关变量
+// 任务详情弹窗相关变量
 const detailDialogVisible = ref(false);
 const detailData = ref(null);
 const isDetailLoading = ref(false);
@@ -459,6 +469,34 @@ const getStatusClass = (status) => {
   return statusClassMap[statusStr] || 'status-unknown';
 };
 
+// 格式化日期时间
+const formatDateTime = (dateTime) => {
+  if (!dateTime) return '-';
+  try {
+    const date = new Date(dateTime);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } catch (error) {
+    return dateTime;
+  }
+};
+
+// 获取步骤状态文本
+const getStepStatusText = (status) => {
+  const statusStr = status?.toString() || '';
+  const statusMap = {
+    '1': '待执行',
+    '2': '执行中',
+    '3': '已完成',
+    '4': '已延期'
+  };
+  return statusMap[statusStr] || '未知状态';
+};
+
 // 状态映射配置
 const statusConfig = {
   pending: {
@@ -505,11 +543,10 @@ const getTaskList = async () => {
     const params = {
       pageSize: pageSize.value,
       pageNum: currentPage.value,
-      personId: executor.value !== '' ? executor.value : undefined,
-      // 根据任务状态映射到后端需要的taskType
-      taskType: taskStatus.value ? mapTaskStatusToType(taskStatus.value) : undefined,
-      // 添加计划类型筛选
-      planType: planType.value || undefined
+      personId: 1,
+      taskType: taskStatus.value || undefined, // 任务状态
+      planType: planType.value || undefined, // 计划类型
+      personName: executor.value || undefined // 执行人
     };
 
     const response = await xjrenwulist(params);
@@ -583,44 +620,6 @@ const getTaskList = async () => {
   }
 };
 
-// 辅助函数：将前端状态映射为后端需要的taskType
-const mapTaskStatusToType = (status) => {
-  const statusMap = {
-    'pending': '1',
-    'delayed': '2',
-    'executing': '3',
-    'completed': '4'
-  };
-  return statusMap[status] || '';
-};
-
-// 根据person对象获取执行人姓名
-const getExecutorName = (person) => {
-  if (person && typeof person === 'object' && person.userName) {
-    return person.userName;
-  }
-  const executorMap = {
-    'zhangming': '张明',
-    'lihua': '李华',
-    'wangqiang': '王强',
-    'zhaowei': '赵伟'
-  };
-  return executorMap[person] || '未知用户';
-};
-
-// 根据plan对象获取计划名称
-const getPlanName = (plan) => {
-  if (plan && typeof plan === 'object' && plan.planName) {
-    return plan.planName;
-  }
-  const planMap = {
-    'daily': '每日巡检计划',
-    'weekly': '每周巡检计划',
-    'monthly': '每月巡检计划'
-  };
-  return planMap[plan] || '未知计划';
-};
-
 // 页面加载时获取数据
 onMounted(() => {
   getTaskList();
@@ -675,10 +674,11 @@ const createTaskForm = ref({
   timeRange: [],
   workTimeRange1: null,
   workTimeRange2: null,
-  relatedPlan: 'all',
+  relatedPlan: '',
   executor: '',
   taskType: '1', // 默认待执行
-  problemType: ''
+  // problemType: '',
+  steps: [{ name: '', intendedPurpose: '', intendedTime: '' }] // 任务步骤数组
 });
 
 const createTaskRules = {
@@ -694,6 +694,17 @@ const handleCreateTask = () => {
   openCreateTaskDialog();
 };
 
+// 重置步骤表单
+const resetStepForm = () => {
+  Object.keys(stepForm).forEach((key) => {
+    stepForm[key] = '';
+  });
+  currentStep.value = 0;
+  if (stepFormRef.value) stepFormRef.value.resetFields();
+  if (deviceFormRef.value) deviceFormRef.value.resetFields();
+  if (faultFormRef.value) faultFormRef.value.resetFields();
+};
+
 // 构建timeInfo字符串
 const getTaskTimeInfoString = () => {
   const timeInfoArray = [];
@@ -719,6 +730,21 @@ const getTaskTimeInfoString = () => {
   return timeInfoArray.join(',');
 };
 
+// 添加步骤
+const addStep = () => {
+  createTaskForm.value.steps.push({ name: '', intendedPurpose: '', intendedTime: '' });
+};
+
+// 删除步骤
+const removeStep = (index) => {
+  // 确保至少保留一个步骤
+  if (createTaskForm.value.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  createTaskForm.value.steps.splice(index, 1);
+};
+
 // 保存任务
 const handleSaveTask = async () => {
   // 表单验证
@@ -727,6 +753,13 @@ const handleSaveTask = async () => {
     return;
   }
 
+  // 验证所有步骤
+  const hasEmptyStep = createTaskForm.value.steps.some((step) => !step.name.trim() || !step.intendedPurpose.trim());
+  if (hasEmptyStep) {
+    ElMessage.warning('请填写完整所有步骤信息');
+    return;
+  }
+
   try {
     // 获取timeInfo字符串
     const taskTimeInfo = getTaskTimeInfoString();
@@ -736,13 +769,47 @@ const handleSaveTask = async () => {
       return;
     }
 
+    // 准备步骤数据，与工单列表页面保持一致的格式
+    const stepsData = createTaskForm.value.steps
+      .filter((step) => step.name.trim() && step.intendedPurpose.trim())
+      .map((step, index) => ({
+        createTime: new Date().toISOString(),
+        updateTime: new Date().toISOString(),
+        params: {},
+        module: 2,
+        code: index + 1,
+        name: step.name,
+        intendedPurpose: step.intendedPurpose,
+        intendedTime: step.intendedTime ? new Date(step.intendedTime).toISOString() : new Date().toISOString(),
+        finishTime: '',
+        remark: '',
+        status: 2
+      }));
+
+    // 调用添加节点接口，直接传递步骤数组
+    const jiedianResponse = await addjiedian(stepsData);
+
+    if (jiedianResponse.code !== 200) {
+      ElMessage.error('创建步骤失败');
+      return;
+    }
+
+    // 获取返回的ids，实际返回格式中msg字段包含ids字符串，data为null
+    let nodeIds = '';
+    if (jiedianResponse.code === 200 && jiedianResponse.msg) {
+      nodeIds = jiedianResponse.msg;
+    } else {
+      ElMessage.warning('未获取到有效的步骤ID');
+      return;
+    }
+
     // 构建接口所需的数据结构
     const apiData = {
-      createDept: 0,
-      createBy: 0,
+      projectId: 1,
+
       createTime: new Date().toISOString(),
-      updateBy: 0,
       updateTime: new Date().toISOString(),
+      startTime: new Date().toISOString().slice(0, 19).replace('T', ' '),
       params: {
         property1: 'string',
         property2: 'string'
@@ -757,7 +824,8 @@ const handleSaveTask = async () => {
       personId: createTaskForm.value.executor !== 'all' ? createTaskForm.value.executor : 0,
       taskProgress: 0,
       taskType: createTaskForm.value.taskType,
-      problemType: createTaskForm.value.problemType
+      // problemType: createTaskForm.value.problemType,
+      nodeIds: nodeIds // 添加步骤ID字符串，与工单列表页面保持一致
     };
 
     // 调用新增任务接口
@@ -774,10 +842,11 @@ const handleSaveTask = async () => {
         timeRange: [],
         workTimeRange1: null,
         workTimeRange2: null,
-        relatedPlan: 'all',
+        relatedPlan: '',
         executor: '',
         taskType: '1',
-        problemType: ''
+        // problemType: '',
+        steps: [{ name: '', intendedPurpose: '', intendedTime: '' }]
       };
       // 重新获取任务列表
       getTaskList();
@@ -807,21 +876,14 @@ const planList = ref([]);
 const getUsersList = async () => {
   try {
     const response = await xunjianUserlist();
-
-    const userRows =
-      response?.data?.rows && Array.isArray(response.data.rows)
-        ? response.data.rows
-        : response?.rows && Array.isArray(response.rows)
-        ? response.rows
-        : Array.isArray(response)
-        ? response
-        : [];
+    // 适配新接口格式：检查code为200且rows为数组
+    const userRows = response.code === 200 && response.rows && Array.isArray(response.rows) ? response.rows : [];
 
     userList.value = userRows
       .filter((item) => item && typeof item === 'object')
-      .map((item, index) => ({
-        label: item.userName || `用户${index + 1}`,
-        value: item.id || `id_${index}`
+      .map((item) => ({
+        label: item.userName || '未知用户',
+        value: String(item.userId || '') // 使用userId作为唯一标识
       }));
 
     if (userList.value.length === 0) {
@@ -853,11 +915,8 @@ const getPlansList = async () => {
         label: item.planName || `计划${item.id}`,
         value: item.id.toString()
       }));
-
-    planList.value.unshift({ label: '全部计划', value: 'all' });
   } catch (error) {
     console.error('获取计划列表失败:', error);
-    planList.value = [{ label: '全部计划', value: 'all' }];
   }
 };
 
@@ -875,8 +934,13 @@ const handleCancelCreateTask = () => {
     taskName: '',
     inspectionTarget: '',
     timeRange: [],
-    relatedPlan: 'all',
-    executor: 'all'
+    workTimeRange1: null,
+    workTimeRange2: null,
+    relatedPlan: '',
+    executor: '',
+    taskType: '1',
+    // problemType: '',
+    steps: [{ name: '', intendedPurpose: '', intendedTime: '' }]
   };
 };
 
@@ -981,6 +1045,7 @@ const handleAction = async (task) => {
       const updateData = {
         ...originalTask.rawData,
         id: task.id,
+        startTime: new Date().toISOString().slice(0, 19).replace('T', ' '),
         taskType: '3', // 3表示执行中
         status: 'executing',
         taskProgress: 0
@@ -1046,6 +1111,9 @@ const handleAction = async (task) => {
 </script>
 
 <style scoped>
+@import url('./css/step-bars.css');
+@import url('./css/detail-dialog.css');
+
 .inspection-tasks {
   padding: 20px;
   background-color: #f5f7fa;
@@ -1401,6 +1469,96 @@ const handleAction = async (task) => {
   overflow-y: auto;
 }
 
+/* 步骤条展示样式 */
+.step-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 12px;
+  padding: 12px;
+  background-color: #fafafa;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+}
+
+.step-item:hover {
+  background-color: #f5f7fa;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.step-number {
+  width: 28px;
+  height: 28px;
+  background-color: #409eff;
+  color: white;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 12px;
+  font-size: 14px;
+  font-weight: bold;
+  flex-shrink: 0;
+}
+
+.step-info {
+  flex: 1;
+}
+
+.step-name {
+  font-weight: 500;
+  color: #1d2129;
+  margin-bottom: 4px;
+  font-size: 14px;
+}
+
+.step-purpose {
+  color: #606266;
+  margin-bottom: 4px;
+  font-size: 13px;
+}
+
+.step-time,
+.step-finish-time,
+.step-remark {
+  color: #909399;
+  font-size: 12px;
+  margin-bottom: 2px;
+}
+
+.step-status {
+  padding: 4px 12px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-top: 4px;
+}
+
+/* 步骤状态样式 */
+.step-status.status-pending {
+  background-color: #e6f7ff;
+  color: #1677ff;
+  border: 1px solid #91d5ff;
+}
+
+.step-status.status-executing {
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border: 1px solid #ffe58f;
+}
+
+.step-status.status-completed {
+  background-color: #f6ffed;
+  color: #52c41a;
+  border: 1px solid #b7eb8f;
+}
+
+.step-status.status-delayed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border: 1px solid #ffccc7;
+}
+
 .detail-card {
   margin-bottom: 20px;
   padding: 20px;
@@ -1580,4 +1738,11 @@ const handleAction = async (task) => {
   transform: translateY(-1px);
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
 }
+
+.step-content {
+  padding: 30px 20px;
+  background-color: #fafafa;
+  border-radius: 8px;
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/zhinengxunjian/zhixingjilu.vue b/src/views/zhinengxunjian/zhixingjilu.vue
index 9b1cb3c..76b9ee6 100644
--- a/src/views/zhinengxunjian/zhixingjilu.vue
+++ b/src/views/zhinengxunjian/zhixingjilu.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <div class="execution-records">
+    <div class="dispatch-records">
       <!-- 顶部导航栏 -->
-      <div class="navigation-tabs">
+      <!-- <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
         <div class="nav-tab" @click="handleInspection2">巡检管理</div>
         <div class="nav-tab" @click="handleInspection3">试验管理</div>
@@ -10,76 +10,51 @@
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab active" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
-      </div>
+      </div> -->
 
-      <!-- 页面标题 -->
-      <TitleComponent title="工单管理模块" subtitle="发起工单任务，跟踪流程记录和执行情况"></TitleComponent>
-
-      <!-- 子选项卡 -->
+      <!-- 选项卡 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
           <el-button type="primary" @click="handleInspectionManagement1">工单列表</el-button>
           <el-button type="primary" @click="handleInspectionManagement2">派单计划</el-button>
-          <el-button type="primary" @click="handleInspectionManagement3">执行记录</el-button>
+          <el-button type="primary" @click="handleInspectionManagement3">执行计划</el-button>
         </div>
       </div>
 
-      <!-- 搜索和筛选区 -->
-      <div class="search-filter">
-        <div class="search-container">
-          <el-input
-            v-model="searchKeyword"
-            placeholder="搜索工单记录"
-            class="search-input"
-            suffix-icon="el-icon-search"
-            @keyup.enter="handleSearch"
-          ></el-input>
-          <el-button type="primary" class="filter-btn" @click="showFilter = !showFilter">
-            筛选 <i class="el-icon-arrow-down" :class="{ 'rotate-180': showFilter }"></i>
-          </el-button>
-        </div>
-
-        <!-- 筛选条件区域 -->
-        <div class="filter-options" v-if="showFilter">
-          <div class="filter-row">
-            <div class="filter-item">
-              <el-select v-model="filterStatus" placeholder="执行状态" clearable>
-                <el-option label="全部状态" value="all"></el-option>
-                <el-option label="已完成" value="completed"></el-option>
-                <el-option label="执行中" value="executing"></el-option>
-              </el-select>
-            </div>
-            <div class="filter-item">
-              <el-select v-model="filterType" placeholder="工单类型" clearable>
-                <el-option label="全部类型" value="all"></el-option>
-                <el-option label="新设备安装调试" value="installation"></el-option>
-                <el-option label="系统升级改造" value="upgrade"></el-option>
-                <el-option label="月度设备检查" value="monthlyCheck"></el-option>
-              </el-select>
-            </div>
-            <div class="filter-item">
-              <el-select v-model="filterExecutor" placeholder="执行人" clearable>
-                <el-option label="全部人员" value="all"></el-option>
-                <el-option label="赵工" value="zhao"></el-option>
-                <el-option label="李工" value="li"></el-option>
-                <el-option label="王工" value="wang"></el-option>
-              </el-select>
-            </div>
-            <div class="filter-item">
-              <el-date-picker
-                v-model="filterDateRange"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                format="yyyy/MM/dd"
-                value-format="yyyy/MM/dd"
-              ></el-date-picker>
-            </div>
-            <div class="filter-actions">
-              <el-button type="text" @click="resetFilter">重置</el-button>
-              <el-button type="primary" @click="handleSearch">确定</el-button>
-            </div>
+      <!-- 筛选栏 -->
+      <div class="filter-bar">
+        <div class="filter-container">
+          <div class="filter-item">
+            <el-select v-model="workOrderType" placeholder="工单类型" clearable>
+              <el-option label="全部类型" value="all"></el-option>
+              <el-option label="维护保养" value="maintenance"></el-option>
+              <el-option label="检查检测" value="inspection"></el-option>
+              <el-option label="安装调试" value="installation"></el-option>
+              <el-option label="升级改造" value="upgrade"></el-option>
+            </el-select>
+          </div>
+          <div class="filter-item">
+            <el-select v-model="workOrderStatus" placeholder="全部状态" clearable>
+              <el-option label="全部状态" value="all"></el-option>
+              <el-option label="待派单" value="accepted"></el-option>
+              <el-option label="待处理" value="pending"></el-option>
+              <el-option label="执行中" value="executing"></el-option>
+              <el-option label="已完成" value="completed"></el-option>
+            </el-select>
+          </div>
+          <div class="filter-item">
+            <el-select v-model="priority" placeholder="全部优先级" clearable>
+              <el-option label="全部优先级" value="all"></el-option>
+              <el-option label="高" value="high"></el-option>
+              <el-option label="中" value="medium"></el-option>
+              <el-option label="低" value="low"></el-option>
+            </el-select>
+          </div>
+          <div class="filter-item">
+            <el-date-picker v-model="createDate" type="date" placeholder="创建日期" value-format="yyyy/MM/dd"></el-date-picker>
+          </div>
+          <div class="filter-actions">
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch">搜索</el-button>
           </div>
         </div>
       </div>
@@ -88,107 +63,133 @@
       <div class="tracking-section">
         <div class="tracking-header">
           <h3>重点跟踪</h3>
-          <div class="tracking-tag executing"><i class="el-icon-loading"></i> 执行中</div>
+          <div class="tracking-tag executing" v-if="currentTrackedWorkOrder">
+            {{ getStatusText(currentTrackedWorkOrder.status) }}
+          </div>
+          <div class="tracking-tag" v-else>暂无工单</div>
         </div>
 
         <div class="tracking-card">
           <div class="tracking-title">
-            <div class="tracking-main-info">
+            <div class="tracking-main-info" v-if="currentTrackedWorkOrder">
               <div class="task-info">
-                <span class="task-type"> <i class="el-icon-machine"></i> 新设备安装调试 </span>
-                <span class="work-order-no"> <i class="el-icon-ticket"></i> WO-2023-0618-054 </span>
+                <span class="task-type">工单名： {{ currentTrackedWorkOrder.title || '未命名工单' }} </span>
+                <span class="work-order-no"> 工单编号： {{ currentTrackedWorkOrder.id || '-' }} </span>
               </div>
               <div class="time-range">
-                <i class="el-icon-time"></i>
-                <span>执行时间：2025-06-18 08:00 至 2025-06-20 18:00</span>
+                <span>创建时间：{{ formatDateTime(currentTrackedWorkOrder.createTime) }}</span>
+                <span v-if="currentTrackedWorkOrder.endTime">至 {{ formatDateTime(currentTrackedWorkOrder.endTime) }}</span>
               </div>
             </div>
           </div>
 
           <!-- 横向进度时间线 - 使用Element Plus的Steps组件 -->
-          <div style="margin: 30px 0">
-            <el-steps direction="horizontal" :active="2" align-center class="custom-steps" :progress-dot="false">
-              <el-step title="设备开始检查开箱" status="finish">
-                <template #description>
-                  <div style="text-align: center">
-                    <div style="color: #165dff; margin-bottom: 4px">赵工 • 2025-06-18 15:30</div>
-                    <div>设备包装完好，配件齐全，无损坏，准备进行安装</div>
-                  </div>
+          <div class="progress-timeline-container">
+            <div class="progress-timeline">
+              <el-steps direction="horizontal" :active="activeStepIndex" align-center class="custom-steps" :progress-dot="false">
+                <template v-if="trackingSteps.length > 0">
+                  <el-step v-for="(step, index) in trackingSteps" :key="step.id" :title="step.name" :status="getStatusByIndex(index)">
+                    <template #description>
+                      <div class="step-description">
+                        <div class="step-person-time">
+                          {{ step.executor || (step.getOrderPersonVo && step.getOrderPersonVo.userName) || '待分配' }}
+                        </div>
+                        <template v-if="step.intendedTime">
+                          <div class="step-person-time">预期时间：{{ formatDateTime(step.intendedTime) }}</div>
+                        </template>
+                        <div class="step-content">预期目的：{{ step.intendedPurpose || '-' }}</div>
+                      </div>
+                    </template>
+                  </el-step>
                 </template>
-              </el-step>
-              <el-step title="基础安装完成" status="finish">
-                <template #description>
-                  <div style="text-align: center">
-                    <div style="color: #165dff; margin-bottom: 4px">赵工 • 2025-06-19 10:15</div>
-                    <div>设备固定安装完成，电源线连接规范，线路布局合理</div>
-                  </div>
-                </template>
-              </el-step>
-              <el-step title="初步调试完成" status="process">
-                <template #description>
-                  <div style="text-align: center">
-                    <div style="color: #165dff; margin-bottom: 4px">李工 • 2025-06-18 16:45</div>
-                    <div>设备通电正常，基本功能运行良好，正在进行调试</div>
-                  </div>
-                </template>
-              </el-step>
-              <el-step title="完成测试" status="wait">
-                <template #description>
-                  <div style="text-align: center">
-                    <div style="color: #165dff; margin-bottom: 4px">王工 • 2025-06-20 18:00</div>
-                    <div>检测设备性能，验证稳定性，准备投入实际生产场景</div>
-                  </div>
-                </template>
-              </el-step>
-            </el-steps>
+              </el-steps>
+            </div>
+          </div>
+
+          <!-- 步骤条分页控件 -->
+          <div class="steps-pagination" v-if="trackedWorkOrders.length > 1">
+            <el-pagination
+              background
+              :current-page="currentTrackPage"
+              :page-size="trackPageSize"
+              layout="prev, pager, next"
+              :total="trackedWorkOrders.length"
+              @current-change="handleTrackPageChange"
+            />
           </div>
         </div>
       </div>
 
-      <!-- 执行记录表格 -->
+      <!-- 工单表格 -->
       <div class="table-wrapper">
         <el-table :data="pagedTableData" stripe style="width: 100%" highlight-current-row class="custom-table">
           <el-table-column align="center" prop="orderNo" label="工单编号" min-width="120"></el-table-column>
           <el-table-column align="center" prop="description" label="工单描述" min-width="150"></el-table-column>
-          <el-table-column align="center" prop="executor" label="执行人" min-width="100"></el-table-column>
-          <el-table-column align="center" prop="startTime" label="开始时间" min-width="140"></el-table-column>
-          <el-table-column align="center" prop="endTime" label="完成时间" min-width="140"></el-table-column>
-          <el-table-column align="center" prop="status" label="执行状态" min-width="100">
+          <el-table-column align="center" prop="type" label="类型" min-width="100">
+            <template #default="scope">
+              <el-tag :type="getTypeTagType(scope.row.type)" class="type-tag">
+                {{ scope.row.type }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="priority" label="优先级" min-width="100">
+            <template #default="scope">
+              <el-tag :type="getPriorityTagType(scope.row.priority)" class="priority-tag">
+                {{ scope.row.priority }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="creator" label="创建人" min-width="100"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="创建时间" min-width="140"></el-table-column>
+          <el-table-column align="center" prop="deadline" label="截止时间" min-width="140"></el-table-column>
+          <el-table-column align="center" prop="status" label="状态" min-width="100">
             <template #default="scope">
               <el-tag :type="getStatusTagType(scope.row.status)" class="status-tag">
                 {{ scope.row.status }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="completion" label="完成度" min-width="120">
-            <template #default="scope">
-              <div class="completion-bar">
-                <div class="completion-progress" :style="{ width: scope.row.completion }" :class="getCompletionClass(scope.row.completion)"></div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="inspectionResult" label="验收结果" min-width="100">
-            <template #default="scope">
-              <el-tag :type="getResultTagType(scope.row.inspectionResult)" class="result-tag">
-                {{ scope.row.inspectionResult || '-' }}
-              </el-tag>
-            </template>
-          </el-table-column>
           <el-table-column align="center" label="操作" min-width="180" fixed="right">
             <template #default="scope">
-              <el-button type="text" @click="handleViewDetails(scope.row)" size="small" class="action-btn detail-btn">详情</el-button>
-              <el-button
-                type="text"
-                @click="handleViewReport(scope.row)"
-                class="action-btn"
-                :class="{
-                  'report-btn': scope.row.inspectionResult !== '需整改',
-                  'rectify-btn': scope.row.inspectionResult === '需整改'
-                }"
-                v-if="scope.row.status === '已完成'"
-              >
-                {{ scope.row.inspectionResult === '需整改' ? '查看整改项' : scope.row.inspectionResult === '' ? '沟通' : '查看报告' }}
-              </el-button>
+              <!-- 已接单状态 -->
+              <template v-if="scope.row.status === '已接单'">
+                <el-button type="text" @click="handleFollow(scope.row)" class="action-btn">跟踪</el-button>
+                <el-button type="text" @click="handleCancel(scope.row)" class="action-btn cancel-btn">删除</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 已派单状态 -->
+              <template v-else-if="scope.row.status === '已派单'">
+                <el-button type="text" @click="handleSetTrack(scope.row)" class="action-btn">
+                  {{ scope.row.point === '1' ? '取消跟踪' : '跟踪' }}
+                </el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 待派单状态 -->
+              <template v-else-if="scope.row.status === '待派单'">
+                <el-button type="text" @click="handleAssign(scope.row)" class="action-btn">派单</el-button>
+                <el-button type="text" @click="handleEdit(scope.row)" class="action-btn">编辑</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 执行中状态 -->
+              <template v-else-if="scope.row.status === '执行中'">
+                <el-button type="text" @click="handleCommunicate(scope.row)" class="action-btn">沟通</el-button>
+                <el-button type="text" @click="handleViewProgress(scope.row)" class="action-btn">查看进度</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 已完成状态 -->
+              <template v-else-if="scope.row.status === '已完成'">
+                <el-button type="text" @click="handleArchive(scope.row)" class="action-btn">归档</el-button>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
+              </template>
+
+              <!-- 默认显示 -->
+              <template v-else>
+                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">查看详情</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -213,163 +214,688 @@
           </el-pagination>
         </div>
       </div>
+
+      <!-- 编辑工单弹窗 -->
+      <el-dialog v-model="createDialogVisible" title="编辑工单" width="900px" class="create-dialog" center>
+        <el-form :model="createForm" :rules="createFormRules" ref="createFormRef" label-width="120px" class="custom-form">
+          <el-form-item label="工单标题*" prop="title">
+            <el-input v-model="createForm.title" placeholder="请输入工单标题" />
+          </el-form-item>
+
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="工单类型*" prop="type">
+                <el-select v-model="createForm.type" placeholder="请选择类型">
+                  <el-option label="维护保养" value="维护保养" />
+                  <el-option label="检查检测" value="检查检测" />
+                  <el-option label="安装调试" value="安装调试" />
+                  <el-option label="升级改造" value="升级改造" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="优先级*" prop="priority">
+                <el-select v-model="createForm.priority" placeholder="请选择优先级">
+                  <el-option label="高" value="高" />
+                  <el-option label="中" value="中" />
+                  <el-option label="低" value="低" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="截止时间*" prop="deadline">
+                <el-date-picker v-model="createForm.deadline" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-form-item label="工单描述*" prop="description">
+            <el-input v-model="createForm.description" type="textarea" :rows="3" placeholder="请详细描述工单内容、要求和注意事项等信息" />
+          </el-form-item>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="执行地点*" prop="location">
+                <el-input v-model="createForm.location" placeholder="请填写执行地点" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="相关设备/系统">
+                <el-input v-model="createForm.relatedEquipment" placeholder="请输入相关设备或系统名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="工单步骤" class="form-item" style="width: 100%">
+            <div class="steps-container">
+              <div class="step-item" v-for="(step, index) in createForm.steps" :key="index">
+                <div class="step-number">{{ index + 1 }}</div>
+                <el-input v-model="step.name" placeholder="输入步骤名称" style="flex: 1; margin-right: 10px" />
+                <el-input v-model="step.intendedPurpose" placeholder="输入预期目的" style="flex: 1; margin-right: 10px" />
+                <el-date-picker
+                  v-model="step.intendedTime"
+                  type="datetime"
+                  placeholder="选择计划时间"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                  style="width: 180px; margin-right: 10px"
+                />
+                <el-button v-if="createForm.steps.length > 1" type="text" class="delete-step-btn" @click="deleteStep(index)" style="color: #f56c6c">
+                  删除
+                </el-button>
+              </div>
+              <el-button type="text" class="add-step-btn" @click="addStep">添加步骤</el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="上传图片(可选)" width="100%" prop="file">
+            <image-upload v-model="createForm.file" />
+
+            <div v-if="createForm.fileList && createForm.fileList.length > 0" class="upload-tip">
+              <span style="color: #1989fa">已选择{{ createForm.fileList.length }}张图片，将在提交时上传</span>
+            </div>
+          </el-form-item>
+          <el-form-item label="工单描述">
+            <el-input v-model="createForm.resultDescription" type="textarea" :rows="3" placeholder="请描述该工单完成后预期达成的成果" />
+          </el-form-item>
+
+          <el-form-item label="是否需要执行人" prop="needAssignee">
+            <el-radio-group v-model="createForm.needAssignee">
+              <el-radio label="true">是，指定执行人</el-radio>
+              <el-radio label="false">否，由系统分配</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="cancelCreate">取消</el-button>
+            <el-button type="primary" @click="submitCreate">提交修改</el-button>
+          </span>
+        </template>
+      </el-dialog>
+
+      <!-- 工单详情弹窗 -->
+      <el-dialog
+        v-model="detailDialogVisible"
+        title="工单详情"
+        width="800px"
+        :before-close="handleCloseDetailDialog"
+        class="custom-experiment-dialog"
+      >
+        <div v-if="isDetailLoading" class="skeleton-loading">
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+          <div class="skeleton-card">
+            <div class="skeleton-header"></div>
+            <div class="skeleton-content">
+              <div class="skeleton-row"></div>
+              <div class="skeleton-row"></div>
+            </div>
+          </div>
+        </div>
+
+        <div v-else-if="detailData" class="task-detail-container">
+          <!-- 基础信息区 -->
+          <div class="detail-card">
+            <h3 class="card-title">基础信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">工单编号：</span>
+                  <span class="info-value">WO-{{ detailData.id }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">工单标题：</span>
+                  <span class="info-value">{{ detailData.title }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">工单类型：</span>
+                  <span class="info-value">{{ mapCodeToType(detailData.type) }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">优先级：</span>
+                  <span class="info-value task-status priority-{{ mapPriorityToClass(detailData.level) }}">{{
+                    mapCodeToPriority(detailData.level)
+                  }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">创建人：</span>
+                  <span class="info-value">{{ detailData.sendOrderPersonVo?.userName || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">创建时间：</span>
+                  <span class="info-value">{{ detailData.createTime ? formatDate(detailData.createTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">执行人：</span>
+                  <span class="info-value">{{ detailData.getOrderPersonVo?.userName || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">接单时间：</span>
+                  <span class="info-value">{{ detailData.getOrderTime ? formatDate(detailData.getOrderTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">截止时间：</span>
+                  <span class="info-value">{{ detailData.endTime ? formatDate(detailData.endTime) : '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">完成时间：</span>
+                  <span class="info-value">{{ detailData.finishiOrderTime ? formatDate(detailData.finishiOrderTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="info-item">
+                  <span class="info-label">执行地点：</span>
+                  <span class="info-value">{{ detailData.position || '-' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">相关设备：</span>
+                  <span class="info-value">{{ detailData.device || '-' }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 工单描述 -->
+          <div class="detail-card">
+            <h3 class="card-title">工单描述</h3>
+            <div class="card-content">
+              <div class="description-content">
+                {{ detailData.info || '无描述信息' }}
+              </div>
+            </div>
+          </div>
+
+          <!-- 步骤条 -->
+          <div v-if="detailData.nodes && detailData.nodes.length > 0" class="detail-card">
+            <h3 class="card-title">执行步骤</h3>
+            <div class="steps-container">
+              <div
+                v-for="(node, index) in detailData.nodes"
+                :key="node.id || index"
+                class="step-item"
+                :class="{ 'last-item': index === detailData.nodes.length - 1 }"
+              >
+                <div class="step-number" :class="getStatusClass(node.status)">{{ node.code || index + 1 }}</div>
+                <div class="step-content">
+                  <div class="step-name">{{ node.name || '未命名步骤' }}</div>
+                  <div class="step-purpose">{{ node.intendedPurpose || '无说明' }}</div>
+                  <div class="step-time">计划时间：{{ formatDateTime(node.intendedTime) }}</div>
+                  <div v-if="node.finishTime" class="step-finish-time">完成时间：{{ formatDateTime(node.finishTime) }}</div>
+                  <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
+                </div>
+                <div class="step-status" :class="getStatusClass(node.status)">
+                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                </div>
+                <!-- 连接线 -->
+                <div v-if="index < detailData.nodes.length - 1" class="step-connector" :class="{ 'connector-completed': node.status !== '2' }"></div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 图片展示区 -->
+          <div v-if="detailData.fileUrl" class="detail-card">
+            <h3 class="card-title">故障图片</h3>
+            <div class="card-content">
+              <div class="images-container">
+                <!-- 将逗号分隔的URL字符串拆分为数组并循环展示 -->
+                <div v-for="(url, index) in splitImageUrls(detailData.fileUrl)" :key="index" class="image-item">
+                  <img
+                    :src="url"
+                    :alt="`故障图片 ${index + 1}`"
+                    class="detail-image"
+                    @error="handleImageError($event, index)"
+                    style="max-width: 100%; max-height: 200px; border-radius: 4px"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 工单结果 -->
+          <div v-if="detailData.orderResult" class="detail-card">
+            <h3 class="card-title">工单结果</h3>
+            <div class="card-content">
+              <div class="result-content">
+                {{ detailData.orderResult }}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div v-else class="empty-state">
+          <p>暂无工单详情数据</p>
+        </div>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="closeDetailDialog">关闭</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </div>
+
+    <!-- 派单弹窗 -->
+    <el-dialog v-model="assignDialogVisible" title="派单" width="400px" :before-close="cancelAssign">
+      <div class="assign-dialog-content">
+        <div class="form-group">
+          <label class="form-label">选择执行人:</label>
+          <el-select v-model="selectedExecutor" placeholder="请选择执行人" style="width: 100%" :loading="loadingUsers" filterable>
+            <el-option v-for="item in executors" :key="item.userId" :label="item.userName" :value="item.userId" />
+          </el-select>
+        </div>
+      </div>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancelAssign">取消</el-button>
+          <el-button type="primary" @click="confirmAssign" :loading="assignLoading">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, reactive } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
-// 导入Element Plus的Steps组件
-import { ElSteps, ElStep } from 'element-plus';
+import { gongdanlist, updategongdan, gongdanDetail } from '@/api/zhinengxunjian/gongdan/index';
+import { updatejiedian } from '@/api/zhinengxunjian/jiedian';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
+import ImageUpload from '@/components/ImageUpload/index.vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
 
-// 搜索和筛选条件
-const searchKeyword = ref('');
-const showFilter = ref(false);
-const filterStatus = ref('all');
-const filterType = ref('all');
-const filterExecutor = ref('all');
-const filterDateRange = ref([]);
+// 筛选条件
+const workOrderType = ref('all');
+const workOrderStatus = ref('all');
+const priority = ref('all');
+const createDate = ref('');
 
-// 执行记录数据
-const rawTableData = ref([
-  {
-    orderNo: 'WO-2023-0618-054',
-    description: '新设备安装调试',
-    executor: '赵工, 李工',
-    startTime: '2023-06-18 14:00',
-    endTime: '',
-    status: '执行中',
-    completion: '75%',
-    inspectionResult: ''
-  },
-  {
-    orderNo: 'WO-2023-0617-053',
-    description: '系统升级改造',
-    executor: '赵工',
-    startTime: '2023-06-17 10:00',
-    endTime: '2023-06-19 16:45',
-    status: '已完成',
-    completion: '100%',
-    inspectionResult: ''
-  },
-  {
-    orderNo: 'WO-2023-0618-052',
-    description: '月度设备检查',
-    executor: '赵工, 王工',
-    startTime: '2023-06-18 09:30',
-    endTime: '2023-06-18 15:20',
-    status: '已完成',
-    completion: '100%',
-    inspectionResult: '需整改'
-  },
-  {
-    orderNo: 'WO-2023-0618-051',
-    description: '新设备安装调试',
-    executor: '赵工, 李工',
-    startTime: '2023-06-18 14:00',
-    endTime: '2023-06-19 11:30',
-    status: '已完成',
-    completion: '100%',
-    inspectionResult: '验收通过'
-  },
-  {
-    orderNo: 'WO-2023-0618-050',
-    description: '新设备安装调试',
-    executor: '赵工, 李工',
-    startTime: '2023-06-18 14:00',
-    endTime: '2023-06-19 09:15',
-    status: '已完成',
-    completion: '100%',
-    inspectionResult: '验收通过'
-  },
-  {
-    orderNo: 'WO-2023-0618-049',
-    description: '新设备安装调试',
-    executor: '赵工, 李工',
-    startTime: '2023-06-18 14:00',
-    endTime: '2023-06-19 10:45',
-    status: '已完成',
-    completion: '100%',
-    inspectionResult: '验收通过'
-  },
-  {
-    orderNo: 'WO-2023-0618-048',
-    description: '新设备安装调试',
-    executor: '赵工, 李工',
-    startTime: '2023-06-18 14:00',
-    endTime: '2023-06-19 16:20',
-    status: '已完成',
-    completion: '100%',
-    inspectionResult: '验收通过'
-  },
-  {
-    orderNo: 'WO-2023-0618-047',
-    description: '新设备安装调试',
-    executor: '赵工, 李工',
-    startTime: '2023-06-18 14:00',
-    endTime: '2023-06-19 15:30',
-    status: '已完成',
-    completion: '100%',
-    inspectionResult: '验收通过'
-  }
-]);
+// 工单数据
+const rawTableData = ref([]);
 
 // 分页相关
 const currentPage = ref(1);
 const pageSize = ref(10);
-const total = ref(rawTableData.value.length);
+const total = ref(0);
+
+// 获取工单列表数据
+const fetchWorkOrderList = async () => {
+  try {
+    const params = {
+      projectId: 1,
+      pageNum: currentPage.value,
+      pageSize: pageSize.value
+    };
+
+    const response = await gongdanlist(params);
+
+    if (response.code === 200 && response.rows) {
+      // 处理返回的数据，转换为表格需要的格式
+      rawTableData.value = response.rows.map((item) => ({
+        id: item.id,
+        projectId: item.projectId,
+        orderNo: `WO-${item.id}`, // 生成工单编号
+        title: item.title || '',
+        description: item.info || '',
+        type: mapCodeToType(item.type),
+        priority: mapCodeToPriority(item.level),
+        creator: item.sendOrderPersonVo?.userName || '',
+        createTime: item.createTime ? formatDate(item.createTime) : item.sendOrderTime ? formatDate(item.sendOrderTime) : '',
+        deadline: item.endTime ? formatDate(item.endTime) : '',
+        status: mapCodeToStatus(item.status),
+        executor: item.getOrderPersonVo?.userName || '',
+        getOrderTime: item.getOrderTime ? formatDate(item.getOrderTime) : '',
+        finishiOrderTime: item.finishiOrderTime ? formatDate(item.finishiOrderTime) : '',
+        position: item.position || '',
+        device: item.device || ''
+      }));
+
+      // 更新总条数
+      total.value = response.total || 0;
+
+      // 处理跟踪步骤数据
+      processTrackingSteps(response.rows);
+    }
+  } catch (error) {
+    console.error('获取工单列表失败:', error);
+  }
+};
+
+// 处理工单列表数据，提取需要跟踪的步骤
+const processTrackingSteps = (workOrders) => {
+  // 收集所有point为1的工单（根据新的数据结构）
+  trackedWorkOrders.value = workOrders.filter((order) => order.point === '1');
+
+  // 更新当前显示的工单
+  updateCurrentTrackedOrder();
+};
+
+// 更新当前显示的跟踪工单
+const updateCurrentTrackedOrder = () => {
+  // 获取当前页应该显示的工单
+  const currentWorkOrder = trackedWorkOrders.value[currentTrackPage.value - 1];
+
+  if (currentWorkOrder) {
+    currentTrackedWorkOrder.value = currentWorkOrder;
+
+    // 检查是否有nodes数据，如果有则处理
+    if (currentWorkOrder.nodes && Array.isArray(currentWorkOrder.nodes) && currentWorkOrder.nodes.length > 0) {
+      // 按code排序nodes数组
+      const sortedNodes = [...currentWorkOrder.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+
+      // 设置跟踪步骤数据，确保每个节点有必要的字段
+      trackingSteps.value = sortedNodes.map((node) => ({
+        id: node.id,
+        name: node.name,
+        code: node.code,
+        executor: currentWorkOrder.sendOrderPersonVo?.userName || currentWorkOrder.getOrderPersonVo?.userName || '待分配',
+        intendedTime: node.intendedTime,
+        finishTime: node.finishTime,
+        intendedPurpose: node.intendedPurpose || '-',
+        remark: node.remark || ''
+      }));
+    } else {
+      // 如果nodes数组为空，创建一些默认的步骤数据
+      trackingSteps.value = [];
+    }
+
+    // 设置当前激活步骤索引
+    // 如果有实际的完成时间，我们可以基于此设置激活步骤
+    // 否则默认设置为第一个步骤
+    activeStepIndex.value = 0;
+
+    // 检查是否有已完成的步骤，如果有，将激活步骤设置为最后一个已完成步骤的下一个
+    for (let i = trackingSteps.value.length - 1; i >= 0; i--) {
+      if (trackingSteps.value[i].finishTime) {
+        activeStepIndex.value = Math.min(i + 1, trackingSteps.value.length - 1);
+        break;
+      }
+    }
+
+    // 显示重点跟踪工单信息
+    console.log('重点跟踪工单:', {
+      title: currentWorkOrder.title,
+      orderNo: currentWorkOrder.id,
+      startTime: currentWorkOrder.createTime,
+      endTime: currentWorkOrder.endTime,
+      status: currentWorkOrder.status
+    });
+  } else {
+    // 如果没有找到point为1的工单，设置默认步骤数据
+    trackingSteps.value = [
+      {
+        id: 'no-point-1',
+        name: '暂无重点跟踪工单',
+        code: 1,
+        executor: '系统',
+        finishTime: new Date().toISOString(),
+        intendedPurpose: '请在工单列表中设置重点跟踪工单',
+        remark: ''
+      }
+    ];
+    activeStepIndex.value = 0;
+    currentTrackedWorkOrder.value = null;
+  }
+};
+
+// 步骤条分页切换
+const handleTrackPageChange = (page) => {
+  currentTrackPage.value = page;
+  updateCurrentTrackedOrder();
+};
+
+// 类型映射函数 - 页面类型转接口code
+const mapTypeToCode = (type) => {
+  const typeMap = {
+    '维护保养': 1,
+    '检查检测': 2,
+    '安装调试': 3,
+    '升级改造': 4
+  };
+  return typeMap[type] || null;
+};
+
+// 类型映射函数 - 接口code转页面类型
+const mapCodeToType = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const typeMap = {
+    '1': '维护保养',
+    '2': '检查检测',
+    '3': '安装调试',
+    '4': '升级改造'
+  };
+  return typeMap[codeStr] || code;
+};
+
+// 状态映射函数 - 页面状态转接口code
+const mapStatusToCode = (status) => {
+  const statusMap = {
+    '待派单': 1,
+    '已派单': 2,
+    '执行中': 3,
+    '已完成': 4
+  };
+  return statusMap[status] || null;
+};
+
+// 状态映射函数 - 接口code转页面状态
+const mapCodeToStatus = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const statusMap = {
+    '1': '待派单',
+    '2': '已派单',
+    '3': '执行中',
+    '4': '已完成'
+  };
+  return statusMap[codeStr] || code;
+};
+
+// 优先级映射函数 - 页面优先级转接口code
+const mapPriorityToCode = (priority) => {
+  const priorityMap = {
+    '高': 3,
+    '中': 2,
+    '低': 1
+  };
+  return priorityMap[priority] || null;
+};
+
+// 优先级映射函数 - 接口code转页面优先级
+const mapCodeToPriority = (code) => {
+  // 确保code是字符串类型以匹配映射表
+  const codeStr = typeof code === 'number' ? code.toString() : code;
+  const priorityMap = {
+    '1': '低',
+    '2': '中',
+    '3': '高'
+  };
+  return priorityMap[codeStr] || code;
+};
+
+// 日期格式化函数 - 支持datetime格式
+const formatDate = (dateString) => {
+  if (!dateString) return '';
+  const date = new Date(dateString);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+
+  // 返回与datetime选择器value-format一致的格式
+  return `${year}/${month}/${day} ${hours}:${minutes}`;
+};
+
+// 时间格式化函数 - 用于步骤条的时间显示
+// const formatDateTime = (dateString) => {
+//   if (!dateString) return '';
+//   const date = new Date(dateString);
+//   const year = date.getFullYear();
+//   const month = String(date.getMonth() + 1).padStart(2, '0');
+//   const day = String(date.getDate()).padStart(2, '0');
+//   const hours = String(date.getHours()).padStart(2, '0');
+//   const minutes = String(date.getMinutes()).padStart(2, '0');
+//   const seconds = String(date.getSeconds()).padStart(2, '0');
+
+//   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+// };
+
+// 步骤条相关状态
+const trackingSteps = ref([]); // 跟踪步骤数据
+const activeStepIndex = ref(0); // 当前激活的步骤索引
+const currentTrackedWorkOrder = ref(null); // 当前重点跟踪的工单信息
+
+// 步骤条分页相关状态
+const trackedWorkOrders = ref([]); // 所有重点跟踪工单列表
+const currentTrackPage = ref(1); // 当前步骤条分页
+const trackPageSize = ref(1); // 每页显示的步骤条数量（默认为1）
+
+// 刷新步骤条数据
+const refreshTrackingSteps = async () => {
+  try {
+    // 调用gongdanlist接口获取最新数据
+    const params = {
+      projectId: 1,
+      pageNum: 1,
+      point: 1, // 根据新的数据结构，查找point为2的工单
+      pageSize: 100 // 获取足够多的数据以确保找到point为2的工单
+    };
+
+    const response = await gongdanlist(params);
+
+    if (response.code === 200 && response.rows) {
+      // 处理返回的数据，提取步骤信息
+      processTrackingSteps(response.rows);
+    }
+  } catch (error) {
+    console.error('刷新步骤条数据失败:', error);
+  }
+};
+
+// 根据索引获取步骤状态
+const getStatusByIndex = (index) => {
+  if (index < activeStepIndex.value) {
+    return 'success';
+  } else if (index === activeStepIndex.value) {
+    return 'process';
+  } else {
+    return 'wait';
+  }
+};
+
+// 将状态码转换为可读的状态文本
+const getStatusText = (statusCode) => {
+  const statusMap = {
+    '1': '待处理',
+    '2': '待派单',
+    '3': '执行中',
+    '4': '已完成',
+    '5': '已取消'
+  };
+
+  // 确保statusCode是字符串类型以匹配映射表
+  const statusStr = typeof statusCode === 'number' ? statusCode.toString() : statusCode;
+
+  return statusMap[statusStr] || '未知状态';
+};
+
+// 初始化加载数据
+const initData = async () => {
+  await fetchWorkOrderList();
+
+  // 额外调用一次专门刷新步骤条数据的函数，确保获取到最新的point为1的数据
+  await refreshTrackingSteps();
+};
+
+initData();
 
 // 分页处理后的数据
 const pagedTableData = computed(() => {
   // 筛选逻辑
   let filteredData = [...rawTableData.value];
 
-  // 搜索关键词筛选
-  if (searchKeyword.value) {
-    const keyword = searchKeyword.value.toLowerCase();
-    filteredData = filteredData.filter(
-      (item) =>
-        item.orderNo.toLowerCase().includes(keyword) ||
-        item.description.toLowerCase().includes(keyword) ||
-        item.executor.toLowerCase().includes(keyword)
-    );
+  if (workOrderType.value !== 'all') {
+    // 转换筛选条件为显示文本进行匹配
+    let typeText = '';
+    switch (workOrderType.value) {
+      case 'maintenance':
+        typeText = '维护保养';
+        break;
+      case 'inspection':
+        typeText = '检查检测';
+        break;
+      case 'installation':
+        typeText = '安装调试';
+        break;
+      case 'upgrade':
+        typeText = '升级改造';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.type === typeText);
   }
 
-  // 状态筛选
-  if (filterStatus.value !== 'all') {
-    filteredData = filteredData.filter((item) => item.status === filterStatus.value);
+  if (workOrderStatus.value !== 'all') {
+    // 转换筛选条件为显示文本进行匹配
+    let statusText = '';
+    switch (workOrderStatus.value) {
+      case 'accepted':
+        statusText = '已接单';
+        break;
+      case 'pending':
+        statusText = '待处理';
+        break;
+      case 'executing':
+        statusText = '执行中';
+        break;
+      case 'completed':
+        statusText = '已完成';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.status === statusText);
   }
 
-  // 类型筛选
-  if (filterType.value !== 'all') {
-    const typeMap = {
-      'installation': '新设备安装调试',
-      'upgrade': '系统升级改造',
-      'monthlyCheck': '月度设备检查'
-    };
-    filteredData = filteredData.filter((item) => item.description.includes(typeMap[filterType.value]));
+  if (priority.value !== 'all') {
+    // 转换筛选条件为显示文本进行匹配
+    let priorityText = '';
+    switch (priority.value) {
+      case 'high':
+        priorityText = '高';
+        break;
+      case 'medium':
+        priorityText = '中';
+        break;
+      case 'low':
+        priorityText = '低';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.priority === priorityText);
   }
 
-  // 执行人筛选
-  if (filterExecutor.value !== 'all') {
-    const executorMap = {
-      'zhao': '赵工',
-      'li': '李工',
-      'wang': '王工'
-    };
-    filteredData = filteredData.filter((item) => item.executor.includes(executorMap[filterExecutor.value]));
-  }
-
-  // 日期范围筛选
-  if (filterDateRange.value && filterDateRange.value.length === 2) {
-    const startDate = new Date(filterDateRange.value[0]);
-    const endDate = new Date(filterDateRange.value[1]);
-    filteredData = filteredData.filter((item) => {
-      const itemDate = item.startTime ? new Date(item.startTime) : new Date();
-      return itemDate >= startDate && itemDate <= endDate;
-    });
+  if (createDate.value) {
+    filteredData = filteredData.filter((item) => item.createTime.includes(createDate.value));
   }
 
   // 更新总条数
@@ -381,30 +907,82 @@ const pagedTableData = computed(() => {
   return filteredData.slice(startIndex, endIndex);
 });
 
+// 获取类型标签样式
+const getTypeTagType = (type) => {
+  const typeMap = {
+    // 维护保养为红色
+    '维护保养': 'danger',
+    // 检查检测为绿色
+    '检查检测': 'success',
+    // 安装调试为黄色
+    '安装调试': 'warning',
+    // 升级改造为绿色
+    '升级改造': 'success'
+  };
+  return typeMap[type] || 'default';
+};
+
+// 获取优先级标签样式
+const getPriorityTagType = (priority) => {
+  const priorityMap = {
+    '高': 'danger',
+    '中': 'warning',
+    '低': 'info'
+  };
+  return priorityMap[priority] || 'default';
+};
+
 // 获取状态标签样式
 const getStatusTagType = (status) => {
   const statusMap = {
-    '已完成': 'success',
-    '执行中': 'primary'
+    '已接单': 'primary',
+    '待处理': 'warning',
+    '待派单': 'warning',
+    '执行中': 'success',
+    '已完成': 'info'
   };
   return statusMap[status] || 'default';
 };
 
-// 获取验收结果标签样式
-const getResultTagType = (result) => {
-  const resultMap = {
-    '验收通过': 'success',
-    '需整改': 'warning'
+// 根据步骤状态获取对应的样式类
+const getStatusClass = (status) => {
+  // 处理可能的数字输入
+  const statusStr = status?.toString() || '';
+  const statusClassMap = {
+    '1': 'status-pending',
+    '2': 'status-delayed',
+    '3': 'status-executing',
+    '4': 'status-completed'
   };
-  return resultMap[result] || 'default';
+  return statusClassMap[statusStr] || 'status-unknown';
 };
 
-// 获取完成度样式
-const getCompletionClass = (completion) => {
-  const percentage = parseInt(completion);
-  if (percentage === 100) return 'completed';
-  if (percentage > 0) return 'in-progress';
-  return 'not-started';
+// 格式化日期时间（用于步骤条）
+const formatDateTime = (dateTime) => {
+  if (!dateTime) return '-';
+  try {
+    const date = new Date(dateTime);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } catch (error) {
+    return dateTime;
+  }
+};
+
+// 获取步骤状态文本
+const getStepStatusText = (status) => {
+  const statusStr = status?.toString() || '';
+  const statusMap = {
+    '1': '待执行',
+    '2': '执行中',
+    '3': '已完成',
+    '4': '已延期'
+  };
+  return statusMap[statusStr] || '未知状态';
 };
 
 // 搜索处理
@@ -412,15 +990,6 @@ const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
 };
 
-// 重置筛选条件
-const resetFilter = () => {
-  filterStatus.value = 'all';
-  filterType.value = 'all';
-  filterExecutor.value = 'all';
-  filterDateRange.value = [];
-  currentPage.value = 1;
-};
-
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
@@ -432,19 +1001,534 @@ const handleCurrentChange = (val) => {
 };
 
 // 操作按钮事件
-const handleViewDetails = (row) => {
-  console.log('查看详情:', row);
-  // 实际应用中这里会跳转到详情页
+const handleViewDetail = async (row) => {
+  try {
+    isDetailLoading.value = true;
+    const response = await gongdanDetail(row.id);
+    if (response.code === 200 && response.data) {
+      detailData.value = response.data;
+      detailDialogVisible.value = true;
+    } else {
+      ElMessageBox.alert('获取工单详情失败', '提示', {
+        confirmButtonText: '确定',
+        type: 'error'
+      });
+    }
+  } catch (error) {
+    console.error('获取工单详情错误:', error);
+    ElMessageBox.alert('获取工单详情时发生错误', '错误', {
+      confirmButtonText: '确定',
+      type: 'error'
+    });
+  } finally {
+    isDetailLoading.value = false;
+  }
 };
 
-const handleViewReport = (row) => {
-  console.log('查看报告:', row);
-  // 实际应用中这里会打开报告查看页面
+// 关闭详情弹窗
+const closeDetailDialog = () => {
+  detailDialogVisible.value = false;
+  detailData.value = null;
 };
 
-const handleDeviceAcceptance = (row) => {
-  console.log('设备验收:', row);
-  // 实际应用中这里会打开验收表单
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const detailData = ref(null);
+const isDetailLoading = ref(false);
+
+// 分割图片URL
+const splitImageUrls = (fileUrl) => {
+  if (!fileUrl) return [];
+  return fileUrl.split(',').filter((url) => url.trim());
+};
+
+// 处理图片加载错误
+const handleImageError = (event, index) => {
+  event.target.src = '@/assets/images/error-image.png';
+};
+
+// 根据module分组nodes
+const groupNodesByModule = (nodes) => {
+  if (!nodes || !Array.isArray(nodes)) return [];
+  const moduleMap = new Map();
+
+  nodes.forEach((node) => {
+    const module = node.module || '默认模块';
+    if (!moduleMap.has(module)) {
+      moduleMap.set(module, []);
+    }
+    moduleMap.get(module).push(node);
+  });
+
+  // 转换为数组并排序
+  return Array.from(moduleMap.entries()).map(([module, items]) => ({
+    module,
+    items: items.sort((a, b) => (a.code || 0) - (b.code || 0))
+  }));
+};
+
+const handleCancel = (row) => {
+  console.log('取消工单:', row);
+};
+
+const handleCommunicate = (row) => {
+  console.log('沟通:', row);
+  // 这里可以实现沟通功能，例如打开沟通弹窗或跳转到沟通页面
+};
+
+const handleArchive = (row) => {
+  console.log('归档:', row);
+};
+
+// 派单弹窗相关状态
+const assignDialogVisible = ref(false);
+const assignLoading = ref(false);
+const currentTaskId = ref('');
+const currentTaskInfo = ref(null); // 存储当前工单的完整信息
+const selectedExecutor = ref('');
+const executors = ref([]);
+const loadingUsers = ref(false);
+
+// 派单功能
+const handleAssign = async (row) => {
+  console.log('派单:', row);
+  currentTaskId.value = row.id;
+  currentTaskInfo.value = row; // 保存完整的工单信息
+  selectedExecutor.value = '';
+
+  try {
+    // 调用xunjianUserlist接口获取用户列表
+    loadingUsers.value = true;
+    const res = await xunjianUserlist();
+    if (res && res.code === 200 && res.rows && Array.isArray(res.rows)) {
+      // 过滤有效用户并格式化数据
+      executors.value = res.rows
+        .filter((user) => user.userId && user.userName)
+        .map((user) => ({
+          userId: user.userId.toString(),
+          userName: user.userName
+        }));
+    } else {
+      ElMessage.error('获取用户列表失败');
+    }
+  } catch (error) {
+    console.error('获取用户列表异常:', error);
+    ElMessage.error('获取用户列表失败，请稍后重试');
+  } finally {
+    loadingUsers.value = false;
+  }
+
+  // 打开派单弹窗
+  assignDialogVisible.value = true;
+};
+
+// 确认派单
+const confirmAssign = async () => {
+  if (!selectedExecutor.value) {
+    ElMessage.warning('请选择执行人');
+    return;
+  }
+
+  try {
+    assignLoading.value = true;
+    // 调用updategongdan接口来执行派单操作
+    // 从执行人列表中查找选中的执行人信息
+    const selectedExecutorInfo = executors.value.find((item) => item.userId === selectedExecutor.value);
+
+    // 先获取完整的工单详情
+    const detailResponse = await gongdanDetail(currentTaskId.value);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+
+    // 获取完整的工单数据
+    const workOrderDetail = detailResponse.data;
+
+    // 在完整工单数据基础上进行修改
+    const updateData = {
+      ...workOrderDetail,
+      // 状态更新为已派单（根据系统状态映射，2表示已派单）
+      status: 2,
+      // 设置执行人ID
+      handler: selectedExecutor.value,
+      // 设置执行人姓名
+      handlerName: selectedExecutorInfo?.userName || '',
+      // 设置派单人ID
+      getOrderPerson: selectedExecutor.value,
+      sendPerson: selectedExecutor.value,
+      // 设置派单人Vo对象（包含id和userName）
+      getOrderPersonVo: selectedExecutorInfo
+        ? {
+            id: selectedExecutor.value,
+            userName: selectedExecutorInfo.userName
+          }
+        : null,
+      // 更新时间
+      updateTime: new Date().toISOString(),
+      // 设置派单时间
+      sendOrderTime: new Date().toISOString(),
+      // 确保类型字段正确
+      type: workOrderDetail.type || 1
+    };
+
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('派单成功');
+      assignDialogVisible.value = false;
+
+      // 刷新工单列表以显示更新后的状态
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error(response.msg || '派单失败');
+    }
+  } catch (error) {
+    console.error('派单异常:', error);
+    ElMessage.error('派单失败，请稍后重试');
+  } finally {
+    assignLoading.value = false;
+  }
+};
+
+// 取消派单
+const cancelAssign = () => {
+  assignDialogVisible.value = false;
+  selectedExecutor.value = '';
+  currentTaskId.value = '';
+};
+
+// 跟踪功能 - 已接单状态
+const handleFollow = (row) => {
+  console.log('跟踪:', row);
+  // 实现跟踪功能
+};
+
+// 设置跟踪功能 - 已派单状态
+const handleSetTrack = async (row) => {
+  try {
+    // 获取当前point值，默认为2（不跟踪）
+    const currentPoint = row.point || '2';
+    // 确定新的point值和操作类型
+    const newPoint = currentPoint === '1' ? '2' : '1';
+    const operationText = currentPoint === '1' ? '取消跟踪' : '设置跟踪';
+
+    // 弹出确认对话框
+    await ElMessageBox.confirm(`确定要${operationText}该工单吗？`, '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+
+    // 获取完整的工单详情
+    const detailResponse = await gongdanDetail(row.id);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+
+    // 获取完整的工单数据
+    const workOrderDetail = detailResponse.data;
+
+    // 在完整工单数据基础上进行修改
+    const updateData = {
+      ...workOrderDetail,
+      // 切换point值：1表示跟踪，2表示不跟踪
+      point: newPoint,
+      // 更新时间
+      updateTime: new Date().toISOString()
+    };
+
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success(`${operationText}成功`);
+      // 刷新工单列表以显示更新后的状态
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error(response.msg || `${operationText}失败`);
+    }
+  } catch (error) {
+    if (error === 'cancel') {
+      // 用户取消操作，不做处理
+      return;
+    }
+    console.error('设置跟踪异常:', error);
+    ElMessage.error('设置跟踪失败，请稍后重试');
+  }
+};
+
+// 编辑工单
+const handleEdit = async (row) => {
+  console.log('编辑工单:', row);
+  try {
+    // 获取工单详情
+    const detailResponse = await gongdanDetail(row.id);
+    if (detailResponse.code !== 200) {
+      ElMessage.error('获取工单详情失败');
+      return;
+    }
+    const workOrderDetail = detailResponse.data;
+
+    // 填充表单数据
+    createForm.title = workOrderDetail.title || '';
+    createForm.type = mapCodeToType(workOrderDetail.type) || '维护保养';
+    createForm.priority = mapCodeToPriority(workOrderDetail.level) || '低';
+    createForm.deadline = workOrderDetail.endTime ? formatDate(workOrderDetail.endTime) : '';
+    createForm.description = workOrderDetail.info || '';
+    createForm.location = workOrderDetail.position || '';
+    createForm.relatedEquipment = workOrderDetail.device || '';
+    createForm.file = workOrderDetail.fileId || '';
+    createForm.resultDescription = workOrderDetail.results || '';
+    createForm.needAssignee = !!workOrderDetail.executor;
+
+    // 填充步骤数据：从nodes数组中提取并按code排序
+    if (workOrderDetail.nodes && Array.isArray(workOrderDetail.nodes)) {
+      // 复制nodes数组并按code升序排序
+      const sortedNodes = [...workOrderDetail.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+      // 转换为createForm.steps所需的格式
+      createForm.steps = sortedNodes.map((node) => ({
+        name: node.name || '',
+        intendedPurpose: node.intendedPurpose || '',
+        intendedTime: node.intendedTime ? formatDate(node.intendedTime, 'YYYY-MM-DD HH:mm') : ''
+      }));
+      // 确保至少有一个空步骤
+      if (createForm.steps.length === 0) {
+        createForm.steps = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+      }
+    } else {
+      // 如果没有nodes数据，重置为默认的一个空步骤
+      createForm.steps = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+    }
+
+    // 存储当前编辑的工单ID，用于区分是创建还是编辑操作
+    editingWorkOrderId.value = row.id;
+
+    // 保存原始创建时间
+    originalCreateTime.value = workOrderDetail.createTime || '';
+
+    // 打开新增工单的弹窗
+    createDialogVisible.value = true;
+  } catch (error) {
+    console.error('打开编辑工单弹窗过程中发生错误:', error);
+    ElMessage.error('打开编辑工单弹窗失败');
+  }
+};
+
+// 编辑状态下的工单ID
+const editingWorkOrderId = ref('');
+
+// 保存原始创建时间（编辑工单时使用）
+const originalCreateTime = ref('');
+
+// 查看工单进度
+const handleViewProgress = (row) => {
+  console.log('查看工单进度:', row);
+  // 实现查看进度功能
+};
+
+// 编辑工单弹窗相关
+const createDialogVisible = ref(false);
+const createFormRef = ref(null);
+
+const createForm = reactive({
+  title: '',
+  type: '',
+  priority: '',
+  deadline: '',
+  description: '',
+  location: '',
+  relatedEquipment: '',
+  steps: [{ name: '', intendedPurpose: '', intendedTime: '' }], // 工单步骤数组
+  file: '',
+  fileList: [],
+  resultDescription: '',
+  needAssignee: 'false'
+});
+
+const createFormRules = {
+  title: [{ required: true, message: '请输入工单标题', trigger: 'blur' }],
+  type: [{ required: true, message: '请选择工单类型', trigger: 'change' }],
+  priority: [{ required: true, message: '请选择优先级', trigger: 'change' }],
+  deadline: [{ required: true, message: '请选择截止时间', trigger: 'change' }],
+  description: [{ required: true, message: '请输入工单描述', trigger: 'blur' }],
+  location: [{ required: true, message: '请输入执行地点', trigger: 'blur' }],
+  needAssignee: [{ required: true, message: '请选择是否需要指定执行人', trigger: 'change' }]
+};
+
+// 添加试验步骤
+const addStep = () => {
+  createForm.steps.push({ name: '', intendedPurpose: '', intendedTime: '' });
+};
+
+// 删除试验步骤
+const deleteStep = (index) => {
+  // 确保至少保留一个步骤
+  if (createForm.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  createForm.steps.splice(index, 1);
+};
+
+// 提交编辑工单
+const submitCreate = async () => {
+  // 表单验证
+  if (!createFormRef.value) return;
+
+  try {
+    await createFormRef.value.validate();
+
+    // 准备步骤数据
+    const stepsData = createForm.steps
+      .filter((step) => step.name.trim() && step.intendedPurpose.trim())
+      .map((step, index) => ({
+        createTime: new Date().toISOString(),
+        updateTime: new Date().toISOString(),
+        params: {},
+        module: 1,
+        code: index + 1,
+        name: step.name,
+        intendedPurpose: step.intendedPurpose,
+        intendedTime: step.intendedTime ? new Date(step.intendedTime).toISOString() : new Date().toISOString(),
+        finishTime: '',
+        remark: '',
+        status: 1 // 使用数字值而不是字符串，确保状态字段不为空
+      }));
+
+    // 编辑模式下，需要为每个步骤添加id，并调用updatejiedian接口
+    let nodeIds = '';
+    if (editingWorkOrderId.value) {
+      // 获取工单详情，以获取原始步骤的id
+      const detailResponse = await gongdanDetail(editingWorkOrderId.value);
+      if (detailResponse.code !== 200) {
+        ElMessage.error('获取工单详情失败');
+        return;
+      }
+
+      const workOrderDetail = detailResponse.data;
+      if (workOrderDetail.nodes && Array.isArray(workOrderDetail.nodes)) {
+        // 按code排序原始nodes数组
+        const sortedNodes = [...workOrderDetail.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+
+        // 为新的步骤数据添加id
+        const updatedSteps = stepsData.map((step, index) => ({
+          ...step,
+          id: sortedNodes[index]?.id || 0 // 使用原始步骤的id，如果不存在则使用0
+        }));
+
+        // 调用updatejiedian接口更新步骤，直接传递数组
+        const updateResponse = await updatejiedian(updatedSteps);
+        if (updateResponse.code !== 200) {
+          ElMessage.error('更新步骤失败');
+          return;
+        }
+
+        // 使用原始的nodeIds，避免重新创建步骤
+        nodeIds = workOrderDetail.nodeIds;
+      }
+    } else {
+      // 创建模式下，调用addjiedian接口，直接传递数组
+      const jiedianResponse = await addjiedian(stepsData);
+
+      if (jiedianResponse.code !== 200) {
+        ElMessage.error('创建步骤失败');
+        return;
+      }
+
+      // 获取返回的ids，实际返回格式中msg字段包含ids字符串，data为null
+      if (jiedianResponse.code === 200 && jiedianResponse.msg) {
+        nodeIds = jiedianResponse.msg;
+      } else {
+        ElMessage.warning('未获取到有效的步骤ID');
+        return;
+      }
+    }
+
+    // 准备工单数据
+    const workOrderData = {
+      // 编辑模式下使用原始创建时间
+      createTime: originalCreateTime.value,
+      updateTime: new Date().toISOString(),
+      params: {},
+      module: 1,
+      projectId: 1,
+      title: createForm.title,
+      type: mapTypeToCode(createForm.type),
+      level: mapPriorityToCode(createForm.priority),
+      endTime: createForm.deadline ? new Date(createForm.deadline).toISOString() : '',
+      info: createForm.description,
+      position: createForm.location,
+      device: createForm.relatedEquipment || '',
+      fileId: createForm.file ? createForm.file : '',
+      nodeIds: nodeIds,
+      results: createForm.resultDescription || '',
+      status: 1, // 待派单 1待派单2已派单3执行中4已完成
+      sendOrderTime: '', // 只有在派单并选择人员后才赋值
+      getOrderTime: '',
+      finishiOrderTime: '',
+      orderResult: '', // 验收结果1通过2需整改
+      point: '2', // 默认不跟踪（2表示不跟踪，1表示跟踪）
+      createDept: '',
+      createBy: '',
+      handlerDept: '',
+      handler: '',
+      handlerName: ''
+    };
+
+    // 编辑操作：调用updategongdan接口
+    const updateData = {
+      ...workOrderData,
+      id: editingWorkOrderId.value
+    };
+    const response = await updategongdan(updateData);
+
+    if (response.code === 200) {
+      ElMessage.success('工单编辑成功');
+      createDialogVisible.value = false;
+
+      // 重置表单
+      Object.keys(createForm).forEach((key) => {
+        if (key === 'steps') {
+          createForm[key] = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+        } else if (key === 'fileList') {
+          createForm[key] = [];
+        } else {
+          createForm[key] = '';
+        }
+      });
+      createForm.needAssignee = 'false';
+
+      // 重置编辑状态
+      editingWorkOrderId.value = '';
+      originalCreateTime.value = '';
+
+      // 刷新工单列表
+      fetchWorkOrderList();
+    } else {
+      ElMessage.error('工单编辑失败');
+    }
+  } catch (error) {
+    console.error('编辑工单过程中发生错误:', error);
+    ElMessage.error(`编辑工单过程中发生错误: ${error.message || '未知错误'}`);
+  }
+};
+
+// 取消编辑工单
+const cancelCreate = () => {
+  createDialogVisible.value = false;
+  // 重置表单
+  Object.keys(createForm).forEach((key) => {
+    if (key === 'steps') {
+      createForm[key] = [{ name: '', intendedPurpose: '', intendedTime: '' }];
+    } else if (key === 'fileList') {
+      createForm[key] = [];
+    } else {
+      createForm[key] = '';
+    }
+  });
+  createForm.needAssignee = 'false';
+  editingWorkOrderId.value = '';
 };
 
 // 导航路由跳转
@@ -464,31 +1548,246 @@ const handleInspection5 = () => {
   router.push('/rili/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanguanli');
+  router.push('/rili/gongdanliebiao');
 };
 const handleInspection7 = () => {
   router.push('/rili/renyuanzhuangtai');
 };
-
-// 子选项卡路由跳转
 const handleInspectionManagement1 = () => {
   router.push('/rili/gongdanliebiao');
 };
+
 const handleInspectionManagement2 = () => {
   router.push('/rili/paidanjilu');
 };
 const handleInspectionManagement3 = () => {
   router.push('/rili/zhixingjilu');
 };
+
+// 关闭详情弹窗
+const handleCloseDetailDialog = () => {
+  detailDialogVisible.value = false;
+};
 </script>
 
 <style scoped>
-.execution-records {
+@import url('./css/detail-dialog.css');
+@import url('./css/step-bars.css');
+.dispatch-records {
   padding: 20px;
   background-color: #f5f7fa;
   min-height: 100vh;
 }
 
+/* 美化后的步骤条样式 */
+.steps-container {
+  width: 100%;
+  padding: 24px;
+  background: linear-gradient(135deg, #f8faff 0%, #f0f7ff 100%);
+  border-radius: 12px;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.05);
+  position: relative;
+  overflow: hidden;
+}
+
+.steps-container::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 4px;
+  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
+}
+
+.step-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 32px;
+  position: relative;
+  padding-bottom: 32px;
+}
+
+.step-item:last-child {
+  margin-bottom: 0;
+  padding-bottom: 0;
+}
+
+.step-item:not(:last-child)::after {
+  content: '';
+  position: absolute;
+  left: 16px;
+  top: 40px;
+  bottom: 0;
+  width: 2px;
+  background-color: #e4e7ed;
+  z-index: 0;
+}
+
+.step-number {
+  width: 40px;
+  height: 40px;
+  background-color: #409eff;
+  color: white;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 20px;
+  flex-shrink: 0;
+  font-weight: bold;
+  font-size: 16px;
+  box-shadow: 0 2px 8px rgba(64, 158, 255, 0.3);
+  z-index: 1;
+  transition: all 0.3s ease;
+}
+
+.step-number:hover {
+  transform: scale(1.1);
+  box-shadow: 0 4px 12px rgba(64, 158, 255, 0.4);
+}
+
+.step-number.completed {
+  background: linear-gradient(135deg, #52c41a, #73d13d);
+  box-shadow: 0 2px 8px rgba(82, 196, 26, 0.3);
+}
+
+.step-number.pending {
+  background-color: #f0f2f5;
+  color: #909399;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.step-content {
+  width: 200px;
+  flex: 1;
+  background-color: white;
+  padding: 16px 20px;
+  border-radius: 8px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+  transition: all 0.3s ease;
+  position: relative;
+  z-index: 1;
+  align-self: center;
+  justify-content: center;
+}
+
+.step-content:hover {
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
+  transform: translateY(-2px);
+}
+
+.step-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 8px;
+}
+
+.step-purpose {
+  font-size: 14px;
+  color: #606266;
+  margin-bottom: 8px;
+  line-height: 1.5;
+}
+
+.step-time,
+.step-finish-time {
+  font-size: 13px;
+  color: #909399;
+  margin-bottom: 4px;
+}
+
+.step-remark {
+  font-size: 13px;
+  color: #165dff;
+  margin-top: 8px;
+  padding-top: 8px;
+  border-top: 1px solid #e4e7ed;
+}
+
+.step-status {
+  margin-left: 20px;
+  padding: 8px 16px;
+  border-radius: 20px;
+  font-size: 13px;
+  font-weight: 500;
+  flex-shrink: 0;
+  align-self: center;
+}
+
+.step-status.completed {
+  background-color: #f0f9ff;
+  color: #165dff;
+}
+
+.step-status.pending {
+  background-color: #fdf6ec;
+  color: #fa8c16;
+}
+
+/* 步骤连接线 */
+.step-connector {
+  position: absolute;
+  left: 16px;
+  top: 40px;
+  bottom: 0;
+  width: 2px;
+  background-color: #e4e7ed;
+  z-index: 0;
+  transition: all 0.3s ease;
+}
+
+.step-connector.connector-completed {
+  background: linear-gradient(to bottom, #52c41a, #73d13d);
+}
+
+/* 动画效果 */
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.step-item {
+  animation: fadeInUp 0.5s ease-out;
+}
+
+.step-item:nth-child(1) {
+  animation-delay: 0.1s;
+}
+.step-item:nth-child(2) {
+  animation-delay: 0.2s;
+}
+.step-item:nth-child(3) {
+  animation-delay: 0.3s;
+}
+.step-item:nth-child(4) {
+  animation-delay: 0.4s;
+}
+.step-item:nth-child(5) {
+  animation-delay: 0.5s;
+}
+
+.add-step-btn {
+  margin-top: 10px;
+  color: #409eff;
+}
+
+.add-step-btn:hover {
+  color: #66b1ff;
+  background-color: #ecf5ff;
+}
+
+.delete-step-btn {
+  margin-top: 5px;
+}
+
 /* 选项卡样式 */
 .tabs-wrapper {
   background-color: #fff;
@@ -498,54 +1797,48 @@ const handleInspectionManagement3 = () => {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
-/* 搜索和筛选区样式 */
-.search-filter {
+/* */
+
+/* 筛选栏样式 */
+.filter-bar {
   background-color: #fff;
   border-radius: 8px;
   margin-bottom: 24px;
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
-  overflow: hidden;
+  padding: 16px 24px;
 }
 
-.search-container {
+.filter-container {
   display: flex;
   align-items: center;
-  padding: 16px 24px;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.search-input {
-  flex: 1;
-  max-width: 500px;
-  height: 36px;
-}
-
-.filter-btn {
-  white-space: nowrap;
-  margin-left: 16px;
-}
-
-.filter-options {
-  padding: 16px 24px;
-}
-
-.filter-row {
-  display: flex;
   flex-wrap: wrap;
   gap: 16px;
-  align-items: center;
+  width: 100%;
 }
 
 .filter-item {
   flex-shrink: 0;
 }
 
-.filter-options .el-select,
-.filter-options .el-date-picker {
+.filter-bar .el-select,
+.filter-bar .el-date-picker {
   width: 180px;
   height: 36px;
 }
 
+.filter-bar .el-select .el-input__inner,
+.filter-bar .el-date-picker .el-input__inner {
+  border-radius: 4px;
+  border-color: #dcdfe6;
+  transition: all 0.2s ease;
+}
+
+.filter-bar .el-select .el-input__inner:focus,
+.filter-bar .el-date-picker .el-input__inner:focus {
+  border-color: #165dff;
+  box-shadow: 0 0 0 2px rgba(22, 93, 255, 0.1);
+}
+
 .filter-actions {
   margin-left: auto;
   display: flex;
@@ -553,286 +1846,93 @@ const handleInspectionManagement3 = () => {
   flex-shrink: 0;
 }
 
-/* 重点跟踪区域样式 */
-.tracking-section {
+.search-btn,
+.create-btn {
+  height: 36px;
+  border-radius: 4px;
+}
+
+/* 统计卡片样式 */
+.statistics-cards {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 16px;
+  margin-bottom: 24px;
+}
+
+.stat-card {
   background-color: #fff;
-  border-radius: 8px;
-  margin-bottom: 24px;
-  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
-  overflow: hidden;
-}
-
-.tracking-header {
-  display: flex;
-  align-items: center;
-  padding: 16px 24px;
-  border-bottom: 1px solid #f0f0f0;
-  background-color: #f5f7fa;
-}
-
-.tracking-header h3 {
-  font-size: 16px;
-  font-weight: 500;
-  color: #303133;
-  margin: 0;
-}
-
-.tracking-tag {
-  margin-left: 12px;
-  background-color: #e6f7ff;
-  color: #1890ff;
-  padding: 2px 8px;
-  border-radius: 4px;
-  font-size: 12px;
-}
-
-.tracking-card {
+  border-radius: 12px;
   padding: 24px;
-}
-
-.tracking-title {
-  margin-bottom: 24px;
-  padding-bottom: 16px;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.task-type {
-  display: inline-block;
-  font-weight: 500;
-  color: #303133;
-  margin-right: 24px;
-}
-
-.work-order-no,
-.time-range {
-  display: inline-block;
-  color: #606266;
-  margin-right: 24px;
-  font-size: 14px;
-}
-
-/* 动画效果 */
-@keyframes pulse {
-  0% {
-    box-shadow: 0 0 0 0 rgba(22, 93, 255, 0.4);
-  }
-  70% {
-    box-shadow: 0 0 0 10px rgba(22, 93, 255, 0);
-  }
-  100% {
-    box-shadow: 0 0 0 0 rgba(22, 93, 255, 0);
-  }
-}
-
-/* Element Plus Steps 组件自定义样式 - 优化版 */
-.custom-steps {
-  background: linear-gradient(135deg, #f8faff 0%, #f0f7ff 100%);
-  padding: 40px;
-  border-radius: 16px;
-  box-shadow: 0 8px 30px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
   position: relative;
   overflow: hidden;
   transition: all 0.3s ease;
 }
 
-/* 添加背景装饰 */
-.custom-steps::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 4px;
-  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
-}
-
-/* 步骤标题样式 */
-.el-step__title {
-  font-size: 18px;
-  font-weight: 600;
-  color: #303133;
-  transition: all 0.3s ease;
-  padding: 0 10px;
-}
-
-/* 步骤描述样式 */
-.el-step__description {
-  font-size: 14px;
-  color: #606266;
-  line-height: 1.6;
-  margin-top: 12px;
-  width: auto !important;
-  max-width: 240px;
-  background-color: rgba(255, 255, 255, 0.7);
-  padding: 12px 16px;
-  border-radius: 8px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
-  transition: all 0.3s ease;
-}
-
-/* 当前步骤样式 */
-.el-step__title.is-process {
-  color: #165dff;
-  font-weight: 700;
-  font-size: 19px;
-  text-shadow: 0 2px 4px rgba(22, 93, 255, 0.1);
-}
-
-.el-step__icon.is-process {
-  background: linear-gradient(135deg, #165dff, #409eff);
-  border: 3px solid rgba(255, 255, 255, 0.9);
-  box-shadow: 0 0 16px rgba(22, 93, 255, 0.4), 0 4px 12px rgba(22, 93, 255, 0.2);
-  animation: pulse 2s infinite, float 6s ease-in-out infinite;
-  transform: scale(1.05);
-}
-
-.el-step__icon.is-process .el-icon {
-  color: #fff;
-  font-size: 20px;
-}
-
-/* 已完成步骤样式 */
-.el-step__title.is-finish {
-  color: #303133;
-  font-weight: 600;
-}
-
-.el-step__icon.is-finish {
-  background: linear-gradient(135deg, #52c41a, #73d13d);
-  border: 3px solid rgba(255, 255, 255, 0.9);
-  box-shadow: 0 0 12px rgba(82, 196, 26, 0.3);
-  transition: all 0.3s ease;
-}
-
-.el-step__icon.is-finish:hover {
-  transform: scale(1.1);
-  box-shadow: 0 0 20px rgba(82, 196, 26, 0.4);
-}
-
-.el-step__icon.is-finish .el-icon {
-  color: #fff;
-  font-size: 20px;
-}
-
-/* 待处理步骤样式 */
-.el-step__icon.is-wait {
-  background-color: #f0f2f5;
-  border: 3px solid rgba(255, 255, 255, 0.9);
-  transition: all 0.3s ease;
-}
-
-.el-step__icon.is-wait:hover {
-  background-color: #e6f7ff;
-  box-shadow: 0 0 12px rgba(22, 93, 255, 0.1);
-}
-
-.el-step__icon.is-wait .el-icon {
-  color: #909399;
-  font-size: 18px;
-}
-
-/* 连接线样式 */
-.el-step__line {
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.el-step__line-inner {
-  height: 8px;
-  border-radius: 4px;
-  transition: all 0.3s ease;
-  position: relative;
-  overflow: hidden;
-}
-
-/* 为连接线添加渐变效果 */
-.el-step__line.is-finish .el-step__line-inner {
-  background: linear-gradient(90deg, #52c41a, #73d13d);
-  box-shadow: 0 2px 8px rgba(82, 196, 26, 0.2);
-}
-
-.el-step__line.is-process .el-step__line-inner {
-  background: linear-gradient(90deg, #165dff, #409eff);
-  box-shadow: 0 2px 8px rgba(22, 93, 255, 0.2);
-}
-
-.el-step__line.is-process .el-step__line-inner::after {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 40%;
-  height: 100%;
-  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.5), transparent);
-  animation: shimmer 2s infinite;
-}
-
-.el-step__line.is-wait .el-step__line-inner {
-  background-color: #e4e7ed;
-  border: 1px solid #f0f2f5;
-}
-
-/* 图标尺寸 */
-.el-step__icon {
-  width: 48px;
-  height: 48px;
-  line-height: 42px;
-  font-size: 20px;
-  border-radius: 50%;
-  transition: all 0.3s ease;
-}
-
-/* 横向步骤条样式调整 */
-.el-steps--horizontal {
-  align-items: center;
-}
-
-.el-steps--horizontal .el-step {
-  padding-bottom: 0;
-  min-height: 160px;
-}
-
-/* 悬浮效果 */
-.el-step:hover .el-step__title {
-  color: #165dff;
-  transform: translateY(-2px);
-}
-
-.el-step:hover .el-step__description {
+.stat-card:hover {
   transform: translateY(-2px);
   box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
 }
 
-/* 新增浮动动画 */
-@keyframes float {
-  0%,
-  100% {
-    transform: translateY(0) scale(1.05);
-  }
-  50% {
-    transform: translateY(-6px) scale(1.05);
-  }
+.stat-value {
+  font-size: 28px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 8px;
+  line-height: 1.2;
 }
 
-/* 新增闪光动画 */
-@keyframes shimmer {
-  0% {
-    transform: translateX(-100%);
-  }
-  100% {
-    transform: translateX(250%);
-  }
-}
-
-.ant-steps-large .ant-steps-item-title {
-  font-size: 16px;
-}
-
-.ant-steps-large .ant-steps-item-description {
+.stat-label {
   font-size: 14px;
+  color: #86909c;
+  margin-bottom: 8px;
 }
 
-/* 表格样式优化 */
+.stat-trend {
+  font-size: 12px;
+  color: #86909c;
+}
+
+.trend-up {
+  color: #52c41a;
+}
+
+.trend-down {
+  color: #ff4d4f;
+}
+
+.stat-icon {
+  position: absolute;
+  top: 24px;
+  right: 24px;
+  width: 50px;
+  height: 50px;
+  border-radius: 12px;
+  background-color: #f0f7ff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.3s ease;
+}
+
+.stat-icon:hover {
+  transform: scale(1.05);
+}
+
+/* 统计卡片图片样式 */
+.stat-img {
+  width: 35px;
+  height: 35px;
+  object-fit: contain;
+  transition: all 0.3s ease;
+}
+
+.stat-icon:hover .stat-img {
+  transform: scale(1.1);
+}
+
+/* 表格样式 */
 .table-wrapper {
   background-color: #fff;
   border-radius: 8px;
@@ -841,120 +1941,74 @@ const handleInspectionManagement3 = () => {
   overflow: hidden;
 }
 
-/* 使用Element Plus原生表格样式 */
-.el-table {
+.custom-table {
   border-collapse: collapse;
   width: 100%;
 }
 
-.el-table th {
-  background-color: #f8f9fa;
-  font-weight: 600;
-  color: #495057;
+.custom-table th {
+  background-color: #f5f7fa;
+  font-weight: 500;
+  color: #606266;
   text-align: center;
   padding: 12px 8px;
-  border-bottom: 1px solid #dee2e6;
+  border-bottom: 1px solid #e4e7ed;
 }
 
-.el-table td {
+.custom-table td {
   padding: 12px 8px;
-  border-bottom: 1px solid #dee2e6;
-  color: #333;
+  border-bottom: 1px solid #e4e7ed;
+  color: #303133;
   text-align: center;
-  font-size: 14px;
 }
 
-/* 条纹样式 */
-.el-table--striped .el-table__body tr.el-table__row--striped td {
-  background-color: #fafbfc;
+.custom-table tr:hover {
+  background-color: #f5f7fa;
 }
 
-/* 悬停效果 */
-.el-table__body tr:hover > td {
-  background-color: #f8f9ff !important;
+.custom-table tr.current-row {
+  background-color: #ecf5ff;
 }
 
-/* 当前行效果 */
-.el-table__body tr.current-row > td {
-  background-color: #e6f7ff !important;
-}
-
-/* 状态标签样式 */
-.status-tag {
+.type-tag,
+.priority-tag,
+.status-tag,
+.tracking-tag {
   padding: 4px 10px;
-  border-radius: 4px;
+  border-radius: 6px;
   font-size: 12px;
   font-weight: 500;
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
 }
 
-.result-tag {
-  padding: 4px 10px;
-  border-radius: 4px;
-  font-size: 12px;
-  font-weight: 500;
+/* 跟踪标签样式 */
+.tracking-tag.executing {
+  background-color: #e6f7ff;
+  color: #1890ff;
+  border: 1px solid #91d5ff;
 }
 
-/* 完成度样式优化 */
-.completion-bar {
-  width: 100%;
-  height: 8px;
-  background-color: #f0f2f5;
-  border-radius: 4px;
-  overflow: hidden;
-  position: relative;
-}
-
-.completion-progress {
-  height: 100%;
-  border-radius: 4px;
-  transition: width 0.3s ease;
-}
-
-.completion-progress.completed {
-  background-color: #52c41a;
-}
-
-.completion-progress.in-progress {
-  background-color: #fa8c16;
-}
-
-.completion-progress.not-started {
-  background-color: #e4e7ed;
-}
-
-/* 操作按钮样式优化 */
+/* 操作按钮样式 */
 .action-btn {
-  color: #333;
-  font-size: 13px;
-  padding: 4px 10px;
-  margin: 0 3px;
-  transition: all 0.2s ease;
+  color: #165dff;
+  font-size: 12px;
+  padding: 4px 8px;
+  margin: 0 2px;
 }
 
 .action-btn:hover {
-  background-color: #f8f9ff;
+  color: #0e42d2;
+  background-color: #e8f3ff;
 }
 
-.detail-btn {
-  color: #165dff !important;
+.cancel-btn {
+  color: #f56c6c;
 }
 
-.detail-btn:hover {
-  color: #094ab2 !important;
-  background-color: #e6f7ff !important;
-}
-
-.report-btn {
-  color: #333;
-}
-
-/* 新增整改项按钮红色样式 */
-.rectify-btn {
-  color: #ff4d4f;
-}
-
-.rectify-btn:hover {
-  color: #cf1322;
+.cancel-btn:hover {
+  color: #e64340;
   background-color: #fff2f0;
 }
 
@@ -1033,6 +2087,484 @@ const handleInspectionManagement3 = () => {
   user-select: none;
 }
 
+/* 弹窗样式 */
+.create-dialog {
+  border-radius: 12px;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.15);
+  overflow: hidden;
+}
+
+.create-dialog .el-dialog__header {
+  padding: 20px 24px;
+  border-bottom: 1px solid #f0f0f0;
+  background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+}
+
+.create-dialog .el-dialog__title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  letter-spacing: 0.5px;
+}
+
+.create-dialog .el-dialog__body {
+  padding: 24px;
+  background-color: #ffffff;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+.custom-form .el-form-item {
+  margin-bottom: 20px;
+}
+
+.custom-form .el-form-item__label {
+  font-size: 14px;
+  color: #303133;
+  font-weight: 500;
+  padding: 10px 0;
+}
+
+/* 表单元素美化 */
+.custom-form .el-input__inner,
+.custom-form .el-select .el-input__inner,
+.custom-form .el-date-picker .el-input__inner {
+  border-radius: 6px;
+  border-color: #dcdfe6;
+  transition: all 0.3s ease;
+  height: 40px;
+  padding: 0 15px;
+  font-size: 14px;
+  background-color: #fff;
+}
+
+.custom-form .el-input__inner:hover,
+.custom-form .el-select .el-input__inner:hover,
+.custom-form .el-date-picker .el-input__inner:hover {
+  border-color: #c0c4cc;
+}
+
+.custom-form .el-input__inner:focus,
+.custom-form .el-select .el-input__inner:focus,
+.custom-form .el-date-picker .el-input__inner:focus {
+  border-color: #165dff;
+  box-shadow: 0 0 0 2px rgba(22, 93, 255, 0.1);
+}
+
+/* 文本域美化 */
+.custom-form .el-textarea__inner {
+  border-radius: 6px;
+  border-color: #dcdfe6;
+  transition: all 0.3s ease;
+  padding: 10px 15px;
+  font-size: 14px;
+  resize: vertical;
+  min-height: 100px;
+}
+
+.custom-form .el-textarea__inner:hover {
+  border-color: #c0c4cc;
+}
+
+.custom-form .el-textarea__inner:focus {
+  border-color: #165dff;
+  box-shadow: 0 0 0 2px rgba(22, 93, 255, 0.1);
+}
+
+/* 单选按钮美化 */
+.custom-form .el-radio-group {
+  display: flex;
+  gap: 20px;
+  padding: 5px 0;
+}
+
+.custom-form .el-radio {
+  font-size: 14px;
+  color: #303133;
+}
+
+.custom-form .el-radio__label {
+  padding-left: 8px;
+}
+
+/* 弹窗按钮美化 */
+.create-dialog .dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  padding: 16px 24px;
+  background-color: #fafafa;
+  border-top: 1px solid #f0f0f0;
+}
+
+.create-dialog .dialog-footer .el-button {
+  padding: 10px 24px;
+  border-radius: 6px;
+  font-size: 14px;
+  font-weight: 500;
+  transition: all 0.3s ease;
+  height: 40px;
+}
+
+.create-dialog .dialog-footer .el-button:first-child {
+  background-color: #f5f7fa;
+  color: #606266;
+  border-color: #f5f7fa;
+}
+
+.create-dialog .dialog-footer .el-button:first-child:hover {
+  background-color: #e6e8eb;
+  color: #303133;
+  border-color: #e6e8eb;
+}
+
+.create-dialog .dialog-footer .el-button:nth-child(2) {
+  background-color: #f5f7fa;
+  color: #606266;
+  border-color: #dcdfe6;
+}
+
+.create-dialog .dialog-footer .el-button:nth-child(2):hover {
+  background-color: #e6e8eb;
+  color: #303133;
+  border-color: #c0c4cc;
+}
+
+.create-dialog .dialog-footer .el-button:last-child {
+  background-color: #165dff;
+  border-color: #165dff;
+  color: #fff;
+}
+
+.create-dialog .dialog-footer .el-button:last-child:hover {
+  background-color: #0e42d2;
+  border-color: #0e42d2;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.3);
+}
+
+/* 表单验证反馈 */
+.custom-form .el-form-item.is-error .el-input__inner,
+.custom-form .el-form-item.is-error .el-select .el-input__inner {
+  border-color: #f56c6c;
+}
+
+.custom-form .el-form-item.is-error .el-input__inner:focus,
+.custom-form .el-form-item.is-error .el-select .el-input__inner:focus {
+  border-color: #f56c6c;
+  box-shadow: 0 0 0 2px rgba(245, 108, 108, 0.1);
+}
+
+/* 详情弹窗样式 - 与工单列表页面保持一致 */
+.custom-experiment-dialog .el-dialog__body {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 24px;
+}
+
+.task-detail-container {
+  padding: 10px 0;
+}
+
+/* 详情卡片样式 */
+.detail-card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #f0f2f5;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1d2129;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #409eff;
+}
+
+.card-content {
+  padding: 0 4px;
+}
+
+/* 信息行和信息项样式 */
+.info-row {
+  display: flex;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.info-item {
+  flex: 0 0 50%;
+  margin-bottom: 12px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.info-item.full-width {
+  flex: 0 0 100%;
+}
+
+.info-label {
+  font-weight: 500;
+  color: #86909c;
+  margin-right: 8px;
+  min-width: 80px;
+  flex-shrink: 0;
+}
+
+.info-value {
+  color: #4e5969;
+  flex: 1;
+  word-break: break-all;
+  font-size: 14px;
+}
+
+/* 骨架屏样式 */
+.skeleton-loading {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.skeleton-card {
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.skeleton-header {
+  height: 20px;
+  width: 30%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+  margin-bottom: 12px;
+}
+
+.skeleton-content {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-row {
+  height: 16px;
+  width: 100%;
+  background-color: #e0e0e0;
+  border-radius: 4px;
+}
+
+/* 优先级标签样式 */
+.task-status {
+  padding: 4px 10px;
+  border-radius: 6px;
+  font-size: 12px;
+  font-weight: 500;
+  border: 1px solid transparent;
+}
+
+.priority-high {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border-color: #ffccc7;
+}
+
+.priority-medium {
+  background-color: #fffbe6;
+  color: #fa8c16;
+  border-color: #ffe58f;
+}
+
+.priority-low {
+  background-color: #e6f7ff;
+  color: #1890ff;
+  border-color: #91d5ff;
+}
+
+.description-content,
+.result-content {
+  padding: 12px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  line-height: 1.6;
+  color: #4e5969;
+  font-size: 13px;
+}
+
+.steps-container {
+  padding: 16px;
+  background-color: #fafafa;
+  border-radius: 4px;
+}
+
+.module-group {
+  margin-bottom: 24px;
+}
+
+.module-title {
+  font-size: 14px;
+  font-weight: bold;
+  margin-bottom: 12px;
+  color: #333;
+}
+
+/* 多图片展示容器样式 */
+.images-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-top: 12px;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 8px;
+}
+
+/* 单个图片项样式 */
+.image-item {
+  flex: 0 0 auto;
+  width: 200px; /* 固定宽度 */
+  height: 160px; /* 固定高度 */
+  border-radius: 6px;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: transform 0.3s ease;
+}
+
+.image-item:hover {
+  transform: scale(1.03);
+}
+
+/* 图片样式 */
+.detail-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持比例填充容器 */
+  display: block;
+}
+
+/* 图片加载失败样式 */
+.detail-image[src=''] {
+  background-color: #f0f0f0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #999;
+  font-size: 12px;
+}
+/* 重点跟踪区域样式 */
+.tracking-section {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-bottom: 24px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+  padding-bottom: 20px;
+}
+
+/* 进度时间线容器 - 铺满居中显示 */
+.progress-timeline-container {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  min-height: 300px;
+  padding: 20px;
+}
+
+/* 进度时间线 */
+.progress-timeline {
+  width: 100%;
+  margin: 0 auto;
+}
+
+/* 步骤条分页样式 */
+.steps-pagination {
+  display: flex;
+  justify-content: right;
+  margin-top: 20px;
+  padding: 0 20px;
+}
+
+.steps-pagination .el-pagination {
+  display: flex;
+  justify-content: center;
+}
+
+/* 步骤条居中优化 */
+.custom-steps {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}
+
+/* 优化步骤条布局 */
+.el-steps--horizontal {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+
+/* 步骤内容居中显示 */
+.el-step {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  min-width: 250px;
+  flex: 1;
+}
+
+.tracking-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 24px;
+  border-bottom: 1px solid #f0f0f0;
+  background-color: #f5f7fa;
+}
+
+.tracking-header h3 {
+  font-size: 16px;
+  font-weight: 500;
+  color: #303133;
+  margin: 0;
+}
+
+.tracking-tag {
+  margin-left: 12px;
+  background-color: #e6f7ff;
+  color: #1890ff;
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+}
+
+.tracking-card {
+  padding: 24px;
+}
+
+.tracking-title {
+  margin-bottom: 24px;
+  padding-bottom: 16px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.task-type {
+  display: inline-block;
+  font-weight: 500;
+  color: #303133;
+  margin-right: 24px;
+}
+
+.work-order-no,
+.time-range {
+  display: inline-block;
+  color: #606266;
+  margin-right: 24px;
+  font-size: 14px;
+}
+
 /* 动画效果 */
 @keyframes pulse {
   0% {
@@ -1046,9 +2578,356 @@ const handleInspectionManagement3 = () => {
   }
 }
 
+.custom-steps {
+  padding: 20px 10px;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  position: relative;
+  background: #fff;
+}
+
+/* 步骤标题样式 - 简洁大气 */
+.el-step__title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+  transition: all 0.3s ease;
+  padding: 0 5px;
+}
+
+/* 步骤描述样式 - 简化布局 */
+.el-step__description {
+  font-size: 13px;
+  color: #606266;
+  line-height: 1.5;
+  margin-top: 8px;
+  width: auto !important;
+  max-width: 220px;
+  padding: 6px 0;
+}
+
+/* 当前步骤样式 - 突出重点 */
+.el-step__title.is-process {
+  color: #165dff;
+  font-weight: 700;
+}
+
+.el-step__icon.is-process {
+  background: #165dff;
+  border: 2px solid #e6f7ff;
+  box-shadow: 0 0 0 4px rgba(22, 93, 255, 0.1);
+  transition: all 0.3s ease;
+}
+
+.el-step__icon.is-process .el-icon {
+  color: #fff;
+  font-size: 16px;
+}
+
+/* 已完成步骤样式 - 简洁明了 */
+.el-step__title.is-finish {
+  color: #303133;
+  font-weight: 500;
+}
+
+.el-step__icon.is-finish {
+  background: #52c41a;
+  border: 2px solid #f6ffed;
+  box-shadow: 0 0 0 4px rgba(82, 196, 26, 0.1);
+  transition: all 0.3s ease;
+}
+
+.el-step__icon.is-finish .el-icon {
+  color: #fff;
+  font-size: 16px;
+}
+
+/* 待处理步骤样式 - 简约风格 */
+.el-step__icon.is-wait {
+  background-color: #f5f7fa;
+  border: 2px solid #e4e7ed;
+  transition: all 0.3s ease;
+}
+
+.el-step__icon.is-wait:hover {
+  background-color: #e6f7ff;
+}
+
+.el-step__icon.is-wait .el-icon {
+  color: #909399;
+  font-size: 16px;
+}
+
+/* 连接线样式 - 简化设计 */
+.el-step__line {
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.el-step__line-inner {
+  height: 4px;
+  border-radius: 2px;
+  transition: all 0.3s ease;
+  position: relative;
+}
+
+/* 连接线状态颜色 */
+.el-step__line.is-finish .el-step__line-inner {
+  background: #52c41a;
+}
+
+.el-step__line.is-process .el-step__line-inner {
+  background: #165dff;
+}
+
+.el-step__line.is-wait .el-step__line-inner {
+  background-color: #e4e7ed;
+}
+
+/* 图标样式标准化 */
+.el-step__icon {
+  width: 36px;
+  height: 36px;
+  line-height: 32px;
+  font-size: 16px;
+  border-radius: 50%;
+  transition: all 0.3s ease;
+}
+
+/* 成功状态的图标 */
+.el-step__icon.is-success {
+  background-color: #67c23a;
+  color: white;
+  box-shadow: 0 0 0 4px rgba(103, 194, 58, 0.1);
+}
+
+/* 进行中状态的图标 */
+.el-step__icon.is-process {
+  background-color: #409eff;
+  color: white;
+  box-shadow: 0 0 0 4px rgba(64, 158, 255, 0.1);
+}
+
+/* 等待状态的图标 */
+.el-step__icon.is-wait {
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  color: #c0c4cc;
+}
+
+/* 横向步骤条样式优化 */
+.el-steps--horizontal {
+  align-items: center;
+  width: 100%;
+  overflow: hidden;
+}
+
+.el-steps--horizontal .el-step {
+  padding-bottom: 0;
+  min-height: 140px;
+  flex: 1;
+  max-width: 280px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+}
+
+/* 等待状态标题 */
+.el-step__title.is-wait {
+  color: #c0c4cc;
+}
+
+/* 描述样式增强 */
+.custom-steps .el-step__description,
+.custom-steps .step-description {
+  white-space: normal;
+  font-size: 14px;
+  color: #606266;
+  line-height: 1.6;
+  padding: 12px 16px;
+  background-color: #fafafa;
+  border-radius: 8px;
+  border-left: 4px solid transparent;
+  min-height: 60px;
+  transition: all 0.3s ease;
+  width: 300px;
+  max-width: 300px;
+  margin: 0 auto;
+}
+
+/* 成功状态描述 */
+.el-step__description.is-success,
+.step-description.is-success {
+  border-left-color: #67c23a;
+  background-color: #f0f9eb;
+}
+
+/* 进行中状态描述 */
+.el-step__description.is-process,
+.step-description.is-process {
+  border-left-color: #409eff;
+  background-color: #ecf5ff;
+  box-shadow: 0 4px 12px rgba(64, 158, 255, 0.1);
+}
+
+/* 等待状态描述 */
+.el-step__description.is-wait,
+.step-description.is-wait {
+  border-left-color: #e4e7ed;
+}
+
+/* 步骤详情样式 */
+.step-person-time {
+  font-size: 13px;
+  color: #909399;
+  margin-bottom: 8px;
+  font-weight: 500;
+}
+
+.step-content {
+  font-size: 14px;
+  color: #606266;
+  line-height: 1.5;
+  margin-bottom: 6px;
+}
+
+.step-remark {
+  font-size: 12px;
+  color: #909399;
+  padding: 6px 10px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  margin-top: 6px;
+  border-left: 3px solid #dcdfe6;
+}
+
+/* 悬浮效果增强 */
+.el-step:hover {
+  transform: translateY(-3px);
+}
+
+.el-step:hover .el-step__title {
+  color: #409eff;
+  transform: translateY(-2px);
+}
+
+.el-step:hover .el-step__description {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+}
+
+.el-step:hover .el-step__icon.is-process {
+  transform: scale(1.1);
+}
+
+/* 动画效果增强 */
+@keyframes float {
+  0%,
+  100% {
+    transform: translateY(0) scale(1.05);
+  }
+  50% {
+    transform: translateY(-6px) scale(1.05);
+  }
+}
+
+@keyframes shimmer {
+  0% {
+    transform: translateX(-100%);
+  }
+  100% {
+    transform: translateX(250%);
+  }
+}
+
+@keyframes pulse {
+  0% {
+    box-shadow: 0 0 0 0 rgba(64, 158, 255, 0.4);
+  }
+  70% {
+    box-shadow: 0 0 0 10px rgba(64, 158, 255, 0);
+  }
+  100% {
+    box-shadow: 0 0 0 0 rgba(64, 158, 255, 0);
+  }
+}
+
+@keyframes successPulse {
+  0% {
+    transform: scale(0.8);
+    opacity: 0;
+  }
+  50% {
+    transform: scale(1.1);
+  }
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+/* 步骤条容器样式 */
+.progress-timeline {
+  position: relative;
+  padding: 24px 0;
+  background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
+  border-radius: 12px;
+  margin-top: 16px;
+}
+
+/* 自定义步骤条样式增强 */
+.custom-steps {
+  --el-steps-process-text-color: #409eff;
+  --el-steps-process-border-color: #409eff;
+  --el-steps-process-bg-color: #409eff;
+  --el-steps-success-text-color: #67c23a;
+  --el-steps-success-border-color: #67c23a;
+  --el-steps-success-bg-color: #67c23a;
+  --el-steps-wait-text-color: #c0c4cc;
+  --el-steps-wait-border-color: #c0c4cc;
+  --el-steps-wait-bg-color: #c0c4cc;
+}
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 60px 0;
+  color: #999;
+}
+
+/* 派单弹窗样式 */
+.assign-dialog-content {
+  padding: 10px 0;
+}
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+.form-label {
+  display: block;
+  margin-bottom: 8px;
+  font-weight: 500;
+  color: #606266;
+}
+
 /* 响应式设计 */
 @media (max-width: 1200px) {
-  .filter-row {
+  .filter-container {
     flex-direction: column;
     align-items: stretch;
   }
@@ -1056,17 +2935,16 @@ const handleInspectionManagement3 = () => {
   .filter-actions {
     margin-left: 0;
     justify-content: flex-end;
-    margin-top: 10px;
   }
 
-  .filter-options .el-select,
-  .filter-options .el-date-picker {
+  .filter-bar .el-select,
+  .filter-bar .el-date-picker {
     width: 100%;
   }
 }
 
 @media (max-width: 768px) {
-  .execution-records {
+  .dispatch-records {
     padding: 10px;
   }
 
@@ -1080,28 +2958,650 @@ const handleInspectionManagement3 = () => {
     font-size: 12px;
   }
 
-  .tracking-title {
-    display: flex;
-    flex-direction: column;
-  }
-
-  .task-type,
-  .work-order-no,
-  .time-range {
-    margin-right: 0;
-    margin-bottom: 8px;
-  }
-
   .pagination-section {
     flex-direction: column;
     align-items: flex-start;
     gap: 10px;
   }
+
+  .detail-item {
+    flex: 0 0 100%;
+    padding-right: 0;
+  }
+}
+.custom-steps {
+  background: linear-gradient(135deg, #f8faff, #f0f7ff);
+  padding: 40px 20px;
+  border-radius: 16px;
+  box-shadow: 0 8px 30px rgba(0, 0, 0, 0.06);
+  position: relative;
+  overflow: hidden;
+}
+.custom-steps::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 4px;
+  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
+  z-index: 0;
+  border-radius: 4px 4px 0 0;
 }
 
-/* 旋转动画 */
-.rotate-180 {
-  transform: rotate(180deg);
-  transition: transform 0.3s ease;
+/* 重点跟踪区域样式 */
+.tracking-section {
+  background: linear-gradient(135deg, #ffffff 0%, #f8faff 100%);
+  border-radius: 20px;
+  margin-bottom: 30px;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+  transition: transform 0.3s ease, box-shadow 0.3s ease;
+  position: relative;
+  border: 1px solid #f0f5ff;
+}
+
+.tracking-section::before {
+  content: '';
+  position: absolute;
+  top: -50%;
+  right: -50%;
+  width: 300px;
+  height: 300px;
+  background: radial-gradient(circle, rgba(22, 93, 255, 0.03) 0%, rgba(22, 93, 255, 0) 70%);
+  border-radius: 50%;
+}
+
+.tracking-section:hover {
+  transform: translateY(-5px);
+  box-shadow: 0 15px 35px rgba(0, 0, 0, 0.1);
+  border-color: #e6f0ff;
+}
+
+/* 跟踪头部样式 */
+.tracking-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24px 32px;
+  border-bottom: 1px solid #f0f2f5;
+  background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+  position: relative;
+  overflow: hidden;
+}
+
+/* 头部装饰效果 */
+.tracking-header::before {
+  content: '';
+  position: absolute;
+  top: -100px;
+  right: -100px;
+  width: 400px;
+  height: 400px;
+  background: radial-gradient(circle, rgba(22, 93, 255, 0.08) 0%, rgba(22, 93, 255, 0) 70%);
+  border-radius: 50%;
+}
+
+.tracking-header::after {
+  content: '';
+  position: absolute;
+  bottom: -50px;
+  left: -50px;
+  width: 200px;
+  height: 200px;
+  background: radial-gradient(circle, rgba(22, 93, 255, 0.03) 0%, rgba(22, 93, 255, 0) 70%);
+  border-radius: 50%;
+}
+
+.tracking-header h3 {
+  font-size: 20px;
+  font-weight: 700;
+  color: #1d2129;
+  margin: 0;
+  display: flex;
+  align-items: center;
+  position: relative;
+  z-index: 1;
+  letter-spacing: -0.2px;
+}
+
+/* 标题图标装饰 */
+.tracking-header h3::before {
+  content: '📊';
+  margin-right: 12px;
+  font-size: 24px;
+}
+
+.tracking-tag {
+  margin-left: 12px;
+  background-color: #e6f7ff;
+  color: #1890ff;
+  padding: 4px 12px;
+  border-radius: 16px;
+  font-size: 12px;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  position: relative;
+  overflow: hidden;
+}
+
+.tracking-tag::before {
+  content: '';
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background-color: #1890ff;
+  animation: pulse 2s infinite;
+}
+
+@keyframes pulse {
+  0% {
+    box-shadow: 0 0 0 0 rgba(24, 144, 255, 0.4);
+    opacity: 1;
+  }
+  70% {
+    box-shadow: 0 0 0 10px rgba(24, 144, 255, 0);
+    opacity: 0;
+  }
+  100% {
+    box-shadow: 0 0 0 0 rgba(24, 144, 255, 0);
+    opacity: 0;
+  }
+}
+
+/* 跟踪内容卡片 */
+.tracking-card {
+  padding: 32px;
+  position: relative;
+  background: linear-gradient(135deg, #ffffff 0%, #fcfdff 100%);
+}
+
+/* 工单标题信息 */
+.tracking-title {
+  margin-bottom: 32px;
+  padding-bottom: 18px;
+  border-bottom: 2px solid #f0f2f5;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 24px;
+  position: relative;
+}
+
+.tracking-title::after {
+  content: '';
+  position: absolute;
+  bottom: -2px;
+  left: 0;
+  width: 80px;
+  height: 2px;
+  background: linear-gradient(90deg, #165dff, #69c0ff);
+  box-shadow: 0 0 10px rgba(22, 93, 255, 0.2);
+}
+
+.task-type {
+  font-size: 18px;
+  font-weight: 600;
+  color: #1d2129;
+  padding-right: 16px;
+  border-right: 1px solid #e5e6eb;
+}
+
+.work-order-no,
+.time-range {
+  color: #606266;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.work-order-no::before,
+.time-range::before {
+  content: '';
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: #c9cdd4;
+}
+
+/* 进度时间线容器 */
+.progress-timeline-container {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  padding: 10px 0 30px;
+}
+
+.progress-timeline {
+  width: 100%;
+  max-width: 1400px;
+}
+
+/* 自定义步骤条样式 */
+.custom-steps {
+  --el-steps-process-text-color: #165dff;
+  --el-steps-process-border-color: #165dff;
+  --el-steps-process-bg-color: #165dff;
+  --el-steps-success-text-color: #52c41a;
+  --el-steps-success-border-color: #52c41a;
+  --el-steps-success-bg-color: #52c41a;
+  --el-steps-wait-text-color: #86909c;
+  --el-steps-wait-border-color: #dcdfe6;
+  --el-steps-wait-bg-color: #f2f3f5;
+
+  background: linear-gradient(135deg, #f8faff 0%, #f0f7ff 100%);
+  padding: 50px 30px 80px;
+  border-radius: 24px;
+  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.08);
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  position: relative;
+  overflow: hidden;
+  border: 1px solid #e6f0ff;
+}
+
+/* 顶部装饰条 */
+.custom-steps::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 6px;
+  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
+  border-radius: 6px 6px 0 0;
+  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
+}
+
+/* 背景装饰 */
+.custom-steps::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 400px;
+  height: 400px;
+  background: radial-gradient(circle, rgba(22, 93, 255, 0.05) 0%, rgba(22, 93, 255, 0) 70%);
+  border-radius: 50%;
+}
+
+/* 左侧装饰 */
+.custom-steps::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 6px;
+  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
+  border-radius: 6px 6px 0 0;
+  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
+}
+
+/* 右侧装饰 */
+.custom-steps::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 6px;
+  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
+  border-radius: 6px 6px 0 0;
+  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
+}
+
+/* 左侧装饰球 */
+.custom-steps::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 6px;
+  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
+  border-radius: 6px 6px 0 0;
+  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
+}
+
+/* 右侧装饰球 */
+.custom-steps::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 6px;
+  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
+  border-radius: 6px 6px 0 0;
+  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
+}
+
+/* 单个步骤样式 */
+.custom-step {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  min-width: 220px;
+  max-width: 280px;
+  flex: 1;
+  padding: 0 20px;
+  transition: transform 0.3s ease, filter 0.3s ease, box-shadow 0.3s ease;
+  position: relative;
+}
+
+.custom-step:hover {
+  transform: translateY(-8px);
+  filter: brightness(1.03);
+}
+
+/* 步骤连接线 */
+.custom-step:not(:last-child)::after {
+  content: '';
+  position: absolute;
+  top: 32px;
+  right: -20px;
+  width: 40px;
+  height: 3px;
+  background: linear-gradient(90deg, #165dff 0%, #69c0ff 100%);
+  z-index: 1;
+  box-shadow: 0 2px 8px rgba(22, 93, 255, 0.3);
+}
+
+/* 待处理步骤连接线 */
+.custom-step.is-wait:not(:last-child)::after {
+  background: linear-gradient(90deg, #dcdfe6 0%, #e4e7ed 100%);
+  box-shadow: none;
+}
+
+/* 步骤节点容器 */
+.el-step__head {
+  position: relative;
+  z-index: 2;
+  transition: transform 0.3s ease, box-shadow 0.3s ease;
+}
+
+.custom-step:hover .el-step__head {
+  transform: scale(1.1);
+}
+
+/* 当前步骤节点增强 */
+.el-step__head.is-process {
+  box-shadow: 0 0 20px rgba(22, 93, 255, 0.3);
+  animation: glowProcess 2s ease-in-out infinite alternate;
+}
+
+@keyframes glowProcess {
+  from {
+    box-shadow: 0 0 20px rgba(22, 93, 255, 0.3);
+  }
+  to {
+    box-shadow: 0 0 30px rgba(22, 93, 255, 0.5);
+  }
+}
+
+/* 已完成步骤节点增强 */
+.el-step__head.is-finish {
+  box-shadow: 0 0 15px rgba(82, 196, 26, 0.25);
+}
+
+/* 步骤标题样式 */
+.el-step__title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 20px;
+  padding: 0 10px;
+  transition: all 0.3s ease;
+  position: relative;
+  letter-spacing: -0.2px;
+}
+
+/* 步骤标题装饰 */
+.el-step__title::after {
+  content: '';
+  position: absolute;
+  bottom: -6px;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 0;
+  height: 3px;
+  background: linear-gradient(90deg, #165dff, #69c0ff);
+  border-radius: 2px;
+  transition: width 0.3s ease;
+}
+
+.custom-step:hover .el-step__title::after {
+  width: 70%;
+}
+
+/* 当前步骤标题 */
+.el-step__title.is-process {
+  color: #165dff;
+  font-weight: 700;
+  text-shadow: 0 2px 8px rgba(22, 93, 255, 0.15);
+}
+
+.el-step__title.is-process::after {
+  width: 60%;
+}
+
+/* 已完成步骤标题 */
+.el-step__title.is-finish {
+  color: #52c41a;
+  font-weight: 600;
+}
+
+.el-step__title.is-finish::after {
+  background: linear-gradient(90deg, #52c41a, #95de64);
+  width: 40%;
+}
+
+/* 待处理步骤标题 */
+.el-step__title.is-wait {
+  color: #86909c;
+  font-weight: 500;
+}
+
+.el-step__title.is-wait::after {
+  background: linear-gradient(90deg, #dcdfe6, #e4e7ed);
+  width: 0%;
+}
+
+/* 步骤描述容器 */
+.step-description {
+  white-space: normal;
+  font-size: 14px;
+  color: #606266;
+  line-height: 1.65;
+  padding: 24px 28px;
+  background-color: #ffffff;
+  border-radius: 16px;
+  min-height: 130px;
+  width: 100%;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.05);
+  transition: all 0.3s ease, transform 0.3s ease;
+  position: relative;
+  overflow: hidden;
+  border: 1px solid transparent;
+}
+
+.step-description:hover {
+  transform: translateY(-5px);
+  box-shadow: 0 12px 32px rgba(0, 0, 0, 0.08);
+}
+
+/* 步骤描述装饰 */
+.step-description::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 6px;
+  height: 100%;
+  border-radius: 6px 0 0 6px;
+}
+
+/* 进度条装饰 */
+.step-description::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 4px;
+  background: linear-gradient(90deg, rgba(0, 0, 0, 0.03) 0%, rgba(0, 0, 0, 0) 100%);
+}
+
+/* 卡片背景装饰 */
+.step-description::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 6px;
+  height: 100%;
+  border-radius: 6px 0 0 6px;
+}
+
+/* 右上角装饰 */
+.step-description::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 80px;
+  height: 80px;
+  background: radial-gradient(circle, rgba(255, 255, 255, 0.8) 0%, rgba(255, 255, 255, 0) 70%);
+  border-radius: 50%;
+  transform: translate(30%, -30%);
+  z-index: 0;
+}
+
+/* 进行中步骤描述 */
+.step-description.is-process {
+  border: 1px solid #e6f7ff;
+  background: linear-gradient(135deg, #ffffff 0%, #f0f7ff 100%);
+  box-shadow: 0 8px 24px rgba(22, 93, 255, 0.08);
+  animation: subtlePulse 4s ease-in-out infinite;
+}
+
+.step-description.is-process::before {
+  background: linear-gradient(180deg, #165dff, #69c0ff);
+}
+
+/* 已完成步骤描述 */
+.step-description.is-finish {
+  border: 1px solid #f0f9eb;
+  background: linear-gradient(135deg, #ffffff 0%, #f6ffed 100%);
+  box-shadow: 0 8px 24px rgba(82, 196, 26, 0.08);
+}
+
+.step-description.is-finish::before {
+  background: linear-gradient(180deg, #52c41a, #95de64);
+}
+
+/* 待处理步骤描述 */
+.step-description.is-wait {
+  border: 1px solid #f2f3f5;
+  background: linear-gradient(135deg, #ffffff 0%, #fafafa 100%);
+}
+
+.step-description.is-wait::before {
+  background: linear-gradient(180deg, #dcdfe6, #e4e7ed);
+}
+
+/* 微妙的脉冲动画 */
+@keyframes subtlePulse {
+  0%,
+  100% {
+    box-shadow: 0 8px 24px rgba(22, 93, 255, 0.08);
+    transform: scale(1);
+  }
+  50% {
+    box-shadow: 0 10px 28px rgba(22, 93, 255, 0.12);
+    transform: scale(1.01);
+  }
+}
+
+/* 步骤详情样式 */
+.step-person-time {
+  font-size: 13px;
+  color: #1d2129;
+  margin-bottom: 12px;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  position: relative;
+  z-index: 1;
+}
+
+.step-person-time::before {
+  content: '👤';
+  font-size: 14px;
+}
+
+.step-content {
+  font-size: 14px;
+  color: #4e5969;
+  line-height: 1.6;
+  margin-bottom: 12px;
+  padding-bottom: 10px;
+  border-bottom: 1px dashed #e5e6eb;
+  position: relative;
+  z-index: 1;
+}
+
+.step-time,
+.step-finish-time {
+  font-size: 13px;
+  color: #86909c;
+  margin-bottom: 6px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  position: relative;
+  z-index: 1;
+}
+
+.step-time::before {
+  content: '📅';
+  font-size: 14px;
+}
+
+.step-finish-time::before {
+  content: '✓';
+  color: #52c41a;
+  font-size: 14px;
+  font-weight: bold;
+}
+
+.step-remark {
+  font-size: 13px;
+  color: #fa541c;
+  margin-top: 10px;
+  padding-top: 10px;
+  border-top: 1px dashed #fff2e8;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  position: relative;
+  z-index: 1;
+  background: linear-gradient(180deg, rgba(250, 84, 28, 0.03) 0%, rgba(250, 84, 28, 0) 100%);
+  padding: 10px 0 0 0;
+  margin: 10px -24px 0 -24px;
+  padding-left: 24px;
+}
+
+.step-remark::before {
+  content: '💬';
+  font-size: 14px;
 }
 </style>