From 9913a7854cb08d626600bf590ac5294351d217e6 Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Wed, 24 Sep 2025 16:37:09 +0800
Subject: [PATCH] 0924

---
 src/api/zhinengxunjian/xunjian/index.ts       |    2 +-
 .../zhinengxunjian/InspectionManagement.vue   |    9 +-
 src/views/zhinengxunjian/banzhuzhuangtai.vue  |    4 -
 src/views/zhinengxunjian/baoxiuguanli.vue     |   10 +-
 src/views/zhinengxunjian/baoxiujilu.vue       |   10 +-
 .../zhinengxunjian/cheliangzhuangtai.vue      |    4 +-
 src/views/zhinengxunjian/gongdanliebiao.vue   |  384 +++-
 src/views/zhinengxunjian/paidanjilu.vue       | 1753 ++++++++++++++---
 src/views/zhinengxunjian/qiangxiuguanli.vue   |    2 +-
 src/views/zhinengxunjian/qiangxiujilu.vue     |   51 +-
 src/views/zhinengxunjian/renyuanzhuangtai.vue |    4 -
 src/views/zhinengxunjian/shiyanguanli.vue     |   88 +-
 src/views/zhinengxunjian/shiyanrenwu.vue      |   35 +-
 src/views/zhinengxunjian/xunjianrenwu.vue     |   17 +-
 src/views/zhinengxunjian/zhixingjilu.vue      |    5 +-
 15 files changed, 1943 insertions(+), 435 deletions(-)

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/views/zhinengxunjian/InspectionManagement.vue b/src/views/zhinengxunjian/InspectionManagement.vue
index aaab44b..adcb6d7 100644
--- a/src/views/zhinengxunjian/InspectionManagement.vue
+++ b/src/views/zhinengxunjian/InspectionManagement.vue
@@ -605,13 +605,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) {
diff --git a/src/views/zhinengxunjian/banzhuzhuangtai.vue b/src/views/zhinengxunjian/banzhuzhuangtai.vue
index c86cef4..84b7d10 100644
--- a/src/views/zhinengxunjian/banzhuzhuangtai.vue
+++ b/src/views/zhinengxunjian/banzhuzhuangtai.vue
@@ -12,9 +12,6 @@
         <div class="nav-tab active" @click="handleInspection7">运维组织</div>
       </div>
 
-      <!-- 页面标题 -->
-      <TitleComponent title="运维组织模块" subtitle="实时监控人员状态、车辆状态和班组状态"></TitleComponent>
-
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -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 08cb703..b103a91 100644
--- a/src/views/zhinengxunjian/baoxiuguanli.vue
+++ b/src/views/zhinengxunjian/baoxiuguanli.vue
@@ -10,8 +10,6 @@
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
       </div>
-      <!-- 页面标题 -->
-      <TitleComponent title="报修管理模块" subtitle="创建报修任务，跟进报修记录，管理维修进度"></TitleComponent>
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -385,7 +383,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
+
 import { baoxiulist, baoxiuDetail, updatebaoxiu, addbaoxiu } from '@/api/zhinengxunjian/baoxiou/index';
 import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
 import { ElMessage, ElLoading } from 'element-plus';
@@ -632,10 +630,10 @@ const getUsersList = async () => {
     const res = await xunjianUserlist();
     // 根据接口返回格式，成功码是200，用户数据在rows数组中
     if (res.code === 200 && res.rows && Array.isArray(res.rows)) {
-      // 映射用户数据，将id转换为字符串以避免大整数精度问题
+      // 映射用户数据，使用userId字段作为唯一标识并转换为字符串以避免大整数精度问题
       usersList.value = res.rows.map((user) => ({
-        id: String(user.id),
-        name: user.userName
+        id: String(user.userId || ''),
+        name: user.userName || '未知用户'
       }));
     } else {
       usersList.value = [];
diff --git a/src/views/zhinengxunjian/baoxiujilu.vue b/src/views/zhinengxunjian/baoxiujilu.vue
index 8ff61e1..f89349c 100644
--- a/src/views/zhinengxunjian/baoxiujilu.vue
+++ b/src/views/zhinengxunjian/baoxiujilu.vue
@@ -12,9 +12,6 @@
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
       </div>
 
-      <!-- 页面标题 -->
-      <TitleComponent title="报修管理模块" subtitle="创建报修任务，跟进报修记录，管理维修进度"></TitleComponent>
-
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -369,7 +366,6 @@
 <script setup>
 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';
@@ -498,10 +494,10 @@ const getUsersList = async () => {
     const res = await xunjianUserlist();
     // 根据接口返回格式，成功码是200，用户数据在rows数组中
     if (res.code === 200 && res.rows && Array.isArray(res.rows)) {
-      // 映射用户数据，将id转换为字符串以避免大整数精度问题
+      // 映射用户数据，使用userId字段作为唯一标识并转换为字符串以避免大整数精度问题
       usersList.value = res.rows.map((user) => ({
-        id: String(user.id),
-        name: user.userName
+        id: String(user.userId || ''),
+        name: user.userName || '未知用户'
       }));
     } else {
       usersList.value = [];
diff --git a/src/views/zhinengxunjian/cheliangzhuangtai.vue b/src/views/zhinengxunjian/cheliangzhuangtai.vue
index d0727bf..b756c67 100644
--- a/src/views/zhinengxunjian/cheliangzhuangtai.vue
+++ b/src/views/zhinengxunjian/cheliangzhuangtai.vue
@@ -12,8 +12,6 @@
         <div class="nav-tab active" @click="handleInspection7">运维组织</div>
       </div>
 
-      <!-- 页面标题 -->
-      <TitleComponent title="运维组织模块" subtitle="实时监控人员状态、车辆状态和班组状态"></TitleComponent>
 
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
@@ -139,7 +137,7 @@
 <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/gongdanliebiao.vue b/src/views/zhinengxunjian/gongdanliebiao.vue
index b53822b..b7ed24c 100644
--- a/src/views/zhinengxunjian/gongdanliebiao.vue
+++ b/src/views/zhinengxunjian/gongdanliebiao.vue
@@ -91,27 +91,37 @@
             <template #default="scope">
               <!-- 已接单状态 -->
               <template v-if="scope.row.status === '已接单'">
-                <el-button type="text" @click="handleViewDetail(scope.row)" class="action-btn">查看详情</el-button>
+                <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="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="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="handleViewDetail(scope.row)" class="action-btn">详情</el-button>
                 <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>
 
               <!-- 默认显示 -->
@@ -172,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>
@@ -189,11 +199,7 @@
             </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>
@@ -201,7 +207,10 @@
             <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.content" placeholder="输入试验步骤" />
+                <el-input v-model="step.content" placeholder="输入试验步骤" style="flex: 1; 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>
@@ -275,7 +284,7 @@
                 </div>
                 <div class="detail-item">
                   <span class="detail-label">创建时间：</span>
-                  <span class="detail-value">{{ detailData.sendOrderTime ? formatDate(detailData.sendOrderTime) : '-' }}</span>
+                  <span class="detail-value">{{ detailData.createTime ? formatDate(detailData.createTime) : '-' }}</span>
                 </div>
               </div>
               <div class="info-row">
@@ -332,9 +341,7 @@
                     v-for="(node, index) in group.items"
                     :key="node.id"
                     :title="node.name"
-                    :description="`目的: ${node.intendedPurpose || '-'}\n预计时间: ${
-                      node.intendedTime ? formatDate(node.intendedTime) : '-'
-                    }\n完成时间: ${node.finishTime ? formatDate(node.finishTime) : '-'}\n备注: ${node.remark || '-'}`"
+                    :description="`目的: ${node.intendedPurpose || '-'}`"
                   />
                 </el-steps>
               </div>
@@ -381,6 +388,25 @@
           </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>
@@ -388,8 +414,9 @@
 <script setup>
 import { ref, computed, reactive } from 'vue';
 import router from '@/router';
-import { gongdanlist, addgongdan, gongdanDetail, uploadgongdan } from '@/api/zhinengxunjian/gongdan/index';
+import { gongdanlist, addgongdan, updategongdan, gongdanDetail, uploadgongdan } from '@/api/zhinengxunjian/gongdan/index';
 import { addjiedian } from '@/api/zhinengxunjian/jiedian';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
 import ImageUpload from '@/components/ImageUpload/index.vue';
 import { ElMessageBox } from 'element-plus';
 
@@ -442,7 +469,7 @@ const fetchWorkOrderList = async () => {
         type: mapCodeToType(item.type),
         priority: mapCodeToPriority(item.level),
         creator: item.sendOrderPersonVo?.userName || '',
-        createTime: item.sendOrderTime ? formatDate(item.sendOrderTime) : '',
+        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 || '',
@@ -530,19 +557,18 @@ const mapCodeToPriority = (code) => {
   return priorityMap[codeStr] || code;
 };
 
-// 日期格式化函数
+// 日期格式化函数 - 支持datetime格式
 const formatDate = (dateString) => {
   if (!dateString) return '';
   const date = new Date(dateString);
-  return date
-    .toLocaleString('zh-CN', {
-      year: 'numeric',
-      month: '2-digit',
-      day: '2-digit',
-      hour: '2-digit',
-      minute: '2-digit'
-    })
-    .replace(/\//g, '-');
+  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}`;
 };
 
 // 初始化加载数据
@@ -692,18 +718,252 @@ const handleCancel = (row) => {
 
 const handleCommunicate = (row) => {
   console.log('沟通:', row);
+  // 这里可以实现沟通功能，例如打开沟通弹窗或跳转到沟通页面
 };
 
 const handleArchive = (row) => {
   console.log('归档:', row);
 };
 
-// 编辑工单
-const handleEdit = (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) => ({
+        content: node.intendedPurpose || ''
+      }));
+      // 确保至少有一个空步骤
+      if (createForm.steps.length === 0) {
+        createForm.steps = [{ content: '' }];
+      }
+    } else {
+      // 如果没有nodes数据，重置为默认的一个空步骤
+      createForm.steps = [{ content: '' }];
+    }
+
+    // 存储当前编辑的工单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);
@@ -750,6 +1010,16 @@ const addStep = () => {
   createForm.steps.push({ content: '' });
 };
 
+// 删除试验步骤
+const deleteStep = (index) => {
+  // 确保至少保留一个步骤
+  if (createForm.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  createForm.steps.splice(index, 1);
+};
+
 // 提交创建工单
 const submitCreate = async () => {
   // 表单验证
@@ -795,23 +1065,17 @@ const submitCreate = async () => {
 
     // 准备工单数据
     const workOrderData = {
-      createTime: new Date().toISOString(),
-
+      // 编辑模式下使用原始创建时间，创建模式下使用当前时间
+      createTime: editingWorkOrderId.value && originalCreateTime.value ? originalCreateTime.value : new Date().toISOString(),
       updateTime: new Date().toISOString(),
       params: {},
-      module: 1, //
-      projectId: 1, // 假设项目ID为1
+      module: 1,
+      projectId: 1,
       title: createForm.title,
       type: mapTypeToCode(createForm.type),
       level: mapPriorityToCode(createForm.priority),
-      // 修复RangeError: 添加日期有效性检查
-      endTime: createForm.deadline
-        ? (() => {
-            const deadlineDate = new Date(createForm.deadline);
-
-            return isNaN(deadlineDate.getTime()) ? new Date().toISOString() : deadlineDate.toISOString();
-          })()
-        : new Date().toISOString(),
+      // 采用与shiyanguanli页面相同的日期处理方式
+      endTime: createForm.deadline ? new Date(createForm.deadline).toISOString() : '',
       info: createForm.description,
       position: createForm.location,
       device: createForm.relatedEquipment || '',
@@ -820,18 +1084,35 @@ const submitCreate = async () => {
       nodeIds: nodeIds,
       results: createForm.resultDescription || '',
       status: 1, // 待派单 1待派单2已派单3执行中4已完成
-      sendOrderTime: new Date().toISOString(),
+      sendOrderTime: '', // 根据用户要求，只有在派单并选择人员后才赋值
       getOrderTime: '',
       finishiOrderTime: '',
       orderResult: '', // 验收结果1通过2需整改
-      point: ''
+      point: '2', // 默认不跟踪（2表示不跟踪，1表示跟踪）
+      createDept: '',
+      createBy: '',
+      handlerDept: '',
+      handler: '',
+      handlerName: ''
     };
 
-    // 然后调用addgongdan接口
-    const gongdanResponse = await addgongdan(workOrderData);
+    let response;
+    // 区分创建和编辑操作
+    if (editingWorkOrderId.value) {
+      // 编辑操作：调用updategongdan接口
+      const updateData = {
+        ...workOrderData,
+        id: editingWorkOrderId.value
+      };
+      response = await updategongdan(updateData);
+    } else {
+      // 创建操作：调用addgongdan接口
+      response = await addgongdan(workOrderData);
+    }
 
-    if (gongdanResponse.code === 200) {
-      ElMessage.success('工单创建成功');
+    if (response.code === 200) {
+      const successMessage = editingWorkOrderId.value ? '工单编辑成功' : '工单创建成功';
+      ElMessage.success(successMessage);
       createDialogVisible.value = false;
 
       // 重置表单
@@ -843,10 +1124,15 @@ const submitCreate = async () => {
         }
       });
 
+      // 重置编辑状态
+      editingWorkOrderId.value = '';
+      originalCreateTime.value = '';
+
       // 刷新工单列表
       fetchWorkOrderList();
     } else {
-      ElMessage.error('工单创建失败');
+      const errorMessage = editingWorkOrderId.value ? '工单编辑失败' : '工单创建失败';
+      ElMessage.error(errorMessage);
     }
   } catch (error) {
     // 增加详细的错误信息日志
diff --git a/src/views/zhinengxunjian/paidanjilu.vue b/src/views/zhinengxunjian/paidanjilu.vue
index a238fdf..2d37f0b 100644
--- a/src/views/zhinengxunjian/paidanjilu.vue
+++ b/src/views/zhinengxunjian/paidanjilu.vue
@@ -12,9 +12,6 @@
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
       </div>
 
-      <!-- 页面标题 -->
-      <TitleComponent title="工单管理模块" subtitle="发起工单任务，跟踪流程记录和执行情况"></TitleComponent>
-
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -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" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
-            <el-button type="primary" icon="Export" class="create-btn" @click="handleExport">导出记录</el-button>
+            <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch">搜索</el-button>
           </div>
         </div>
       </div>
@@ -58,7 +63,7 @@
       <div class="statistics-cards">
         <div class="stat-card">
           <div class="stat-value">{{ totalDispatches }}</div>
-          <div class="stat-label">本月派单总数</div>
+          <div class="stat-label">本月工单总数</div>
           <div class="stat-trend">
             较上月
             <span :class="dispatchGrowthRate.includes('-') ? 'trend-down' : 'trend-up'">
@@ -66,7 +71,7 @@
             </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">
@@ -84,10 +89,10 @@
         </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">
@@ -100,54 +105,81 @@
             </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>
@@ -172,22 +204,281 @@
           </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.content" placeholder="输入试验步骤" style="flex: 1; 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="900px" class="beautiful-dialog" center>
+        <div v-if="isDetailLoading" class="loading-state">
+          <i class="el-icon-loading el-icon--loading"></i>
+          <span>加载中...</span>
+        </div>
+
+        <div v-else-if="detailData" class="detail-container">
+          <!-- 基础信息区 -->
+          <div class="detail-card">
+            <h3 class="card-title">基础信息</h3>
+            <div class="card-content">
+              <div class="info-row">
+                <div class="detail-item">
+                  <span class="detail-label">工单编号：</span>
+                  <span class="detail-value">WO-{{ detailData.id }}</span>
+                </div>
+                <div class="detail-item">
+                  <span class="detail-label">工单标题：</span>
+                  <span class="detail-value">{{ detailData.title }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="detail-item">
+                  <span class="detail-label">工单类型：</span>
+                  <span class="detail-value">{{ mapCodeToType(detailData.type) }}</span>
+                </div>
+                <div class="detail-item">
+                  <span class="detail-label">优先级：</span>
+                  <span class="detail-value task-status priority-{{ mapPriorityToClass(detailData.level) }}">{{
+                    mapCodeToPriority(detailData.level)
+                  }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="detail-item">
+                  <span class="detail-label">创建人：</span>
+                  <span class="detail-value">{{ detailData.sendOrderPersonVo?.userName || '-' }}</span>
+                </div>
+                <div class="detail-item">
+                  <span class="detail-label">创建时间：</span>
+                  <span class="detail-value">{{ detailData.createTime ? formatDate(detailData.createTime) : '-' }}</span>
+                </div>
+              </div>
+              <div class="info-row">
+                <div class="detail-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="card-content">
+              <div v-for="(group, groupIndex) in groupNodesByModule(detailData.nodes)" :key="groupIndex" class="module-group">
+                <div class="module-title">{{ group.module }}</div>
+                <el-steps :active="-1" finish-status="success" class="custom-steps">
+                  <el-step
+                    v-for="(node, index) in group.items"
+                    :key="node.id"
+                    :title="node.name"
+                    :description="`目的: ${node.intendedPurpose || '-'}`"
+                  />
+                </el-steps>
+              </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';
-import { gongdanRecord } from '@/api/zhinengxunjian/gongdan/index';
-// 激活的选项卡，默认显示派单记录
-const activeTab = ref('dispatch');
+import { gongdanlist, gongdanRecord, updategongdan, gongdanDetail, uploadgongdan } from '@/api/zhinengxunjian/gongdan/index';
+import { addjiedian } from '@/api/zhinengxunjian/jiedian';
+import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
+import ImageUpload from '@/components/ImageUpload/index.vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+
+// 激活的选项卡
+const activeTab = ref('list');
 
 // 筛选条件
-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('');
@@ -200,7 +491,25 @@ 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(0);
+
+// 获取统计数据
 const fetchStatisticsData = async () => {
   try {
     const response = await gongdanRecord();
@@ -229,109 +538,202 @@ const fetchStatisticsData = async () => {
   }
 };
 
-// 页面加载时获取数据
-fetchStatisticsData();
+// 获取工单列表数据
+const fetchWorkOrderList = async () => {
+  try {
+    const params = {
+      projectId: 1,
+      pageNum: currentPage.value,
+      pageSize: pageSize.value
+    };
 
-// 派单记录数据
-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 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);
   }
-]);
+};
 
-// 分页相关
-const currentPage = ref(1);
-const pageSize = ref(10);
-const total = ref(rawTableData.value.length);
+// 类型映射函数 - 页面类型转接口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 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));
   }
 
   // 更新总条数
@@ -343,24 +745,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';
 };
@@ -370,12 +787,6 @@ const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
 };
 
-// 导出记录
-const handleExport = () => {
-  console.log('导出派单记录');
-  // 实际应用中这里会调用导出API
-};
-
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
@@ -390,38 +801,512 @@ const handleCurrentChange = (val) => {
 const handleTabClick = (tab) => {
   console.log('切换到选项卡:', tab.name);
   // 重置筛选条件和分页
-  dispatchStatus.value = 'all';
-  executor.value = 'all';
-  dispatchDate.value = '';
+  workOrderType.value = 'all';
+  workOrderStatus.value = 'all';
+  priority.value = 'all';
+  createDate.value = '';
   currentPage.value = 1;
-
-  // 如果切换到其他选项卡，导航到相应页面
-  if (tab.name === 'list') {
-    router.push('/rili/gongdanguanli');
-  } else if (tab.name === 'execution') {
-    router.push('/rili/execution-records');
-  }
 };
 
 // 操作按钮事件
-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 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 handleEvaluate = (row) => {
+  console.log('评价:', row);
+};
+
+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) => ({
+        content: node.intendedPurpose || ''
+      }));
+      // 确保至少有一个空步骤
+      if (createForm.steps.length === 0) {
+        createForm.steps = [{ content: '' }];
+      }
+    } else {
+      // 如果没有nodes数据，重置为默认的一个空步骤
+      createForm.steps = [{ content: '' }];
+    }
+
+    // 存储当前编辑的工单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: [{ content: '' }], // 工单步骤数组
+  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({ content: '' });
+};
+
+// 删除试验步骤
+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.content.trim())
+      .map((step, index) => ({
+        createTime: new Date().toISOString(),
+        updateTime: new Date().toISOString(),
+        params: {},
+        module: 1,
+        code: index + 1,
+        name: `步骤${index + 1}`,
+        intendedPurpose: step.content,
+        intendedTime: new Date().toISOString(),
+        finishTime: new Date().toISOString(),
+        remark: '',
+        status: '1' // 使用数字代码
+      }));
+
+    // 首先调用addjiedian接口
+    const jiedianResponse = await addjiedian(stepsData);
+
+    if (jiedianResponse.code !== 200) {
+      ElMessage.error('创建步骤失败');
+      return;
+    }
+
+    // 获取返回的ids
+    let nodeIds = '';
+    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] = [{ content: '' }];
+        } 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] = [{ content: '' }];
+    } else if (key === 'fileList') {
+      createForm[key] = [];
+    } else {
+      createForm[key] = '';
+    }
+  });
+  createForm.needAssignee = 'false';
+  editingWorkOrderId.value = '';
 };
 
 // 导航路由跳转
@@ -441,7 +1326,7 @@ const handleInspection5 = () => {
   router.push('/rili/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanguanli');
+  router.push('/rili/gongdanliebiao');
 };
 const handleInspection7 = () => {
   router.push('/rili/renyuanzhuangtai');
@@ -465,6 +1350,44 @@ const handleInspectionManagement3 = () => {
   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;
@@ -551,29 +1474,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;
 }
 
 /* 统计卡片样式 */
@@ -694,8 +1598,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;
@@ -703,41 +1608,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;
 }
 
 /* 分页区域样式 */
@@ -815,6 +1703,371 @@ 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);
+}
+
+/* 详情弹窗样式 */
+.beautiful-dialog .el-dialog__body {
+  max-height: 600px;
+  overflow-y: auto;
+  padding: 20px;
+}
+
+.loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: #909399;
+}
+
+.detail-container {
+  padding: 10px 0;
+}
+
+.detail-card {
+  margin-bottom: 20px;
+  background-color: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+}
+
+.card-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #1d2129;
+  padding: 12px 16px;
+  background-color: #f7f8fa;
+  border-bottom: 1px solid #f0f2f5;
+  margin-bottom: 0;
+}
+
+.card-content {
+  padding: 16px;
+}
+
+.info-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 8px;
+}
+
+.detail-item {
+  display: flex;
+  margin-bottom: 10px;
+  font-size: 13px;
+  flex: 0 0 50%;
+  box-sizing: border-box;
+  padding-right: 12px;
+}
+
+.detail-label {
+  flex: 0 0 80px;
+  color: #86909c;
+}
+
+.detail-value {
+  flex: 1;
+  color: #4e5969;
+  word-break: break-all;
+}
+
+/* 优先级标签样式 */
+.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 {
@@ -832,16 +2085,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;
@@ -857,20 +2101,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 66fe47b..0c97b94 100644
--- a/src/views/zhinengxunjian/qiangxiuguanli.vue
+++ b/src/views/zhinengxunjian/qiangxiuguanli.vue
@@ -771,7 +771,7 @@ const getUsersList = async () => {
   try {
     const res = await xunjianUserlist();
     if (res.code === 200 && res.rows && Array.isArray(res.rows)) {
-      usersList.value = res.rows.map((user) => ({ id: String(user.id), name: user.userName }));
+      usersList.value = res.rows.map((user) => ({ id: String(user.userId || ''), name: user.userName || '未知用户' }));
     } else {
       usersList.value = [];
       ElMessage.error('获取用户列表失败');
diff --git a/src/views/zhinengxunjian/qiangxiujilu.vue b/src/views/zhinengxunjian/qiangxiujilu.vue
index bc430ad..cd39992 100644
--- a/src/views/zhinengxunjian/qiangxiujilu.vue
+++ b/src/views/zhinengxunjian/qiangxiujilu.vue
@@ -14,12 +14,7 @@
 
       <!-- 页面标题和操作区 -->
       <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>
@@ -32,7 +27,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="任务状态">
@@ -370,7 +365,6 @@
 <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';
@@ -754,12 +748,12 @@ const handleAssign = async (record) => {
   try {
     const res = await xunjianUserlist();
     if (res && res.code === 200) {
-      // 过滤无效数据+统一sysUserId为字符串
+      // 过滤无效数据+统一userId为字符串
       executors.value = (res.rows || [])
-        .filter((item) => item.sysUserId && item.userName)
+        .filter((item) => item.userId && item.userName)
         .map((item) => ({
-          userId: item.sysUserId.toString(), // 关键：使用sysUserId字段
-          userName: item.userName
+          userId: item.userId.toString(), // 使用userId字段
+          userName: item.userName || '未知用户'
         }));
     }
   } catch (error) {
@@ -1018,22 +1012,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;
@@ -1087,21 +1065,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;
 }
 
 /* 统计卡片样式 */
diff --git a/src/views/zhinengxunjian/renyuanzhuangtai.vue b/src/views/zhinengxunjian/renyuanzhuangtai.vue
index 1a04cd1..7a92d22 100644
--- a/src/views/zhinengxunjian/renyuanzhuangtai.vue
+++ b/src/views/zhinengxunjian/renyuanzhuangtai.vue
@@ -12,9 +12,6 @@
         <div class="nav-tab active" @click="handleInspection7">运维组织</div>
       </div>
 
-      <!-- 页面标题 -->
-      <TitleComponent title="运维组织模块" subtitle="实时监控人员状态、车辆状态和班组状态"></TitleComponent>
-
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -133,7 +130,6 @@
 <script setup>
 import { ref, watch, onMounted } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
 import * as echarts from 'echarts';
 
 // 激活的选项卡
diff --git a/src/views/zhinengxunjian/shiyanguanli.vue b/src/views/zhinengxunjian/shiyanguanli.vue
index 10ca273..38a392b 100644
--- a/src/views/zhinengxunjian/shiyanguanli.vue
+++ b/src/views/zhinengxunjian/shiyanguanli.vue
@@ -424,6 +424,16 @@
               <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="输入试验步骤" />
+                <el-button
+                  v-if="formData.steps.length > 1"
+                  type="text"
+                  size="small"
+                  class="delete-step-btn"
+                  @click="deleteStep(index)"
+                  style="color: #f56c6c"
+                >
+                  删除
+                </el-button>
               </div>
               <el-button type="text" size="small" class="add-step-btn" @click="addStep">添加步骤</el-button>
             </div>
@@ -579,6 +589,7 @@ import router from '@/router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { shiyanDetail, shiyanlist, addshiyan, updateshiyan } from '@/api/zhinengxunjian/shiyan/index';
 import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian/index';
+import { addjiedian } from '@/api/zhinengxunjian/jiedian/index';
 // 1. 选项卡状态管理
 const activeTab = ref('plan'); // 默认为"巡检计划"
 const timeRange = ref('month'); // 统计时间范围：月/周/日
@@ -839,20 +850,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) {
@@ -933,8 +938,40 @@ const handleSave = async () => {
       // 编辑模式：调用更新接口
       response = await updateshiyan(requestData);
     } else {
+      // 处理步骤数据格式
+      const stepsData = formData.value.steps
+        .filter((step) => step.content.trim())
+        .map((step, index) => ({
+          createTime: new Date().toISOString(),
+          updateTime: new Date().toISOString(),
+          remark: step.content.trim(),
+          status: '1', // 使用数字代码
+          // module值为2（与工单列表的1不同）
+          module: 2,
+          sort: index + 1
+        }));
+
+      // 首先调用addjiedian接口
+      const jiedianResponse = await addjiedian(stepsData);
+
+      if (jiedianResponse.code !== 200) {
+        ElMessage.error('创建步骤失败');
+        return;
+      }
+
+      // 获取返回的ids，实际返回格式中msg字段包含ids字符串
+      let nodeIds = '';
+      if (jiedianResponse.code === 200 && jiedianResponse.msg) {
+        nodeIds = jiedianResponse.msg;
+      } else {
+        ElMessage.warning('未获取到有效的步骤ID');
+        return;
+      }
+
       // 新增模式：调用添加接口（删除请求参数中的id，避免后端报错）
       const { id, ...addData } = requestData;
+      // 添加nodeIds字段
+      addData.nodeIds = nodeIds;
       response = await addshiyan(addData);
     }
 
@@ -1041,10 +1078,22 @@ const handleEditRecord = async (row) => {
     const recordDetail = detailResponse.data.rows?.[0] || detailResponse.data;
     // 兼容两种数据结构：可能在rows数组中，也可能直接在data中
 
-    // 3. 处理testStep：将逗号分隔的字符串转换为步骤数组
+    // 3. 处理步骤数据：优先从nodes数组中提取
     const steps = [];
-    if (recordDetail.testStep) {
-      // 拆分字符串（例如 "1. 213,2. 321" → ["1. 213", "2. 321"]）
+    // 如果有nodes数组，优先从nodes中提取步骤数据
+    if (recordDetail.nodes && Array.isArray(recordDetail.nodes)) {
+      // 复制nodes数组并按code升序排序
+      const sortedNodes = [...recordDetail.nodes].sort((a, b) => (a.code || 0) - (b.code || 0));
+      // 转换为所需的格式
+      sortedNodes.forEach((node) => {
+        if (node.intendedPurpose && node.intendedPurpose.trim()) {
+          steps.push({ content: node.intendedPurpose.trim() });
+        }
+      });
+    }
+    // 如果nodes中没有数据，回退到从testStep字符串解析
+    else if (recordDetail.testStep) {
+      // 拆分字符串
       const stepItems = recordDetail.testStep.split(',');
       stepItems.forEach((stepText) => {
         // 移除序号前缀（如"1. "），只保留内容
@@ -1137,6 +1186,17 @@ const addStep = () => {
   formData.value.steps.push({ content: '' });
 };
 
+// 删除步骤
+const deleteStep = (index) => {
+  // 确保至少保留一个步骤
+  if (formData.value.steps.length <= 1) {
+    ElMessage.warning('至少需要保留一个步骤');
+    return;
+  }
+  // 从数组中删除指定索引的步骤
+  formData.value.steps.splice(index, 1);
+};
+
 // 添加新设备
 const addEquipment = () => {
   if (newEquipment.value.trim()) {
diff --git a/src/views/zhinengxunjian/shiyanrenwu.vue b/src/views/zhinengxunjian/shiyanrenwu.vue
index 684be72..395d94f 100644
--- a/src/views/zhinengxunjian/shiyanrenwu.vue
+++ b/src/views/zhinengxunjian/shiyanrenwu.vue
@@ -482,36 +482,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 // 显示名称
       }));
 
       // 调试信息，确认数据格式正确
diff --git a/src/views/zhinengxunjian/xunjianrenwu.vue b/src/views/zhinengxunjian/xunjianrenwu.vue
index 3360946..e9cad3f 100644
--- a/src/views/zhinengxunjian/xunjianrenwu.vue
+++ b/src/views/zhinengxunjian/xunjianrenwu.vue
@@ -807,21 +807,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) {
diff --git a/src/views/zhinengxunjian/zhixingjilu.vue b/src/views/zhinengxunjian/zhixingjilu.vue
index 9b1cb3c..5a86c53 100644
--- a/src/views/zhinengxunjian/zhixingjilu.vue
+++ b/src/views/zhinengxunjian/zhixingjilu.vue
@@ -12,9 +12,6 @@
         <div class="nav-tab" @click="handleInspection7">运维组织</div>
       </div>
 
-      <!-- 页面标题 -->
-      <TitleComponent title="工单管理模块" subtitle="发起工单任务，跟踪流程记录和执行情况"></TitleComponent>
-
       <!-- 子选项卡 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
@@ -220,7 +217,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import router from '@/router';
-import TitleComponent from './TitleComponent.vue';
+import { gongdanlist, gongdanDetail, updategongdan, delgongdan } from '@/api/zhinengxunjian/gongdan/index';
 // 导入Element Plus的Steps组件
 import { ElSteps, ElStep } from 'element-plus';