diff --git a/.env.development b/.env.development
index 34b1eeb..f7ff9da 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源场站智慧运维平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:18899'
+VITE_APP_BASE_API = 'http://192.168.110.149:18899'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index cb7058a..d1b1c9e 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -17,6 +17,8 @@
     "MaybeRefOrGetter": true,
     "PropType": true,
     "Ref": true,
+    "Slot": true,
+    "Slots": true,
     "VNode": true,
     "WritableComputedRef": true,
     "acceptHMRUpdate": true,
@@ -35,6 +37,7 @@
     "createInjectionState": true,
     "createPinia": true,
     "createReactiveFn": true,
+    "createRef": true,
     "createReusableTemplate": true,
     "createSharedComposable": true,
     "createTemplatePromise": true,
@@ -315,9 +318,6 @@
     "watchThrottled": true,
     "watchTriggerable": true,
     "watchWithFilter": true,
-    "whenever": true,
-    "Slot": true,
-    "Slots": true,
-    "createRef": true
+    "whenever": true
   }
 }
diff --git a/src/api/zhinengxunjian/daiban/index.ts b/src/api/zhinengxunjian/daiban/index.ts
new file mode 100644
index 0000000..195e3b1
--- /dev/null
+++ b/src/api/zhinengxunjian/daiban/index.ts
@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+//查询列表
+export const daibanlist = (query) => {
+  return request({
+    url: '/ops/matter/list',
+    method: 'get',
+    params: query
+  });
+};
+//新增待办事项
+export const adddaiban = (data) => {
+  return request({
+    url: '/ops/matter',
+    method: 'post',
+    data: data
+  });
+};
+//修改待办事项
+export const updatedaiban = (data) => {
+  return request({
+    url: '/ops/matter',
+    method: 'put',
+    data: data
+  });
+};
+//删除待办事项
+
+export function deldaiban(ids) {
+  return request({
+    url: `/ops/matter/${ids}`, // 拼接ids作为路径参数
+    method: 'delete'
+  });
+}
diff --git a/src/api/zhinengxunjian/inspection/item/index.ts b/src/api/zhinengxunjian/inspection/item/index.ts
new file mode 100644
index 0000000..29fd448
--- /dev/null
+++ b/src/api/zhinengxunjian/inspection/item/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ItemVO, ItemForm, ItemQuery } from '@/api/zhinengxunjian/inspection/item/types';
+
+/**
+ * 查询运维-巡检-自定义巡检项列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listItem = (query?: ItemQuery): AxiosPromise<ItemVO[]> => {
+  return request({
+    url: '/ops/item/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询运维-巡检-自定义巡检项详细
+ * @param id
+ */
+export const getItem = (id: string | number): AxiosPromise<ItemVO> => {
+  return request({
+    url: '/ops/item/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增运维-巡检-自定义巡检项
+ * @param data
+ */
+export const addItem = (data: ItemForm) => {
+  return request({
+    url: '/ops/item',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改运维-巡检-自定义巡检项
+ * @param data
+ */
+export const updateItem = (data: ItemForm) => {
+  return request({
+    url: '/ops/item',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除运维-巡检-自定义巡检项
+ * @param id
+ */
+export const delItem = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/ops/item/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/zhinengxunjian/inspection/item/types.ts b/src/api/zhinengxunjian/inspection/item/types.ts
new file mode 100644
index 0000000..9d6ec6e
--- /dev/null
+++ b/src/api/zhinengxunjian/inspection/item/types.ts
@@ -0,0 +1,46 @@
+export interface ItemVO {
+  /**
+   *
+   */
+  id: string | number;
+
+  /**
+   * 自定义巡检项名称
+   */
+  name: string;
+
+  /**
+   * 业务id，巡检计划1
+   */
+  type: string;
+}
+
+export interface ItemForm extends BaseEntity {
+  /**
+   * 自定义巡检项名称
+   */
+  name?: string;
+
+  /**
+   * 业务id，巡检计划1
+   */
+  type?: string;
+  projectId?: number;
+}
+
+export interface ItemQuery extends PageQuery {
+  /**
+   * 自定义巡检项名称
+   */
+  name?: string;
+
+  /**
+   * 业务id，巡检计划1
+   */
+  type?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/zhinengxunjian/xunjian/index.ts b/src/api/zhinengxunjian/xunjian/index.ts
new file mode 100644
index 0000000..7b6b6d7
--- /dev/null
+++ b/src/api/zhinengxunjian/xunjian/index.ts
@@ -0,0 +1,49 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+//查询列表
+export const xunjianlist = (query) => {
+  return request({
+    url: '/ops/plan/list',
+    method: 'get',
+    params: query
+  });
+};
+//新增
+export const addxunjian = (data) => {
+  return request({
+    url: '/ops/plan',
+    method: 'post',
+    data: data
+  });
+};
+//修改
+export const updatexunjian = (data) => {
+  return request({
+    url: '/ops/plan',
+    method: 'put',
+    data: data
+  });
+};
+//删除
+export const delxunjian = (ids) => {
+  return request({
+    url: `/ops/plan/${ids}`,
+    method: 'delete'
+  });
+};
+//查询人员
+export const xunjianUserlist = (query) => {
+  return request({
+    url: '/ops/constructionUser/list',
+    method: 'get',
+    params: query
+  });
+};
+//查询巡检项
+export const xunjianItemlist = (query) => {
+  return request({
+    url: '/ops/item/list',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/views/inspection/item/index.vue b/src/views/inspection/item/index.vue
new file mode 100644
index 0000000..d0ada56
--- /dev/null
+++ b/src/views/inspection/item/index.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="自定义巡检项名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入自定义巡检项名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['inspection:item:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['inspection:item:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['inspection:item:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['inspection:item:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="itemList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="" align="center" prop="id" v-if="true" />
+        <el-table-column label="自定义巡检项名称" align="center" prop="name" />
+        <el-table-column label="业务id，巡检计划1" align="center" prop="type" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['inspection:item:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['inspection:item:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改运维-巡检-自定义巡检项对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="650px" append-to-body>
+      <el-form ref="itemFormRef" :model="form" :rules="rules" label-width="135px">
+        <el-form-item label="自定义巡检项名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入自定义巡检项名称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option label="巡检管理" value="1" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Item" lang="ts">
+import { listItem, getItem, delItem, addItem, updateItem } from '@/api/zhinengxunjian/inspection/item/index';
+import { ItemVO, ItemQuery, ItemForm } from '@/api/zhinengxunjian/inspection/item/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const itemList = ref<ItemVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const itemFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ItemForm = {
+  name: undefined,
+  type: '1',
+  projectId: 1
+};
+const data = reactive<PageData<ItemForm, ItemQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: undefined,
+    type: undefined,
+    params: {}
+  },
+  rules: {
+    name: [{ required: true, message: '自定义巡检项名称不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '业务id，巡检计划1不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询运维-巡检-自定义巡检项列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listItem(queryParams.value);
+  itemList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  itemFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ItemVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加运维-巡检-自定义巡检项';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ItemVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getItem(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改运维-巡检-自定义巡检项';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  itemFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateItem(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addItem(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ItemVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除运维-巡检-自定义巡检项编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delItem(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'inspection/item/export',
+    {
+      ...queryParams.value
+    },
+    `item_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/zhinengxunjian/InspectionManagement.vue b/src/views/zhinengxunjian/InspectionManagement.vue
index 3f43b3f..4388300 100644
--- a/src/views/zhinengxunjian/InspectionManagement.vue
+++ b/src/views/zhinengxunjian/InspectionManagement.vue
@@ -25,10 +25,9 @@
         <div class="filter-item">
           <el-select v-model="planType" placeholder="计划类型" clearable>
             <el-option label="全部类型" value="all"></el-option>
-            <el-option label="每日巡检" value="daily"></el-option>
-            <el-option label="每周巡检" value="weekly"></el-option>
-            <el-option label="每月巡检" value="monthly"></el-option>
-            <el-option label="每季度巡检" value="quarterly"></el-option>
+            <el-option label="每日巡检" value="1"></el-option>
+            <el-option label="每周巡检" value="2"></el-option>
+            <el-option label="每月巡检" value="3"></el-option>
           </el-select>
         </div>
         <div class="filter-item">
@@ -41,14 +40,14 @@
         <div class="filter-item">
           <el-select v-model="inspectionObject" placeholder="巡检对象" clearable>
             <el-option label="全部对象" value="all"></el-option>
-            <el-option label="服务器" value="server"></el-option>
-            <el-option label="网络设备" value="network"></el-option>
-            <el-option label="应用系统" value="application"></el-option>
-            <el-option label="基础设施" value="infrastructure"></el-option>
+            <el-option label="服务器" value="1"></el-option>
+            <el-option label="网络设备" value="2"></el-option>
+            <el-option label="应用系统" value="3"></el-option>
+            <el-option label="基础设施" value="4"></el-option>
           </el-select>
         </div>
         <div class="filter-actions">
-          <el-button type="primary" class="search-btn">搜索</el-button>
+          <el-button type="primary" class="search-btn" @click="handleSearch">搜索</el-button>
           <el-button type="primary" icon="el-icon-plus" class="create-btn" @click="handleCreate">手动创建计划</el-button>
         </div>
       </div>
@@ -73,10 +72,9 @@
               <el-button type="text" @click="handleDetail(scope.row)" class="action-btn">详情</el-button>
               <el-button
                 type="text"
-                :disabled="scope.row.status === 'disabled'"
                 @click="handleEnable(scope.row)"
                 class="action-btn"
-                :class="{ 'text-success': scope.row.status === 'disabled' }"
+                :class="{ 'text-success': scope.row.status === 'disabled', 'text-danger': scope.row.status === 'enabled' }"
               >
                 {{ scope.row.status === 'enabled' ? '停用' : '启用' }}
               </el-button>
@@ -105,133 +103,172 @@
       </div>
     </div>
 
-    <!-- 创建计划弹窗 -->
-    <el-dialog v-model="dialogVisible" title="新建巡检计划" width="700px" class="create-plan-dialog" center :show-close="true">
+    <!-- 创建/编辑计划弹窗 -->
+    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="800px" class="create-plan-dialog" center :show-close="true">
       <el-form :model="createForm" :rules="createFormRules" ref="createFormRef" label-width="150px" class="custom-form">
-        <el-form-item label="计划名称*" prop="planName" class="form-item-large">
-          <el-input v-model="createForm.planName" placeholder="请输入计划名称" class="custom-input" />
-        </el-form-item>
+        <!-- 第一行：计划名称 -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="计划名称*" prop="planName">
+              <el-input v-model="createForm.planName" placeholder="请输入计划名称" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <div class="form-row">
-          <el-form-item label="计划类型*" prop="planType" class="form-item-half">
-            <el-select v-model="createForm.planType" placeholder="请选择计划类型" class="custom-select">
-              <el-option label="每日巡检" value="daily" />
-              <el-option label="每周巡检" value="weekly" />
-              <el-option label="每月巡检" value="monthly" />
-              <el-option label="每季度巡检" value="quarterly" />
-            </el-select>
-          </el-form-item>
+        <!-- 第二行：计划类型、巡检对象类型 -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="计划类型*" prop="planType">
+              <el-select v-model="createForm.planType" placeholder="请选择计划类型" style="width: 100%">
+                <el-option label="每日巡检" value="1" />
+                <el-option label="每周巡检" value="2" />
+                <el-option label="每月巡检" value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="巡检对象类型*" prop="objectType">
+              <el-select v-model="createForm.objectType" placeholder="请选择对象类型" style="width: 100%">
+                <el-option label="服务器" value="1" />
+                <el-option label="网络设备" value="2" />
+                <el-option label="应用系统" value="3" />
+                <el-option label="基础设施" value="4" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-          <el-form-item label="巡检对象类型*" prop="objectType" class="form-item-half">
-            <el-select v-model="createForm.objectType" placeholder="请选择对象类型" class="custom-select">
-              <el-option label="服务器" value="server" />
-              <el-option label="网络设备" value="network" />
-              <el-option label="应用系统" value="application" />
-              <el-option label="基础设施" value="infrastructure" />
-            </el-select>
-          </el-form-item>
-        </div>
+        <!-- 第三行：开始日期、结束日期 -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="开始日期*" prop="startDate">
+              <el-date-picker
+                v-model="createForm.startDate"
+                type="date"
+                placeholder="选择日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结束日期*" prop="endDate">
+              <el-date-picker
+                v-model="createForm.endDate"
+                type="date"
+                placeholder="选择日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <div class="form-row">
-          <el-form-item label="开始日期*" prop="startDate" class="form-item-half">
-            <el-date-picker
-              v-model="createForm.startDate"
-              type="date"
-              placeholder="选择日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              class="custom-date-picker"
-            />
-          </el-form-item>
+        <!-- 第四行：巡检频率 -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="巡检频率*" prop="frequencyType" class="frequency-item">
+              <el-radio-group v-model="createForm.frequencyType" @change="handleFrequencyChange">
+                <el-radio :label="'daily'" class="frequency-radio">每天</el-radio>
+                <el-radio :label="'weekly'" class="frequency-radio">每周</el-radio>
+                <el-radio :label="'monthly'" class="frequency-radio">每月</el-radio>
+              </el-radio-group>
 
-          <el-form-item label="结束日期*" prop="endDate" class="form-item-half">
-            <el-date-picker
-              v-model="createForm.endDate"
-              type="date"
-              placeholder="选择日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              class="custom-date-picker"
-            />
-          </el-form-item>
-        </div>
-        <el-form-item label="巡检频率*" class="form-item-large">
-          <div style="display: flex; align-items: center; gap: 20px">
-            <el-radio-group v-model="createForm.frequencyType" class="frequency-radio-group">
-              <el-radio label="daily">每天</el-radio>
-              <el-radio label="weekly">每周</el-radio>
-              <el-radio label="monthly">每月</el-radio>
-            </el-radio-group>
+              <!-- 每周-选择周几 -->
+              <el-select
+                v-model="createForm.weekDay"
+                placeholder="选择周几"
+                style="margin-left: 10px; width: 120px"
+                v-if="createForm.frequencyType === 'weekly'"
+              >
+                <el-option label="周一" value="1"></el-option>
+                <el-option label="周二" value="2"></el-option>
+                <el-option label="周三" value="3"></el-option>
+                <el-option label="周四" value="4"></el-option>
+                <el-option label="周五" value="5"></el-option>
+                <el-option label="周六" value="6"></el-option>
+                <el-option label="周日" value="7"></el-option>
+              </el-select>
 
-            <!-- 每周选择框 - 变小并排在单选框后面 -->
-            <el-select
-              v-if="createForm.frequencyType === 'weekly'"
-              v-model="createForm.weekday"
-              placeholder="选择周几"
-              class="custom-select-small"
-              style="width: 100px"
-            >
-              <el-option label="周一" value="1" />
-              <el-option label="周二" value="2" />
-              <el-option label="周三" value="3" />
-              <el-option label="周四" value="4" />
-              <el-option label="周五" value="5" />
-              <el-option label="周六" value="6" />
-              <el-option label="周日" value="0" />
-            </el-select>
+              <!-- 每月-选择几号 -->
+              <el-select
+                v-model="createForm.monthDay"
+                placeholder="选择几号"
+                style="margin-left: 10px; width: 120px"
+                v-if="createForm.frequencyType === 'monthly'"
+              >
+                <el-option v-for="day in 31" :key="day" :label="`${day}号`" :value="day"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-            <!-- 每月选择框 - 变小并排在单选框后面 -->
-            <el-select
-              v-if="createForm.frequencyType === 'monthly'"
-              v-model="createForm.monthday"
-              placeholder="选择几号"
-              class="custom-select-small"
-              style="width: 100px"
-            >
-              <template v-for="day in 31" :key="day">
-                <el-option :label="day + '号'" :value="day" />
-              </template>
-            </el-select>
-          </div>
-        </el-form-item>
+        <!-- 第五行：计划开始时间、持续时间(分钟) -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="计划开始时间*" prop="planBeginTime">
+              <el-time-picker v-model="createForm.planBeginTime" placeholder="选择时间" format="HH:mm" value-format="HH:mm" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="持续时间(分钟)*" prop="duration">
+              <el-input v-model.number="createForm.duration" placeholder="请输入持续时间" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <div class="form-row" s>
-          <el-form-item label="计划开始时间*" prop="startTime" class="form-item-half">
-            <el-time-picker v-model="createForm.startTime" placeholder="选择时间" format="HH:mm" value-format="HH:mm" class="custom-time-picker" />
-          </el-form-item>
+        <!-- 第六行：负责人 -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="负责人*" prop="person">
+              <el-select v-model="createForm.person" placeholder="请选择负责人" style="width: 100%">
+                <el-option v-for="user in userList" :key="user.value" :label="user.label" :value="user.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-          <el-form-item label="预计时长(分钟)" class="form-item-half">
-            <el-input v-model.number="createForm.estimatedDuration" class="custom-input" />
-          </el-form-item>
-        </div>
+        <!-- 第七行：巡检项 -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="巡检项*" prop="inspectionItemId">
+              <el-checkbox-group v-model="createForm.inspectionItemId" class="inspection-item-group">
+                <el-checkbox v-for="item in inspectionItemList" :key="item.value" :label="item.value" style="margin-right: 20px; margin-bottom: 10px">
+                  {{ item.label }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <el-form-item label="负责人*" prop="responsiblePerson" class="form-item-large">
-          <el-select v-model="createForm.responsiblePerson" placeholder="请选择负责人" class="custom-select">
-            <el-option label="张明" value="zhangming" />
-            <el-option label="李华" value="lihua" />
-            <el-option label="王强" value="wangqiang" />
-          </el-select>
-        </el-form-item>
+        <!-- 第八行：状态 -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="状态*" prop="status">
+              <el-select v-model="createForm.status" placeholder="请选择状态" style="width: 100%">
+                <el-option label="启用" value="1" />
+                <el-option label="停用" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <el-form-item label="巡检项*" class="form-item-large">
-          <el-checkbox-group v-model="createForm.inspectionItems" style="border: 0.1 solid black; padding: 5px">
-            <el-checkbox label="CPU使用率检查" />
-            <el-checkbox label="内存使用情况" />
-            <el-checkbox label="磁盘空间检查" />
-            <el-checkbox label="网络连接状态" />
-            <el-checkbox label="系统日志检查" />
-          </el-checkbox-group>
-        </el-form-item>
-
-        <el-form-item label="备注说明" prop="remarks" class="form-item-large">
-          <el-input v-model="createForm.remarks" type="textarea" placeholder="请输入备注" rows="3" class="custom-textarea" />
-        </el-form-item>
+        <!-- 第九行：备注说明 -->
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注说明" prop="remark">
+              <el-input v-model="createForm.remark" type="textarea" placeholder="请输入备注" rows="3" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="cancelCreatePlan">取消</el-button>
-          <el-button type="primary" @click="submitCreatePlan">新增任务</el-button>
+          <el-button type="primary" @click="submitCreatePlan">保存任务</el-button>
         </span>
       </template>
     </el-dialog>
@@ -241,10 +278,12 @@
 <script setup>
 // 表单引用
 const createFormRef = ref(null);
-import { ref, computed, reactive } from 'vue';
+import { ref, computed, reactive, onMounted } from 'vue';
 import router from '@/router';
 import TitleComponent from './TitleComponent.vue';
-
+import { useRoute } from 'vue-router';
+import { addxunjian, xunjianlist, delxunjian, updatexunjian, xunjianUserlist, xunjianItemlist } from '@/api/zhinengxunjian/xunjian';
+import { ElMessage, ElMessageBox } from 'element-plus';
 // 激活的选项卡
 const activeTab = ref('plan');
 // 计划类型
@@ -253,142 +292,237 @@ const planType = ref('all');
 const status = ref('all');
 // 巡检对象
 const inspectionObject = ref('all');
-// 原始表格数据
-const rawTableData = ref([
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '网络设备安全巡检 2025-04-15',
-    type: '每周巡检',
-    object: '网络设备',
-    frequency: '每天10:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '数据库性能巡检 2025-03-03',
-    type: '每月巡检',
-    object: '应用系统',
-    frequency: '每月1日14:00',
-    status: 'disabled',
-    responsible: '张明'
-  },
-  {
-    name: '机房环境季度检查',
-    type: '每季度巡检',
-    object: '基础设备',
-    frequency: '每季度第一个月5号',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  {
-    name: '生产服务器每日巡检 2025-05-14',
-    type: '每日巡检',
-    object: '服务器',
-    frequency: '每天8:30',
-    status: 'enabled',
-    responsible: '张明'
-  },
-  // 增加更多数据用于测试分页
-  {
-    name: '应用系统安全检查',
-    type: '每周巡检',
-    object: '应用系统',
-    frequency: '每周五16:00',
-    status: 'enabled',
-    responsible: '李华'
-  },
-  {
-    name: '网络带宽监控',
-    type: '每日巡检',
-    object: '网络设备',
-    frequency: '每天12:00',
-    status: 'enabled',
-    responsible: '王强'
-  }
-]);
+// 表格数据
+const tableData = ref([]);
 // 当前页码
 const currentPage = ref(1);
 // 每页条数 - 与分页控件默认值保持一致
 const pageSize = ref(10);
-// 总条数 - 从原始数据计算得出
-const total = ref(rawTableData.value.length);
+// 总条数
+const total = ref(0);
+// 负责人列表
+const userList = ref([]);
+// 巡检项列表
+const inspectionItemList = ref([]);
+
+// 从API获取巡检计划列表
+const getInspectionList = async () => {
+  try {
+    const response = await xunjianlist({
+      pageNum: currentPage.value,
+      pageSize: pageSize.value,
+      planType: planType.value === 'all' ? '' : planType.value,
+      status: status.value === 'all' ? '' : status.value === 'enabled' ? '1' : '2',
+      objectType: inspectionObject.value === 'all' ? '' : inspectionObject.value
+    });
+
+    // 处理接口返回的数据
+    if (response.code === 200) {
+      // 确保rows是数组
+      const rows = Array.isArray(response.rows) ? response.rows : response.data?.rows || [];
+      // 确保total是数字
+      const totalCount = Number(response.total) || Number(response.data?.total) || 0;
+
+      tableData.value = rows.map((item) => ({
+        id: item.id || '', // 接口返回的id是字符串类型
+        name: String(item.planName || '未知名称'), // 转换为字符串，避免数字显示问题
+        type: getPlanTypeText(item.planType),
+        object: getObjectTypeText(item.objectType),
+        frequency: item.inspectionFrequency || '未知频率',
+        status: item.status === '1' ? 'enabled' : 'disabled',
+        responsible: item.nickName || '未知负责人', // 使用nickName作为负责人名称
+        originalData: { ...item } // 深拷贝原始数据
+      }));
+
+      total.value = totalCount;
+    } else {
+      console.warn('接口返回非成功状态:', response.code, response.msg);
+      ElMessage.warning(`获取数据失败: ${response.msg || '未知错误'}`);
+    }
+  } catch (error) {
+    console.error('获取巡检计划列表失败:', error);
+    ElMessage.error('获取巡检计划列表失败');
+  }
+};
+
+// 获取计划类型文本
+const getPlanTypeText = (type) => {
+  const typeMap = {
+    '1': '每日巡检',
+    '2': '每周巡检',
+    '3': '每月巡检'
+  };
+  return typeMap[type] || '未知类型';
+};
+
+// 获取对象类型文本
+const getObjectTypeText = (type) => {
+  const typeMap = {
+    '1': '服务器',
+    '2': '网络设备',
+    '3': '应用系统',
+    '4': '基础设施'
+  };
+  return typeMap[type] || '未知对象';
+};
+
+// 页面挂载时获取数据
+onMounted(() => {
+  getInspectionList();
+});
 
 // 计算属性：根据当前页码和每页条数获取分页后的数据
 const pagedTableData = computed(() => {
   const startIndex = (currentPage.value - 1) * pageSize.value;
   const endIndex = startIndex + pageSize.value;
-  return rawTableData.value.slice(startIndex, endIndex);
+  return tableData.value.slice(startIndex, endIndex);
 });
 
 // 每页条数改变
 const handleSizeChange = (val) => {
   pageSize.value = val;
   currentPage.value = 1; // 重置到第一页
+  getInspectionList();
 };
 
 // 当前页码改变
 const handleCurrentChange = (val) => {
   currentPage.value = val;
+  getInspectionList();
+};
+
+// 搜索按钮点击事件
+const handleSearch = () => {
+  currentPage.value = 1;
+  getInspectionList();
+};
+
+// 获取负责人列表
+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
+        : [];
+
+    // 提取userName，其他字段忽略
+    userList.value = userRows
+      .filter((item) => item && typeof item === 'object') // 过滤无效数据
+      .map((item, index) => ({
+        label: item.userName || `用户${index + 1}`, // 优先用userName，无则兜底
+        value: item.id || `id_${index}` // 确保有value值
+      }));
+
+    // 空数据处理
+    if (userList.value.length === 0) {
+      userList.value = [{ label: '默认用户', value: 'default' }];
+    }
+  } catch (error) {
+    console.error('获取用户失败:', error);
+    userList.value = [{ label: '默认用户', value: 'default' }];
+  }
+};
+
+// 获取巡检项列表
+const getInspectionItemsList = async () => {
+  try {
+    const response = await xunjianItemlist();
+    console.log('巡检项接口返回数据:', response);
+
+    if (response && response.code === 200) {
+      // 即使data不存在，也尝试获取rows（兼容不同返回格式）
+      const rows = response.rows || (response.data && response.data.rows) || [];
+
+      inspectionItemList.value = rows.map((item) => ({
+        label: item.name || `未命名项(${item.id})`,
+        value: item.id
+      }));
+
+      console.log(`成功加载${inspectionItemList.value.length}个巡检项`);
+    } else {
+      inspectionItemList.value = [];
+      console.warn('获取巡检项列表失败，响应码:', response?.code);
+    }
+  } catch (error) {
+    console.error('获取巡检项列表失败:', error);
+    ElMessage.error('获取巡检项列表失败');
+    inspectionItemList.value = [];
+  }
 };
 
 // 编辑
-const handleEdit = (row) => {
-  console.log('编辑', row);
+const handleEdit = async (row) => {
+  try {
+    // 打开弹窗前先获取数据
+    await getUsersList();
+    await getInspectionItemsList();
+
+    // 填充表单数据
+    const originalData = row.originalData;
+    createForm.planName = originalData.planName || '';
+    createForm.planType = originalData.planType || '';
+    createForm.objectType = originalData.objectType || '';
+    createForm.startDate = originalData.beginTime ? originalData.beginTime.substring(0, 10) : '';
+    createForm.endDate = originalData.endTime ? originalData.endTime.substring(0, 10) : '';
+    createForm.planBeginTime = originalData.planBeginTime || '';
+    createForm.duration = originalData.duration || 60;
+    createForm.person = originalData.person || '';
+    createForm.status = originalData.status || '1';
+    createForm.remark = originalData.remark || '';
+
+    // 处理巡检项ID（从字符串转回数组）
+    if (originalData.inspectionItemId) {
+      createForm.inspectionItemId =
+        typeof originalData.inspectionItemId === 'string'
+          ? originalData.inspectionItemId.split(',').filter((id) => id.trim())
+          : Array.isArray(originalData.inspectionItemId)
+          ? originalData.inspectionItemId
+          : [];
+    } else {
+      createForm.inspectionItemId = [];
+    }
+
+    // 根据频率描述设置频率相关字段
+    const frequencyDesc = originalData.inspectionFrequency || '';
+    if (frequencyDesc.includes('每天')) {
+      createForm.frequencyType = 'daily';
+    } else if (frequencyDesc.includes('每周')) {
+      createForm.frequencyType = 'weekly';
+      // 提取周几（简单实现，假设格式为"每周X"）
+      const weekDayMatch = frequencyDesc.match(/每周(.)/);
+      if (weekDayMatch) {
+        const weekdays = ['一', '二', '三', '四', '五', '六', '日'];
+        const weekDayIndex = weekdays.indexOf(weekDayMatch[1]);
+        if (weekDayIndex !== -1) {
+          createForm.weekDay = String(weekDayIndex + 1);
+        }
+      }
+    } else if (frequencyDesc.includes('每月')) {
+      createForm.frequencyType = 'monthly';
+      // 提取几号（简单实现，假设格式为"每月X号"）
+      const monthDayMatch = frequencyDesc.match(/每月(\d+)号/);
+      if (monthDayMatch) {
+        createForm.monthDay = monthDayMatch[1];
+      }
+    }
+
+    // 记录当前编辑的数据ID
+    editingId.value = row.id;
+
+    // 打开弹窗
+    dialogVisible.value = true;
+    dialogTitle.value = '编辑巡检计划';
+  } catch (error) {
+    console.error('编辑数据加载失败:', error);
+    ElMessage.error('加载编辑数据失败');
+  }
 };
 
 // 详情
@@ -396,9 +530,52 @@ const handleDetail = (row) => {
   console.log('详情', row);
 };
 
-// 启用/停用
-const handleEnable = (row) => {
-  row.status = row.status === 'enabled' ? 'disabled' : 'enabled';
+// 启用/停用 - 优化后的实现
+const handleEnable = async (row) => {
+  try {
+    // 1. 获取当前行的原始数据和状态
+    const originalData = row.originalData || {};
+    const currentStatus = originalData.status || '1'; // 当前状态：1=启用，2=停用
+    const targetStatus = currentStatus === '1' ? '2' : '1'; // 目标状态：启用→停用，停用→启用
+    const statusText = targetStatus === '1' ? '启用' : '停用'; // 状态文本用于提示
+
+    // 2. 显示确认对话框
+    await ElMessageBox.confirm(`确定要${statusText}该巡检计划吗？`, '操作确认', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+
+    // 3. 调用接口修改状态（仅传递id和status核心参数）
+    const response = await updatexunjian({
+      id: row.id, // 必传：当前巡检计划的ID
+      status: targetStatus // 必传：目标状态（1=启用，2=停用）
+    });
+
+    // 4. 处理接口响应
+    if (response.code === 200) {
+      // 4.1 提示操作成功
+      ElMessage.success(`已成功${statusText}该巡检计划`);
+
+      // 4.2 同步本地数据（表格实时更新，无需重新请求列表）
+      // 更新原始数据的状态
+      if (originalData) {
+        originalData.status = targetStatus;
+      }
+      // 更新表格行的状态（用于标签显示）
+      row.status = targetStatus === '1' ? 'enabled' : 'disabled';
+    } else {
+      // 4.3 接口返回失败时提示
+      ElMessage.error(`${statusText}失败：${response.msg || '服务器异常'}`);
+    }
+  } catch (error) {
+    // 5. 捕获网络或代码错误，用户取消操作时也会进入这里
+    if (error !== 'cancel') {
+      // 排除用户主动取消的情况
+      console.error('启用/停用操作失败:', error);
+      ElMessage.error('操作失败，请检查网络或重试');
+    }
+  }
 };
 
 // 选项卡切换
@@ -408,25 +585,38 @@ const handleTabChange = (newTab, oldTab) => {
   return true;
 };
 
-// 创建计划弹窗相关
+// 创建/编辑计划弹窗相关
 const dialogVisible = ref(false);
+const dialogTitle = ref('新建巡检计划');
+const editingId = ref('');
 const createForm = reactive({
   planName: '',
   planType: '',
   objectType: '',
   startDate: '',
   endDate: '',
-  frequencyType: 'daily',
-  frequencyValue: '',
-  weekday: '', // 存储周几
-  monthday: '', // 存储几号
-  startTime: '',
-  estimatedDuration: 60,
-  responsiblePerson: '',
-  inspectionItems: [],
-  remarks: ''
+  frequencyType: 'daily', // 频率类型：daily/weekly/monthly
+  weekDay: '', // 周几 (1-7)
+  monthDay: '', // 几号 (1-31)
+  planBeginTime: '',
+  duration: 60,
+  person: '',
+  inspectionItemId: [], // 巡检项多选
+  status: '1', // 默认启用
+  remark: ''
 });
 
+// 频率变化处理函数
+const handleFrequencyChange = () => {
+  // 切换频率类型时清空不相关的选择
+  if (createForm.frequencyType !== 'weekly') {
+    createForm.weekDay = '';
+  }
+  if (createForm.frequencyType !== 'monthly') {
+    createForm.monthDay = '';
+  }
+};
+
 // 创建计划表单验证规则
 const createFormRules = computed(() => ({
   planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
@@ -434,52 +624,130 @@ const createFormRules = computed(() => ({
   objectType: [{ required: true, message: '请选择对象类型', trigger: 'change' }],
   startDate: [{ required: true, message: '请选择开始日期', trigger: 'change' }],
   endDate: [{ required: true, message: '请选择结束日期', trigger: 'change' }],
-  startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
-  responsiblePerson: [{ required: true, message: '请选择负责人', trigger: 'change' }],
-  weekday: createForm.frequencyType === 'weekly' ? [{ required: true, message: '请选择周几', trigger: 'change' }] : [],
-  monthday: createForm.frequencyType === 'monthly' ? [{ required: true, message: '请选择几号', trigger: 'change' }] : []
+  frequencyType: [{ required: true, message: '请选择巡检频率', trigger: 'change' }],
+  weekDay: [
+    {
+      required: createForm.frequencyType === 'weekly',
+      message: '请选择周几',
+      trigger: 'change'
+    }
+  ],
+  monthDay: [
+    {
+      required: createForm.frequencyType === 'monthly',
+      message: '请选择几号',
+      trigger: 'change'
+    }
+  ],
+  planBeginTime: [{ required: true, message: '请选择计划开始时间', trigger: 'change' }],
+  duration: [
+    { required: true, message: '请输入持续时间', trigger: 'blur' },
+    { type: 'number', min: 1, message: '持续时间必须大于0', trigger: 'blur' }
+  ],
+  person: [{ required: true, message: '请选择负责人', trigger: 'change' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }]
 }));
 
-// 打开创建计划弹窗
-const handleCreate = () => {
+// 打开创建弹窗
+const handleCreate = async () => {
+  // 打开弹窗前先获取数据
+  await getUsersList();
+  await getInspectionItemsList();
   dialogVisible.value = true;
+  dialogTitle.value = '新建巡检计划';
 };
 
-// 提交创建计划
-const submitCreatePlan = () => {
-  console.log('提交创建计划:', createForm);
-  // 这里可以添加实际的创建计划逻辑
-  dialogVisible.value = false;
-  // 重置表单
-  Object.keys(createForm).forEach((key) => {
-    if (Array.isArray(createForm[key])) {
-      createForm[key] = [];
-    } else if (key === 'estimatedDuration') {
-      createForm[key] = 60;
-    } else if (key === 'frequencyType') {
-      createForm[key] = 'daily';
-    } else {
-      createForm[key] = '';
+// 提交创建/编辑计划
+const submitCreatePlan = async () => {
+  try {
+    const valid = await createFormRef.value.validate();
+    if (valid) {
+      // 构建频率描述
+      let frequencyDesc = '';
+      if (createForm.frequencyType === 'daily') {
+        frequencyDesc = '每天';
+      } else if (createForm.frequencyType === 'weekly') {
+        const weekdays = ['一', '二', '三', '四', '五', '六', '日'];
+        frequencyDesc = `每周${weekdays[createForm.weekDay - 1]}`;
+      } else if (createForm.frequencyType === 'monthly') {
+        frequencyDesc = `每月${createForm.monthDay}号`;
+      }
+
+      // 构建提交数据，匹配API接口要求
+      const submitData = {
+        projectId: 1,
+        createDept: 0, // 默认值
+        createBy: 0, // 默认值
+        createTime: editingId.value ? undefined : new Date().toISOString(), // 编辑时不更新创建时间
+        updateBy: 0, // 默认值
+        updateTime: new Date().toISOString(), // 当前时间
+        params: {}, // 空对象
+        planName: createForm.planName,
+        planType: createForm.planType,
+        objectType: createForm.objectType,
+        beginTime: createForm.startDate + 'T00:00:00.000Z', // 转换为ISO格式
+        endTime: createForm.endDate + 'T23:59:59.999Z', // 转换为ISO格式
+        inspectionFrequency: frequencyDesc, // 使用构建的频率描述
+        planBeginTime: createForm.planBeginTime,
+        duration: createForm.duration,
+        person: createForm.person,
+        inspectionItemId: createForm.inspectionItemId.length > 0 ? createForm.inspectionItemId.join(',') : '', // 转换为逗号隔开的字符串
+        status: createForm.status,
+        remark: createForm.remark || ''
+      };
+
+      // 如果是编辑模式，添加id字段
+      let response;
+      if (editingId.value) {
+        submitData.id = editingId.value;
+        // 调用更新巡检计划接口
+        response = await updatexunjian(submitData);
+      } else {
+        // 调用添加巡检计划接口
+        response = await addxunjian(submitData);
+      }
+
+      if (response.code === 200) {
+        ElMessage.success(editingId.value ? '更新成功' : '创建成功');
+        dialogVisible.value = false;
+        resetForm();
+        // 重新获取列表数据
+        getInspectionList();
+      } else {
+        ElMessage.error(response.msg || (editingId.value ? '更新失败' : '创建失败'));
+      }
     }
-  });
+  } catch (error) {
+    console.error(editingId.value ? '更新巡检计划失败:' : '创建巡检计划失败:', error);
+    ElMessage.error(editingId.value ? '更新失败，请重试' : '创建失败，请重试');
+  }
 };
 
 // 取消创建计划
 const cancelCreatePlan = () => {
   dialogVisible.value = false;
-  // 重置表单
-  Object.keys(createForm).forEach((key) => {
-    if (Array.isArray(createForm[key])) {
-      createForm[key] = [];
-    } else if (key === 'estimatedDuration') {
-      createForm[key] = 60;
-    } else if (key === 'frequencyType') {
-      createForm[key] = 'daily';
-    } else {
-      createForm[key] = '';
-    }
-  });
+  resetForm();
 };
+
+// 重置表单
+const resetForm = () => {
+  if (createFormRef.value) {
+    createFormRef.value.resetFields();
+    // 手动重置多选框等特殊字段
+    createForm.inspectionItemId = [];
+    createForm.duration = 60;
+    createForm.status = '1'; // 重置为默认启用
+    createForm.frequencyType = 'daily'; // 重置频率类型为每天
+    createForm.planType = ''; // 清空计划类型
+    createForm.weekDay = '';
+    createForm.monthDay = '';
+    // 重置编辑状态
+    editingId.value = '';
+    dialogTitle.value = '新建巡检计划';
+  }
+};
+
+// 导航相关方法
 const handleInspection1 = () => {
   router.push('/rili/rili');
 };
@@ -501,10 +769,11 @@ const handleInspection6 = () => {
 const handleInspection7 = () => {
   router.push('/rili/renyuanzhuangtai');
 };
+
+// 子选项卡相关方法
 const handleInspectionManagement1 = () => {
   router.push('/rili/InspectionManagement');
 };
-
 const handleInspectionManagement2 = () => {
   router.push('/rili/xunjianrenwu');
 };
@@ -514,7 +783,7 @@ const handleInspectionManagement3 = () => {
 </script>
 
 <style scoped>
-/* 样式保持不变 */
+/* 基础样式保持不变 */
 .operation-inspection {
   padding: 20px;
   background-color: #f5f7fa;
@@ -552,38 +821,6 @@ const handleInspectionManagement3 = () => {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
-.custom-tabs {
-  border-bottom: none;
-  padding-top: 20px;
-}
-
-.custom-tabs .el-tabs__header {
-  margin: 0 -20px 0 -20px;
-  padding: 0 20px;
-  border-bottom: 1px solid #e4e7ed;
-}
-
-.custom-tabs .el-tabs__nav-wrap::after {
-  height: 0;
-}
-
-.custom-tabs .el-tabs__item {
-  font-size: 14px;
-  color: #606266;
-  padding: 12px 20px;
-  margin-right: 20px;
-  border-bottom: 2px solid transparent;
-}
-
-.custom-tabs .el-tabs__item.is-active {
-  color: #409eff;
-  border-bottom-color: #409eff;
-}
-
-.custom-tabs .el-tabs__item:hover {
-  color: #409eff;
-}
-
 /* 筛选栏样式 */
 .filter-bar {
   background-color: #fff;
@@ -648,14 +885,6 @@ const handleInspectionManagement3 = () => {
   color: #303133;
 }
 
-.custom-table tr:hover {
-  background-color: #f5f7fa;
-}
-
-.custom-table tr.current-row {
-  background-color: #ecf5ff;
-}
-
 .status-tag {
   padding: 4px 8px;
   font-size: 12px;
@@ -673,6 +902,25 @@ const handleInspectionManagement3 = () => {
   background-color: #ecf5ff;
 }
 
+/* 操作按钮样式优化 */
+.text-danger {
+  color: #f56c6c !important;
+}
+
+.text-danger:hover {
+  color: #f78989 !important;
+  background-color: #fef0f0 !important;
+}
+
+.text-success {
+  color: #67c23a !important;
+}
+
+.text-success:hover {
+  color: #85ce61 !important;
+  background-color: #f0f9eb !important;
+}
+
 /* 分页区域样式 */
 .pagination-section {
   background-color: #fff;
@@ -689,32 +937,6 @@ const handleInspectionManagement3 = () => {
   color: #606266;
 }
 
-.pagination-controls .el-pagination {
-  margin: 0;
-}
-
-.pagination-controls .el-pagination__sizes {
-  margin-right: 20px;
-}
-
-.pagination-controls .el-pagination button {
-  min-width: 32px;
-  height: 32px;
-  line-height: 32px;
-  border-radius: 4px;
-}
-
-.pagination-controls .el-pagination .el-pager li {
-  min-width: 32px;
-  height: 32px;
-  line-height: 32px;
-  border-radius: 4px;
-}
-
-.pagination-controls .el-pagination .el-pager li.active {
-  background-color: #409eff;
-  color: #fff;
-}
 /* 导航栏样式 */
 .navigation-tabs {
   display: flex;
@@ -752,10 +974,42 @@ const handleInspectionManagement3 = () => {
   box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
 }
 
-.nav-tab {
-  cursor: pointer;
-  user-select: none;
+/* 弹窗样式 */
+.create-plan-dialog .el-dialog__body {
+  padding: 20px 30px;
+  max-height: 70vh;
+  overflow-y: auto;
 }
+
+.custom-form .el-form-item {
+  margin-bottom: 15px;
+}
+
+/* 频率选择样式 */
+.frequency-item .el-radio-group {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+  margin-bottom: 5px;
+}
+
+.frequency-radio {
+  padding: 5px 0;
+}
+
+/* 巡检项样式 */
+.inspection-item-group {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+/* 底部按钮样式 */
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
 /* 响应式设计 */
 @media (max-width: 1200px) {
   .filter-bar {
diff --git a/src/views/zhinengxunjian/index.vue b/src/views/zhinengxunjian/index.vue
index c2e5741..c575080 100644
--- a/src/views/zhinengxunjian/index.vue
+++ b/src/views/zhinengxunjian/index.vue
@@ -25,8 +25,6 @@
             <div class="calendar-controls">
               <!-- 月份选择器 -->
               <el-date-picker v-model="currentDate" type="month" placeholder="选择月份" style="width: 120px; margin-right: 15px" />
-
-              <el-button type="primary">添加</el-button>
               <el-button type="primary" @click="goToToday">今日</el-button>
               <el-button type="text" icon="el-icon-plus"></el-button>
             </div>
@@ -39,7 +37,7 @@
                 <div class="date-events">
                   <div v-for="event in getDayEvents(data.day)" :key="event.id" class="event-item" :class="'event-' + event.type">
                     <div class="event-title">{{ event.title }}</div>
-                    <div class="event-description">{{ event.description }}</div>
+                    <div class="event-describeValue">{{ event.describeValue }}</div>
                   </div>
                 </div>
               </div>
@@ -54,128 +52,48 @@
             <el-button type="primary" size="small" icon="el-icon-plus" @click="openAddTaskDialog">添加</el-button>
           </div>
 
-          <!-- 待办事项列表 -->
+          <!-- 待办事项列表 - 动态渲染 -->
           <div class="todo-list">
-            <!-- 待办项1 - 常规维护 -->
-            <div class="todo-item">
-              <div class="todo-color-indicator normal"></div>
-              <el-checkbox class="todo-checkbox"></el-checkbox>
+            <div
+              v-for="item in todoListData"
+              :key="item.id"
+              class="todo-item"
+              :class="{ 'important': item.taskLevel === '重要', 'completed': item.status === 2 }"
+            >
+              <div
+                class="todo-color-indicator"
+                :class="{
+                  normal: item.taskLevel === '常规项' && item.status !== 2,
+                  important: item.taskLevel === '重要' && item.status !== 2,
+                  urgent: item.taskLevel === '紧急' && item.status !== 2,
+                  completed: item.status === 2
+                }"
+              ></div>
+              <el-checkbox class="todo-checkbox" :checked="item.status === 2" @change="handleStatusChange(item, $event)"></el-checkbox>
               <div class="todo-content">
                 <div class="todo-main">
-                  <div class="todo-title">服务器例行检查</div>
-                  <div class="todo-time">09:00-10:00 AM</div>
+                  <div class="todo-title">{{ item.title }}</div>
+                  <div v-if="item.workTimeRange1 || item.workTimeRange2" class="todo-time">
+                    {{ item.workTimeRange1 }}
+                    <span v-if="item.workTimeRange1 && item.workTimeRange2">——</span>
+                    {{ item.workTimeRange2 }}
+                  </div>
                 </div>
-                <div class="todo-description">检查所有生产服务器的CPU、内存、磁盘使用率，确保正常运行</div>
+                <div class="todo-describeValue">{{ item.describeValue }}</div>
               </div>
               <div class="todo-actions">
-                <button class="action-btn edit-btn" @click="handleEdit">
+                <button class="action-btn edit-btn" @click="handleEdit(item.id)">
                   <img src="@/assets/images/xiugai.png" alt="编辑" class="action-icon" />
                 </button>
-                <button class="action-btn delete-btn" @click="handleDelete">
+                <button class="action-btn delete-btn" @click="handleDelete(item.id)">
                   <img src="@/assets/images/shanchu.png" alt="删除" class="action-icon" />
                 </button>
               </div>
             </div>
 
-            <!-- 待办项2 - 重要 -->
-            <div class="todo-item important">
-              <div class="todo-color-indicator important"></div>
-              <el-checkbox class="todo-checkbox"></el-checkbox>
-              <div class="todo-content">
-                <div class="todo-main">
-                  <div class="todo-title">数据库备份</div>
-                  <div class="todo-time">14:00-15:00 PM</div>
-                </div>
-                <div class="todo-description">主要数据库全备份，并验证备份文件完整性</div>
-              </div>
-              <div class="todo-actions">
-                <button class="action-btn edit-btn" @click="handleEdit">
-                  <img src="@/assets/images/xiugai.png" alt="编辑" class="action-icon" />
-                </button>
-                <button class="action-btn delete-btn" @click="handleDelete">
-                  <img src="@/assets/images/shanchu.png" alt="删除" class="action-icon" />
-                </button>
-              </div>
-            </div>
-
-            <!-- 待办项3 - 紧急 -->
-            <div class="todo-item">
-              <div class="todo-color-indicator urgent"></div>
-              <el-checkbox class="todo-checkbox"></el-checkbox>
-              <div class="todo-content">
-                <div class="todo-main">
-                  <div class="todo-title">网络设备固件更新</div>
-                  <div class="todo-time">18:00-20:00 PM</div>
-                </div>
-                <div class="todo-description">更新核心交换机和防火墙固件，需安排在业务低峰期</div>
-              </div>
-              <div class="todo-actions">
-                <button class="action-btn edit-btn" @click="handleEdit">
-                  <img src="@/assets/images/xiugai.png" alt="编辑" class="action-icon" />
-                </button>
-                <button class="action-btn delete-btn" @click="handleDelete">
-                  <img src="@/assets/images/shanchu.png" alt="删除" class="action-icon" />
-                </button>
-              </div>
-            </div>
-
-            <!-- 待办项4 - 常规维护 -->
-            <div class="todo-item">
-              <div class="todo-color-indicator normal"></div>
-              <el-checkbox class="todo-checkbox"></el-checkbox>
-              <div class="todo-content">
-                <div class="todo-main">
-                  <div class="todo-title">服务器例行检查</div>
-                  <div class="todo-time">08:00-09:00 AM</div>
-                </div>
-                <div class="todo-description">检查所有生产服务器的CPU、内存、磁盘使用率，确保正常运行</div>
-              </div>
-              <div class="todo-actions">
-                <button class="action-btn edit-btn" @click="handleEdit">
-                  <img src="@/assets/images/xiugai.png" alt="编辑" class="action-icon" />
-                </button>
-                <button class="action-btn delete-btn" @click="handleDelete">
-                  <img src="@/assets/images/shanchu.png" alt="删除" class="action-icon" />
-                </button>
-              </div>
-            </div>
-            <div class="todo-item">
-              <div class="todo-color-indicator normal"></div>
-              <el-checkbox class="todo-checkbox"></el-checkbox>
-              <div class="todo-content">
-                <div class="todo-main">
-                  <div class="todo-title">服务器例行检查</div>
-                  <div class="todo-time">06:00-07:00 AM</div>
-                </div>
-                <div class="todo-description">检查所有生产服务器的CPU、内存、磁盘使用率，确保正常运行</div>
-              </div>
-              <div class="todo-actions">
-                <button class="action-btn edit-btn" @click="handleEdit">
-                  <img src="@/assets/images/xiugai.png" alt="编辑" class="action-icon" />
-                </button>
-                <button class="action-btn delete-btn" @click="handleDelete">
-                  <img src="@/assets/images/shanchu.png" alt="删除" class="action-icon" />
-                </button>
-              </div>
-            </div>
-            <div class="todo-item">
-              <div class="todo-color-indicator normal"></div>
-              <el-checkbox class="todo-checkbox"></el-checkbox>
-              <div class="todo-content">
-                <div class="todo-main">
-                  <div class="todo-title">服务器例行检查</div>
-                  <div class="todo-time">06:00-07:00 AM</div>
-                </div>
-                <div class="todo-description">检查所有生产服务器的CPU、内存、磁盘使用率，确保正常运行</div>
-              </div>
-              <div class="todo-actions">
-                <button class="action-btn edit-btn" @click="handleEdit">
-                  <img src="@/assets/images/xiugai.png" alt="编辑" class="action-icon" />
-                </button>
-                <button class="action-btn delete-btn" @click="handleDelete">
-                  <img src="@/assets/images/shanchu.png" alt="删除" class="action-icon" />
-                </button>
-              </div>
+            <!-- 无数据时显示 -->
+            <div v-if="todoListData.length === 0" class="empty-todo">
+              <p>暂无待办事项</p>
             </div>
           </div>
 
@@ -192,8 +110,8 @@
           <el-form-item label="任务名称" prop="name">
             <el-input v-model="taskForm.name" placeholder="输入任务名称" class="form-input"></el-input>
           </el-form-item>
-          <el-form-item label="任务描述" prop="description">
-            <el-input v-model="taskForm.description" placeholder="输入任务描述" class="form-input"></el-input>
+          <el-form-item label="任务描述" prop="describeValue">
+            <el-input v-model="taskForm.describeValue" placeholder="输入任务描述" class="form-input"></el-input>
           </el-form-item>
           <el-form-item label="时间" prop="timeRange">
             <el-date-picker
@@ -205,8 +123,8 @@
               style="width: 100%"
             />
           </el-form-item>
-          <el-form-item label="优先级" prop="priority">
-            <el-select v-model="taskForm.priority" placeholder="选择优先级" class="form-input">
+          <el-form-item label="优先级" prop="taskLevel">
+            <el-select v-model="taskForm.taskLevel" placeholder="选择优先级" class="form-input">
               <el-option label="常规项" value="常规项"></el-option>
               <el-option label="重要" value="重要"></el-option>
               <el-option label="紧急" value="紧急"></el-option>
@@ -214,12 +132,37 @@
           </el-form-item>
           <el-form-item label="任务类型" prop="taskType">
             <el-select v-model="taskForm.taskType" placeholder="选择任务类型" class="form-input">
-              <el-option label="常规维护" value="常规维护"></el-option>
-              <el-option label="安全巡检" value="安全巡检"></el-option>
-              <el-option label="系统升级" value="系统升级"></el-option>
-              <el-option label="数据备份" value="数据备份"></el-option>
+              <el-option label="常规维护" value="1"></el-option>
+              <el-option label="安全巡检" value="2"></el-option>
+              <el-option label="系统升级" value="3"></el-option>
+              <el-option label="数据备份" value="4"></el-option>
             </el-select>
           </el-form-item>
+          <!-- 新增：工作时间段选择器 -->
+          <el-form-item label="工作时间段1" prop="workTimeRange1">
+            <el-time-picker
+              v-model="taskForm.workTimeRange1"
+              type="timerange"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              format="HH:mm"
+              value-format="HH:mm"
+              class="form-input"
+              style="width: 100%"
+            />
+          </el-form-item>
+          <el-form-item label="工作时间段2" prop="workTimeRange2">
+            <el-time-picker
+              v-model="taskForm.workTimeRange2"
+              type="timerange"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              format="HH:mm"
+              value-format="HH:mm"
+              class="form-input"
+              style="width: 100%"
+            />
+          </el-form-item>
         </el-form>
         <template #footer>
           <el-button @click="closeDialog">取消</el-button>
@@ -231,9 +174,10 @@
 </template>
 
 <script setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import router from '@/router';
 import TitleComponent from './TitleComponent.vue';
+import { daibanlist, adddaiban, updatedaiban, deldaiban } from '@/api/zhinengxunjian/daiban/index';
 
 // 默认显示当前月份
 const currentDate = ref(new Date());
@@ -244,46 +188,144 @@ const years = ref([]);
 const selectedYear = ref(currentDate.value.getFullYear());
 const selectedMonth = ref(currentDate.value.getMonth() + 1);
 
-// 减少月份
-const decreaseMonth = () => {
-  const date = new Date(currentDate.value);
-  date.setMonth(date.getMonth() - 1);
-  currentDate.value = date;
-  updateYearAndMonth();
-};
-
-// 增加月份
-const increaseMonth = () => {
-  const date = new Date(currentDate.value);
-  date.setMonth(date.getMonth() + 1);
-  currentDate.value = date;
-  updateYearAndMonth();
-};
-
 // 回到今天
 const goToToday = () => {
   currentDate.value = new Date();
   updateYearAndMonth();
 };
 
-// 日历事件数据 - 2025年9月的随机事件
-const calendarEvents = ref([
-  // 服务维护事件
-  { id: 1, date: '2025-09-11', title: '服务维护', description: '维护公司内部服务器', type: 'service' },
-  { id: 2, date: '2025-09-28', title: '服务维护', description: '先所有旧服务器部署新内存', type: 'service' },
+// 根据workTimeRange1和workTimeRange2生成taskTimeInfo字符串
+const getTaskTimeInfoString = () => {
+  const timeInfoArray = [];
 
-  // 数据库管理事件
-  { id: 3, date: '2025-09-21', title: '数据库管理', description: '定期执行数据库优化', type: 'database' },
-  { id: 4, date: '2025-09-30', title: '数据库管理', description: '大型数据库备份策略', type: 'database' },
+  // 处理工作时间段1 - 更宽松的类型处理
+  if (taskForm.value.workTimeRange1) {
+    if (Array.isArray(taskForm.value.workTimeRange1)) {
+      // 如果是数组，直接拼接
+      timeInfoArray.push(taskForm.value.workTimeRange1.join('-'));
+    } else if (typeof taskForm.value.workTimeRange1 === 'string') {
+      // 如果已经是字符串，直接使用
+      timeInfoArray.push(taskForm.value.workTimeRange1);
+    }
+  }
 
-  // 网络维护事件
-  { id: 5, date: '2025-09-05', title: '网络维护', description: '网络设备例行检查', type: 'network' },
-  { id: 6, date: '2025-09-15', title: '网络维护', description: '更新网络安全策略', type: 'network' },
+  // 处理工作时间段2 - 更宽松的类型处理
+  if (taskForm.value.workTimeRange2) {
+    if (Array.isArray(taskForm.value.workTimeRange2)) {
+      // 如果是数组，直接拼接
+      timeInfoArray.push(taskForm.value.workTimeRange2.join('-'));
+    } else if (typeof taskForm.value.workTimeRange2 === 'string') {
+      // 如果已经是字符串，直接使用
+      timeInfoArray.push(taskForm.value.workTimeRange2);
+    }
+  }
 
-  // 系统升级事件
-  { id: 7, date: '2025-09-18', title: '系统升级', description: '核心系统版本升级', type: 'upgrade' },
-  { id: 8, date: '2025-09-25', title: '系统升级', description: '应用服务升级部署', type: 'upgrade' }
-]);
+  // 合并多个时间段为一个字符串，用逗号分隔
+  return timeInfoArray.join(',');
+};
+
+// 待办事项数据 - 从接口获取
+const todoListData = ref([]);
+const calendarEvents = ref([]);
+
+// 格式化日期为YYYY-MM-DD格式
+const formatDate = (date) => {
+  if (!date) return '';
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  return `${year}-${month}-${day}`;
+};
+
+// 格式化时间范围
+const formatTimeRange = (startTime, endTime) => {
+  if (!startTime || !endTime) return '';
+  const start = new Date(startTime);
+  const end = new Date(endTime);
+  const formatHourMinute = (date) => {
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${hours}:${minutes}`;
+  };
+  return `${formatHourMinute(start)}-${formatHourMinute(end)}`;
+};
+
+// 从接口获取数据并处理 - 根据实际返回格式修正版
+const fetchData = async () => {
+  try {
+    const response = await daibanlist();
+    console.log('接口原始返回:', response); // 打印原始响应，便于调试
+
+    // 初始化数据数组
+    let data = [];
+
+    // 根据实际返回格式提取数据，数据在response.rows中
+    if (response && Array.isArray(response.rows)) {
+      data = response.rows;
+    } else if (response.data && Array.isArray(response.data.rows)) {
+      // 兼容可能的嵌套结构
+      data = response.data.rows;
+    } else {
+      console.warn('接口返回格式不符合预期，使用空数组', response);
+      data = [];
+    }
+
+    // 处理待办列表数据
+    todoListData.value = data.map((item) => ({
+      id: item.id,
+      title: item.taskName,
+      describeValue: item.describeValue,
+      timeRange: formatTimeRange(item.taskBeginTime, item.taskEndTime),
+      // 保存原始时间用于编辑
+      originalTimeRange: [new Date(item.taskBeginTime), new Date(item.taskEndTime)],
+      taskLevel: item.taskLevel === '1' ? '常规项' : item.taskLevel === '2' ? '紧急' : '重要',
+      // 注意：根据返回数据调整了taskLevel映射，原代码可能颠倒了重要和紧急
+      taskType: item.taskType,
+      // 从taskTimeInfo获取时间段数据，格式为"17:00,20:00"
+      workTimeRange1: item.taskTimeInfo ? item.taskTimeInfo.split(',')[0] || '' : '',
+      workTimeRange2: item.taskTimeInfo && item.taskTimeInfo.split(',').length > 1 ? item.taskTimeInfo.split(',')[1] : '',
+      date: formatDate(item.taskBeginTime),
+      status: item.status || 1 // 添加状态字段，默认1表示未完成
+    }));
+
+    // 确保每个项目都有status字段
+    todoListData.value.forEach((item) => {
+      if (item.status === undefined) {
+        item.status = 1; // 默认未完成
+      }
+    });
+
+    // 处理日历事件数据
+    calendarEvents.value = data.map((item) => ({
+      id: item.id,
+      date: formatDate(item.taskBeginTime),
+      title: item.taskName,
+      describeValue: item.describeValue,
+      type: getEventType(item.taskType),
+      status: item.status // 添加状态信息
+    }));
+
+    console.log('数据处理完成，共', data.length, '条记录');
+  } catch (error) {
+    console.error('获取待办数据失败:', error);
+    // 出错时确保数据是数组，避免页面报错
+    todoListData.value = [];
+    calendarEvents.value = [];
+  }
+};
+
+// 根据任务类型获取事件类型
+const getEventType = (taskType) => {
+  // 任务类型映射: 1-常规维护, 2-安全巡检, 3-系统升级, 4-数据备份
+  const typeMap = {
+    '1': 'service', // 常规维护对应service
+    '2': 'database', // 安全巡检对应database
+    '3': 'upgrade', // 系统升级对应upgrade
+    '4': 'network' // 数据备份对应network
+  };
+  return typeMap[taskType] || 'service';
+};
 
 // 获取指定日期的事件
 const getDayEvents = (dateStr) => {
@@ -315,18 +357,39 @@ watch(currentDate, (newDate) => {
 // 初始化年份和月份
 updateYearAndMonth();
 
+// 组件挂载时获取数据
+onMounted(() => {
+  fetchData();
+});
+
 // 弹窗相关状态管理
 const dialogVisible = ref(false);
 const taskForm = ref({
   name: '',
-  description: '',
-  timeRange: '',
-  priority: '常规项',
-  taskType: '常规维护'
+  describeValue: '',
+  timeRange: null,
+  taskLevel: '常规项',
+  taskType: '1', // 默认值为1（常规维护）
+  workTimeRange1: null, // 工作时间段1
+  workTimeRange2: null // 工作时间段2
 });
 
+// 当前编辑的任务ID，为null表示新建模式
+const editingTaskId = ref(null);
+
 // 打开添加任务弹窗
 const openAddTaskDialog = () => {
+  // 重置表单为新建状态
+  editingTaskId.value = null;
+  taskForm.value = {
+    name: '',
+    describeValue: '',
+    timeRange: null,
+    taskLevel: '常规项',
+    taskType: '1',
+    workTimeRange1: null,
+    workTimeRange2: null
+  };
   dialogVisible.value = true;
 };
 
@@ -336,30 +399,241 @@ const closeDialog = () => {
 };
 
 // 保存任务
-const saveTask = () => {
-  // 这里可以添加表单验证和保存逻辑
-  console.log('保存任务:', taskForm.value);
-  // 重置表单
-  taskForm.value = {
-    name: '',
-    description: '',
-    timeRange: '',
-    priority: '常规项',
-    taskType: '常规维护'
-  };
-  // 关闭弹窗
-  closeDialog();
+const saveTask = async () => {
+  // 表单验证
+  if (!taskForm.value.name || !taskForm.value.describeValue || !taskForm.value.timeRange) {
+    // 使用Element Plus的消息提示
+    ElMessage.warning('请填写必要的任务信息');
+    return;
+  }
+
+  // 验证工作时间段
+  if (!taskForm.value.workTimeRange1 && !taskForm.value.workTimeRange2) {
+    ElMessage.warning('请至少填写一个工作时间段');
+    return;
+  }
+
+  try {
+    // 构建接口所需的数据结构
+    const apiData = {
+      createDept: 0, // 根据实际情况设置
+      createBy: 0, // 根据实际情况设置
+      createTime: new Date().toISOString(),
+      updateBy: 0, // 根据实际情况设置
+      updateTime: new Date().toISOString(),
+      params: {
+        property1: 'string',
+        property2: 'string'
+      },
+
+      projectId: 0, // 根据实际情况设置
+      taskName: taskForm.value.name,
+      describeValue: taskForm.value.describeValue,
+      taskBeginTime: taskForm.value.timeRange[0].toISOString(),
+      taskEndTime: taskForm.value.timeRange[1].toISOString(),
+      // 使用taskTimeInfo替代workTimeRange1和workTimeRange2，通过字符串拼接开始和结束时间
+      taskTimeInfo: getTaskTimeInfoString(),
+      taskLevel: taskForm.value.taskLevel === '常规项' ? '1' : taskForm.value.taskLevel === '重要' ? '3' : '2',
+      taskType: taskForm.value.taskType
+    };
+
+    let response;
+    // 判断是新增还是编辑
+    if (editingTaskId.value) {
+      // 编辑操作 - 修改参数传递方式，将id合并到apiData中
+      response = await updatedaiban({ ...apiData, id: editingTaskId.value });
+
+      // 更新本地数据
+      const index = todoListData.value.findIndex((item) => item.id === editingTaskId.value);
+      if (index !== -1) {
+        todoListData.value[index] = {
+          ...todoListData.value[index],
+          title: taskForm.value.name,
+          describeValue: taskForm.value.describeValue,
+          timeRange: formatTimeRange(taskForm.value.timeRange[0], taskForm.value.timeRange[1]),
+          originalTimeRange: taskForm.value.timeRange,
+          taskLevel: taskForm.value.taskLevel,
+          taskType: taskForm.value.taskType,
+          // 保留原有字段以便前端显示，添加类型检查
+          workTimeRange1: taskForm.value.workTimeRange1
+            ? Array.isArray(taskForm.value.workTimeRange1)
+              ? taskForm.value.workTimeRange1.join('-')
+              : taskForm.value.workTimeRange1
+            : '',
+          workTimeRange2: taskForm.value.workTimeRange2
+            ? Array.isArray(taskForm.value.workTimeRange2)
+              ? taskForm.value.workTimeRange2.join('-')
+              : taskForm.value.workTimeRange2
+            : ''
+        };
+      }
+
+      // 更新日历事件
+      const eventIndex = calendarEvents.value.findIndex((item) => item.id === editingTaskId.value);
+      if (eventIndex !== -1) {
+        calendarEvents.value[eventIndex] = {
+          ...calendarEvents.value[eventIndex],
+          title: taskForm.value.name,
+          describeValue: taskForm.value.describeValue,
+          type: getEventType(taskForm.value.taskType)
+        };
+      }
+
+      ElMessage.success('任务更新成功');
+    } else {
+      // 新增操作
+      response = await adddaiban(apiData);
+      console.log('保存任务成功:', response);
+
+      // 获取当前日期
+      const currentDateStr = formatDate(new Date());
+
+      // 从接口响应中获取任务ID（如果返回）
+      const newId = response.data?.id || Date.now();
+
+      // 构建新任务对象添加到本地数据中
+      const newTask = {
+        id: newId,
+        title: taskForm.value.name,
+        describeValue: taskForm.value.describeValue,
+        timeRange: formatTimeRange(taskForm.value.timeRange[0], taskForm.value.timeRange[1]),
+        originalTimeRange: taskForm.value.timeRange,
+        taskLevel: taskForm.value.taskLevel,
+        taskType: taskForm.value.taskType,
+        // 保留原有字段以便前端显示，添加类型检查
+        workTimeRange1: taskForm.value.workTimeRange1
+          ? Array.isArray(taskForm.value.workTimeRange1)
+            ? taskForm.value.workTimeRange1.join('-')
+            : taskForm.value.workTimeRange1
+          : '',
+        workTimeRange2: taskForm.value.workTimeRange2
+          ? Array.isArray(taskForm.value.workTimeRange2)
+            ? taskForm.value.workTimeRange2.join('-')
+            : taskForm.value.workTimeRange2
+          : '',
+        date: currentDateStr
+      };
+
+      // 添加到待办列表
+      todoListData.value.unshift(newTask);
+
+      // 添加到日历事件
+      calendarEvents.value.push({
+        id: newId,
+        date: currentDateStr,
+        title: taskForm.value.name,
+        describeValue: taskForm.value.describeValue,
+        type: getEventType(taskForm.value.taskType)
+      });
+
+      ElMessage.success('任务添加成功');
+    }
+
+    // 重置表单
+    taskForm.value = {
+      name: '',
+      describeValue: '',
+      timeRange: null,
+      taskLevel: '常规项',
+      taskType: '1',
+      workTimeRange1: null,
+      workTimeRange2: null
+    };
+
+    // 重置编辑状态
+    editingTaskId.value = null;
+
+    // 关闭弹窗
+    closeDialog();
+  } catch (error) {
+    console.error('保存任务失败:', error);
+    ElMessage.error('保存任务失败，请重试');
+  }
+};
+
+// 处理状态变更
+const handleStatusChange = async (item, checked) => {
+  try {
+    // 更新本地状态
+    item.status = checked ? 2 : 1;
+
+    // 直接更新相关的日历事件以反映状态变化
+    const calendarEvent = calendarEvents.value.find((event) => event.id === item.id);
+    if (calendarEvent) {
+      calendarEvent.status = item.status;
+    }
+
+    // 这里可以添加API调用，更新后端状态
+    // await updateTaskStatus(item.id, item.status);
+
+    console.log('任务状态已更新:', item.id, '状态:', item.status);
+  } catch (error) {
+    console.error('更新任务状态失败:', error);
+    ElMessage.error('更新任务状态失败，请重试');
+    // 恢复原始状态
+    item.status = checked ? 1 : 2;
+  }
 };
 
 // 编辑和删除处理函数
-const handleEdit = () => {
-  console.log('执行编辑操作');
-  // 保留原有编辑逻辑
-};
+const handleEdit = (id) => {
+  console.log('执行编辑操作:', id);
+  // 找到对应的数据项
+  const item = todoListData.value.find((item) => item.id === id);
+  if (item) {
+    // 存储编辑的任务ID
+    editingTaskId.value = id;
+    // 填充表单数据，使用原始时间范围
+    // 处理工作时间段格式：如果是字符串格式(如"HH:mm-HH:mm")，则转换为数组格式
+    let workTimeRange1 = item.workTimeRange1;
+    let workTimeRange2 = item.workTimeRange2;
 
-const handleDelete = () => {
-  console.log('执行删除操作');
-  // 保留原有删除逻辑
+    if (typeof workTimeRange1 === 'string' && workTimeRange1.includes('-')) {
+      workTimeRange1 = workTimeRange1.split('-');
+    }
+
+    if (typeof workTimeRange2 === 'string' && workTimeRange2.includes('-')) {
+      workTimeRange2 = workTimeRange2.split('-');
+    }
+
+    taskForm.value = {
+      name: item.title,
+      describeValue: item.describeValue,
+      timeRange: item.originalTimeRange, // 使用保存的原始时间对象
+      taskLevel: item.taskLevel,
+      taskType: item.taskType,
+      workTimeRange1: workTimeRange1,
+      workTimeRange2: workTimeRange2
+    };
+    // 打开弹窗
+    dialogVisible.value = true;
+  }
+};
+const handleDelete = (id) => {
+  console.log('执行删除操作:', id);
+  ElMessageBox.confirm('确定要删除这个任务吗？', '删除确认', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async () => {
+      try {
+        // 对于单个ID，直接作为路径参数传递
+        // 接口要求格式: /ops/matter/{ids}，这里ids是单个ID
+        await deldaiban(id);
+
+        // 前端删除同步
+        todoListData.value = todoListData.value.filter((item) => item.id !== id);
+        calendarEvents.value = calendarEvents.value.filter((item) => item.id !== id);
+        ElMessage.success('任务已删除');
+      } catch (error) {
+        console.error('删除任务失败:', error);
+        ElMessage.error('删除任务失败，请重试');
+      }
+    })
+    .catch(() => {
+      ElMessage.info('已取消删除');
+    });
 };
 
 const handleInspection1 = () => {
@@ -403,6 +677,16 @@ const handleInspection7 = () => {
   padding: 2px;
 }
 
+/* 已完成任务的样式 */
+.todo-color-indicator.completed {
+  background-color: #dcdfe6;
+}
+
+.todo-item.completed .todo-content {
+  color: #909399;
+  text-decoration: line-through;
+}
+
 .nav-tab {
   padding: 12px 24px;
   cursor: pointer;
@@ -570,11 +854,6 @@ const handleInspection7 = () => {
   overflow: hidden;
 }
 
-/* 重要任务的背景色 */
-.todo-item.important {
-  background-color: #e6f7ff;
-}
-
 .todo-checkbox {
   margin-top: 2px;
   flex-shrink: 0;
@@ -604,7 +883,7 @@ const handleInspection7 = () => {
   color: #909399;
 }
 
-.todo-description {
+.todo-describeValue {
   font-size: 12px;
   color: #606266;
   line-height: 1.4;
@@ -612,7 +891,7 @@ const handleInspection7 = () => {
 
 .todo-actions {
   position: absolute;
-  right: -80px;
+  right: -120px;
   top: 0;
   bottom: 0;
   display: flex;
@@ -653,7 +932,7 @@ const handleInspection7 = () => {
 
 /* 内容区域平移以给按钮留出空间 */
 .todo-item:hover .todo-content {
-  transform: translateX(-80px);
+  transform: translateX(-120px);
 }
 
 .action-icon {
@@ -667,6 +946,18 @@ const handleInspection7 = () => {
   gap: 12px;
 }
 
+/* 空状态样式 */
+.empty-todo {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  color: #909399;
+  font-size: 14px;
+  background-color: #fafafa;
+  border-radius: 4px;
+}
+
 .status-legend {
   display: flex;
   gap: 20px;
@@ -809,7 +1100,7 @@ const handleInspection7 = () => {
   text-overflow: ellipsis;
 }
 
-.event-description {
+.event-describeValue {
   font-size: 11px;
   white-space: nowrap;
   overflow: hidden;
diff --git a/src/views/zhinengxunjian/shiyanguanli.vue b/src/views/zhinengxunjian/shiyanguanli.vue
index 97ca149..c40f0a1 100644
--- a/src/views/zhinengxunjian/shiyanguanli.vue
+++ b/src/views/zhinengxunjian/shiyanguanli.vue
@@ -795,36 +795,40 @@ const addEquipment = () => {
   background-color: #f9fbfd;
   min-height: 100vh;
 }
-
-/* 2. 顶部导航选项卡 */
 .navigation-tabs {
   display: flex;
+  margin-bottom: 20px;
   background-color: #fff;
   border-radius: 4px;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  margin-bottom: 20px;
-  overflow: hidden;
+  padding: 2px;
 }
+
 .nav-tab {
   padding: 12px 24px;
   cursor: pointer;
-  transition: all 0.2s;
+  transition: all 0.3s ease;
+  border-radius: 4px;
   font-size: 14px;
-  color: #6b7280;
+  color: #606266;
+  border-right: 1px solid #f0f0f0;
   flex: 1;
   text-align: center;
-  border-right: 1px solid #f0f0f0;
 }
+
 .nav-tab:last-child {
   border-right: none;
 }
-.nav-tab:hover:not(.active) {
-  background-color: #f3f4f6;
+
+.nav-tab:hover {
+  color: #409eff;
+  background-color: #ecf5ff;
 }
+
 .nav-tab.active {
-  background-color: #165dff;
+  background-color: #409eff;
   color: #fff;
-  font-weight: 500;
+  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
 }
 
 /* 3. 页面标题（与试验系统一致） */
diff --git a/src/views/zhinengxunjian/shiyanjilu.vue b/src/views/zhinengxunjian/shiyanjilu.vue
index a7f6ee1..5e29f4e 100644
--- a/src/views/zhinengxunjian/shiyanjilu.vue
+++ b/src/views/zhinengxunjian/shiyanjilu.vue
@@ -807,35 +807,36 @@ const handleInspectionManagement3 = () => {
 
 .progress-line {
   flex: 1;
-  height: 2px;
-  background-color: #e5e7eb;
+  height: 0;
+  border-top: 2px dashed #e5e7eb;
+  margin: 10px 0;
 }
 
 .progress-step.active .step-number {
-  background-color: #165dff;
+  background-color: #10b981;
   color: white;
 }
 
 .progress-step.active .step-name {
-  color: #165dff;
+  color: #10b981;
   font-weight: 500;
 }
 
 .progress-line.active {
-  background-color: #165dff;
+  border-top-color: #10b981;
 }
 
 .progress-step.failed .step-number {
-  background-color: #dc2626;
+  background-color: red;
   color: white;
 }
 
 .progress-step.failed .step-name {
-  color: #dc2626;
+  color: red;
 }
 
 .progress-line.failed {
-  background-color: #dc2626;
+  border-top-color: red;
 }
 
 /* 15. 试验结果样式 */
diff --git a/src/views/zhinengxunjian/shiyanrenwu.vue b/src/views/zhinengxunjian/shiyanrenwu.vue
index 644dc56..8d5c1ad 100644
--- a/src/views/zhinengxunjian/shiyanrenwu.vue
+++ b/src/views/zhinengxunjian/shiyanrenwu.vue
@@ -3,8 +3,8 @@
     <div class="inspection-tasks">
       <div class="navigation-tabs">
         <div class="nav-tab" @click="handleInspection1">待办事项</div>
-        <div class="nav-tab active" @click="handleInspection2">巡检管理</div>
-        <div class="nav-tab" @click="handleInspection3">试验管理</div>
+        <div class="nav-tab" @click="handleInspection2">巡检管理</div>
+        <div class="nav-tab active" @click="handleInspection3">试验管理</div>
         <div class="nav-tab" @click="handleInspection4">报修管理</div>
         <div class="nav-tab" @click="handleInspection5">抢修管理</div>
         <div class="nav-tab" @click="handleInspection6">工单管理</div>
@@ -17,9 +17,9 @@
       <!-- 选项卡 -->
       <div class="tabs-wrapper">
         <div style="display: flex; align-items: center; gap: 10px">
-          <el-button type="primary" @click="handleInspectionManagement1">巡检计划</el-button>
-          <el-button type="primary" @click="handleInspectionManagement2">巡检任务</el-button>
-          <el-button type="primary" @click="handleInspectionManagement3">巡检记录</el-button>
+          <el-button type="primary" @click="handleInspectionManagement1">试验计划</el-button>
+          <el-button type="primary" @click="handleInspectionManagement2">试验任务</el-button>
+          <el-button type="primary" @click="handleInspectionManagement3">试验记录</el-button>
         </div>
       </div>
 
@@ -418,14 +418,14 @@ const handleView = (task) => {
 };
 
 const handleInspectionManagement1 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/rili/shiyanguanli');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/xunjianrenwu');
+  router.push('/rili/shiyanrenwu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/xunjianjihua');
+  router.push('/rili/shiyanjilu');
 };
 const handleInspection1 = () => {
   router.push('/rili/rili');