diff --git a/gear-ui3/src/api/oa/attendanceRecord.js b/gear-ui3/src/api/oa/attendanceRecord.js
index 5b1ccc7..0ee3fa8 100644
--- a/gear-ui3/src/api/oa/attendanceRecord.js
+++ b/gear-ui3/src/api/oa/attendanceRecord.js
@@ -42,3 +42,17 @@ export function delAttendanceRecord(recordId) {
     method: 'delete'
   })
 }
+
+// /**
+//  * 
+//  * @param {*} params.startTime  开始时间
+//  * @param {*} params.endTime    结束时间
+//  * @returns 
+//  */
+// export function getMonthlyAttendance(params) {
+//   return request({
+//     url: '/oa/attendance/monthly',
+//     method: 'get',
+//     params
+//   })
+// }
diff --git a/gear-ui3/src/api/oa/projectReport.js b/gear-ui3/src/api/oa/projectReport.js
new file mode 100644
index 0000000..9d55863
--- /dev/null
+++ b/gear-ui3/src/api/oa/projectReport.js
@@ -0,0 +1,130 @@
+import request from '@/utils/request';
+
+// 查询项目报工列表
+export function listProjectReport(query) {
+  return request({
+    url: '/oa/projectReport/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询项目报工详细
+export function getProjectReport(reportId) {
+  return request({
+    url: '/oa/projectReport/' + reportId,
+    method: 'get'
+  })
+}
+
+// 查询项目报工详细
+export function getCardData() {
+  return request({
+    url: '/oa/projectReport/card',
+    method: 'get'
+  })
+}
+
+// 查询项目报工详细
+export function getTrendData(start,end) {
+  return request({
+    url: '/oa/projectReport/trend',
+    method: 'get',
+    params: {
+      start:start,
+      end:end
+    }
+  })
+}
+
+// 查询项目报工详细
+export function getRankData(start,end) {
+  return request({
+    url: '/oa/projectReport/rank',
+    method: 'get',
+    params: {
+      start:start,
+      end:end
+    }
+  })
+}// 查询项目报工详细
+export function getSummaryList(start,end) {
+  return request({
+    url: '/oa/projectReport/summary',
+    method: 'get',
+    params: {
+      start:start,
+      end:end
+    }
+  })
+}
+
+// 查询项目报工详细
+export function getProjectData(start,end) {
+  return request({
+    url: '/oa/projectReport/projects',
+    method: 'get',
+    params: {
+      start:start,
+      end:end
+    }
+  })
+}
+// 查询项目报工详细
+export function listClearProjectReport(start,end) {
+  return request({
+    url: '/oa/projectReport/report',
+    method: 'get',
+    params: {
+      start:start,
+      end:end
+    }
+  })
+}
+// 查询项目报工详细
+export function getPieData(start,end) {
+  return request({
+    url: '/oa/projectReport/distribution',
+    method: 'get',
+    params: {
+      start:start,
+      end:end
+    }
+  })
+}
+
+// 新增项目报工
+export function addProjectReport(data) {
+  return request({
+    url: '/oa/projectReport',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改项目报工
+export function updateProjectReport(data) {
+  return request({
+    url: '/oa/projectReport',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除项目报工
+export function delProjectReport(reportId) {
+  return request({
+    url: '/oa/projectReport/' + reportId,
+    method: 'delete'
+  })
+}
+
+// 导出项目报工数据
+export function exportProjectReport(params) {
+  return request({
+    url: '/oa/projectReport/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob'
+  })
+}
diff --git a/gear-ui3/src/components/UserSelect/index.vue b/gear-ui3/src/components/UserSelect/index.vue
index 5bbe4fb..2decde4 100644
--- a/gear-ui3/src/components/UserSelect/index.vue
+++ b/gear-ui3/src/components/UserSelect/index.vue
@@ -64,7 +64,7 @@ const loadData = async () => {
 
     // 转换用户数据
     const transformedUserList = userList.map(user => ({
-      id: `user_${user.userId}`,
+      id: `${user.userId}`,
       label: user.nickName || user.userName,
       parentId: `dept_${user.deptId}`,
       type: 'user'
diff --git a/gear-ui3/src/utils/index.js b/gear-ui3/src/utils/index.js
index 9329fe2..046b5bc 100644
--- a/gear-ui3/src/utils/index.js
+++ b/gear-ui3/src/utils/index.js
@@ -1,4 +1,4 @@
-import { parseTime } from './ruoyi'
+import { parseTime } from './gear'
 
 /**
  * 表格时间格式化
diff --git a/gear-ui3/src/views/info/report/components/ProjectReportDetail.vue b/gear-ui3/src/views/info/report/components/ProjectReportDetail.vue
new file mode 100644
index 0000000..52dacfb
--- /dev/null
+++ b/gear-ui3/src/views/info/report/components/ProjectReportDetail.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    width="860px"
+    custom-class="project-report-detail"
+    :before-close="handleClose"
+    append-to-body
+  >
+    <template #title>
+      <div class="dialog-title flex items-center gap-2">
+        <i class="el-icon-document"></i>
+        <span>项目报工详情</span>
+      </div>
+    </template>
+
+    <!-- 打印 / 导出区域 -->
+    <div ref="printArea">
+      <el-scrollbar style="max-height: 70vh; padding-right: 8px">
+        <!-- 基本信息 -->
+        <el-card shadow="never" class="mb-6">
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="经办人">{{ data.nickName }}</el-descriptions-item>
+            <el-descriptions-item label="部门">{{ data.deptName }}</el-descriptions-item>
+            <el-descriptions-item label="工作地点">{{ data.workPlace }}</el-descriptions-item>
+            <el-descriptions-item label="是否出差">
+              <el-tag :type="data.isTrip === 1 ? 'success' : 'info'" size="mini">
+                {{ data.isTrip === 1 ? '是' : '否' }}
+              </el-tag>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+
+        <!-- 项目信息 -->
+        <el-card shadow="never" class="mb-6">
+          <template #header>
+            <div class="card-header">项目信息</div>
+          </template>
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="项目名称" :span="2">{{ data.projectName }}</el-descriptions-item>
+            <el-descriptions-item label="项目编号">{{ data.projectNum }}</el-descriptions-item>
+            <el-descriptions-item label="项目代号">{{ data.projectCode }}</el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+
+        <!-- 报工内容（富文本） -->
+        <el-card shadow="never" class="mb-6 rich-card">
+          <template #header>
+            <div class="card-header">报工内容</div>
+          </template>
+          <div class="rich-text" v-html="safeContent"></div>
+        </el-card>
+
+        <!-- 备注 -->
+        <el-card shadow="never">
+          <template #header>
+            <div class="card-header">备注</div>
+          </template>
+          <p class="text-gray-700 whitespace-pre-line">{{ data.remark || '—' }}</p>
+        </el-card>
+      </el-scrollbar>
+    </div>
+
+    <!-- Footer -->
+    <template #footer>
+      <el-button @click="handlePrint" size="mini">打印</el-button>
+      <el-button @click="handleDownload" size="mini">下载 PDF</el-button>
+      <el-button @click="visible = false" type="primary" size="mini">关 闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+// import DOMPurify from 'dompurify'
+export default {
+  name: 'ProjectReportDetail',
+  props: {
+    value: { type: Boolean, default: false }, // v-model
+    record: { type: Object, required: true }
+  },
+  data() {
+    return { visible: this.value }
+  },
+  computed: {
+    data() {
+      return this.record || {}
+    },
+    safeContent() {
+      return this.data.content || ''
+      // return DOMPurify.sanitize(this.data.content || '')
+    }
+  },
+  watch: {
+    value(v) { this.visible = v },
+    visible(v) { this.$emit('input', v) }
+  },
+  methods: {
+    handleClose() { this.visible = false },
+    /** 直接打印弹窗内容 */
+    handlePrint() {
+      const printContent = this.$refs.printArea
+      const printWindow = window.open('', '', 'width=1000,height=800')
+      printWindow.document.write('<html><head><title>打印</title>')
+      printWindow.document.write('<style>@page{size:auto;margin:20mm;}body{font-family:Arial;} .el-scrollbar__wrap{overflow:visible !important;}</style>')
+      printWindow.document.write('</head><body>')
+      printWindow.document.write(printContent.innerHTML)
+      printWindow.document.write('</body></html>')
+      printWindow.document.close()
+      printWindow.focus()
+      printWindow.print()
+      printWindow.close()
+    },
+    /** 下载为 PDF：动态引入 html2pdf.js */
+    async handleDownload() {
+      // const { default: html2pdf } = await import(/* webpackChunkName: "html2pdf" */ 'html2pdf.js')
+      // const opt = {
+      //   margin: 10,
+      //   filename: `项目报工详情_${this.data.reportId || Date.now()}.pdf`,
+      //   html2canvas: { scale: 2, useCORS: true },
+      //   jsPDF: { unit: 'mm', format: 'a4', orientation: 'portrait' }
+      // }
+      // html2pdf().from(this.$refs.printArea).set(opt).save()
+      this.$message.warning('下载功能暂未实现，敬请期待！')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.project-report-detail >>> .el-dialog__header { padding-bottom: 0; }
+.dialog-title { font-size: 18px; font-weight: 600; }
+.card-header { font-weight: 600; font-size: 14px; color: #303133; }
+.rich-card { padding-bottom: 0 !important; }
+.rich-text {
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  padding: 16px;
+  background-color: #ffffff;
+  line-height: 1.6;
+}
+.rich-text h1,
+.rich-text h2,
+.rich-text h3,
+.rich-text h4 { margin: 0.8em 0 0.5em; font-weight: 600; }
+.rich-text p { margin: 0.5em 0; }
+.rich-text ul,
+.rich-text ol { padding-left: 1.4em; margin: 0.5em 0; }
+.mb-6 { margin-bottom: 24px; }
+</style>
diff --git a/gear-ui3/src/views/info/report/index.vue b/gear-ui3/src/views/info/report/index.vue
new file mode 100644
index 0000000..105099d
--- /dev/null
+++ b/gear-ui3/src/views/info/report/index.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="96px">
+      <el-form-item label="报工人" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入报工人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="经办部门" prop="deptId">
+        <el-select v-model="queryParams.deptId" filterable placeholder="请选择经办部门">
+          <el-option
+            v-for="item in deptList"
+            :key="item.deptId"
+            :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报工时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          type="date"
+          placeholder="请输入报工时间"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:projectReport:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:projectReport:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:projectReport:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:projectReport:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="projectReportList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="项目代号" prop="projectCode" width="100" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.projectCode==null" type="danger">无</el-tag>
+          <el-tag v-else>{{ scope.row.projectCode }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center" width="150" prop="projectName">
+        <template slot-scope="scope">
+          <span v-if="scope.row.prePay>0">⭐</span>
+          <span>{{ scope.row.projectName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目编号" align="left" prop="projectNum"/>
+      <el-table-column label="经办人" align="center" prop="nickName">
+        <template slot-scope="scope">
+          <span>{{ scope.row.nickName }}
+          <template v-if="scope.row.deptName!=null">
+            ({{ scope.row.deptName }})
+          </template>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工作地点" align="center" prop="workPlace"/>
+      <el-table-column label="国内/国外" align="center" prop="workType">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.workType===0?'':'warning'">{{ scope.row.workType===0?'国内':'国外' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="报工时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{parseTime(scope.row.createTime,'{y}-{m}-{d}')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="View"
+            @click="openDetail(scope.row)"
+          >详情
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:projectReport:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:projectReport:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改项目报工对话框 -->
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="96px">
+
+        <el-form-item label="工作地点" prop="workPlace">
+          <el-input v-model="form.workPlace" placeholder="请输入工作地点"/>
+        </el-form-item>
+        <el-form-item label="是否出差" prop="isTrip">
+          <el-radio-group v-model="form.isTrip">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <template v-if="form.isTrip===1">
+          <el-form-item label="国内/国外" prop="workType">
+            <el-radio-group v-model="form.workType">
+              <el-radio :label="0">国内</el-radio>
+              <el-radio :label="1">国外</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </template>
+        <el-form-item label="报工内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
+        </el-form-item>
+        <!-- 只在编辑模式下显示报工时间 -->
+        <el-form-item v-if="form.reportId" label="报工时间" prop="createTime">
+          <el-date-picker
+            v-model="form.createTime"
+            type="datetime"
+            placeholder="请选择报工时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <project-report-detail
+      v-model="detailVisible"
+      :record="currentRow" />
+  </div>
+</template>
+
+<script>
+import {
+  addProjectReport,
+  delProjectReport,
+  getProjectReport,
+  listProjectReport,
+  updateProjectReport
+} from "@/api/oa/projectReport";
+import { listDept } from "@/api/system/dept";
+import ProjectReportDetail from "./components/ProjectReportDetail.vue";
+
+export default {
+  name: "ProjectReport",
+  components: {ProjectReportDetail},
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      detailVisible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目报工表格数据
+      projectReportList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        handler: undefined,
+        workPlace: undefined,
+        projectId: null,
+        content: undefined,
+      },
+      deptList: [],
+      currentRow:{},
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        workPlace: [
+          {required: true, message: "工作地点不能为空", trigger: "blur"}
+        ],
+        content: [
+          {required: true, message: "报工内容不能为空", trigger: "blur"}
+        ],
+        isTrip: [
+          {required: true, message: '请选择是否出差', trigger: 'change'}
+        ],
+        workType: [
+          {
+            required: true, 
+            message: '请选择出差地点', 
+            trigger: 'change',
+            validator: (rule, value, callback) => {
+              if (this.form.isTrip === 1 && !value && value !== 0) {
+                callback(new Error('请选择出差地点'));
+              } else {
+                callback();
+              }
+            }
+          }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询详情 */
+    openDetail(row) {
+      getProjectReport(row.reportId).then(response => {
+        this.currentRow = response.data;   // row 为表格中选中的记录
+        this.detailVisible = true;
+      })
+
+    },
+    /** 自定义本地过滤：名称 | 编号 | 代码 任一匹配即可 */
+    projectFilter(query) {
+      // 1. 取出全部 option
+      const options = this.$refs.projectSelect.options;
+
+      // 2. 如果没输入，全部显示
+      if (!query) {
+        options.forEach(o => (o.visible = true));
+        return;
+      }
+
+      const q = query.toLowerCase();
+
+      // 3. 按三种字段匹配，决定每个 option 是否可见
+      options.forEach(o => {
+        // 根据 option.value 找到原始项目对象
+        const item = this.projectList.find(p => p.projectId === o.value) || {};
+
+        const hit = [item.projectName, item.projectNum, item.projectCode]
+          .filter(Boolean)
+          .some(text => text.toLowerCase().includes(q));
+
+        o.visible = hit;
+      });
+    },
+
+    getDeptList() {
+      listDept().then(res => {
+        this.deptList = res.data;
+      })
+    },
+    /** 查询项目报工列表 */
+    getList() {
+      this.loading = true;
+      listProjectReport(this.queryParams).then(response => {
+        this.projectReportList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+        this.getProjectList()
+        this.getDeptList();
+      });
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        reportId: undefined,
+        handler: undefined,
+        workPlace: undefined,
+        projectId: undefined,
+        content: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: undefined,
+        delFlag: undefined,
+        remark: undefined,
+        isTrip: undefined,
+        workType: undefined,
+      };
+      // 安全地重置表单，避免字段引用错误
+      this.$nextTick(() => {
+        if (this.$refs.form) {
+          this.$refs.form.resetFields();
+        }
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.reportId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目报工";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const reportId = row.reportId || this.ids
+      getProjectReport(reportId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目报工";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.reportId != null) {
+            updateProjectReport({ ...this.form, time: this.form.createTime }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addProjectReport(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const reportIds = row.reportId || this.ids;
+      this.$modal.confirm('是否确认删除项目报工编号为"' + reportIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delProjectReport(reportIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/projectReport/export', {
+        ...this.queryParams
+      }, `projectReport_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/peoples/attendance/index.vue b/gear-ui3/src/views/peoples/attendance/attendance.vue
similarity index 97%
rename from gear-ui3/src/views/peoples/attendance/index.vue
rename to gear-ui3/src/views/peoples/attendance/attendance.vue
index 9cf761d..4ca67b0 100644
--- a/gear-ui3/src/views/peoples/attendance/index.vue
+++ b/gear-ui3/src/views/peoples/attendance/attendance.vue
@@ -151,7 +151,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="时长(小时)" prop="durationHour">
-          <el-input v-model="form.durationHour" placeholder="请输入时长(小时)" />
+          <el-input-number v-model="form.durationHour" placeholder="请输入时长(小时)" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -192,9 +192,10 @@ const data = reactive({
     userId: undefined,
     recordDate: undefined,
     recordType: 'attendance', // 默认考勤
+    // 当天九点
     startTime: undefined,
     endTime: undefined,
-    durationHour: undefined,
+    durationHour: 8, // 默认8小时
   },
   rules: {
     userId: [
@@ -244,9 +245,9 @@ function reset() {
     // 填入格式化的日期 YYYY-MM-DD HH:mm:ss
     recordDate: proxy.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
     recordType: 'attendance', // 默认考勤
-    startTime: null,
-    endTime: null,
-    durationHour: null,
+    startTime: proxy.parseTime(new Date(), '{y}-{m}-{d} 09:00:00'),
+    endTime: proxy.parseTime(new Date(), '{y}-{m}-{d} 18:00:00'),
+    durationHour: 8,
     status: null,
     createTime: null,
     createBy: null,
diff --git a/gear-ui3/src/views/peoples/attendance/calendar.vue b/gear-ui3/src/views/peoples/attendance/calendar.vue
new file mode 100644
index 0000000..ac84779
--- /dev/null
+++ b/gear-ui3/src/views/peoples/attendance/calendar.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="attendance-calendar">
+    <el-card>
+      <template #header>
+        <div class="calendar-header">
+          <div class="search-form">
+            <el-form :inline="true">
+              <el-form-item label="开始日期">
+                <el-date-picker
+                  v-model="startDate"
+                  type="datetime"
+                  placeholder="开始日期"
+                  :size="'default'"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                />
+              </el-form-item>
+              <el-form-item label="结束日期">
+                <el-date-picker
+                  v-model="endDate"
+                  type="datetime"
+                  placeholder="结束日期"
+                  :size="'default'"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="handleSearch">查询</el-button>
+                <el-button @click="setCurrentMonth">本月</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </template>
+
+      <div class="calendar-container">
+        <el-table :data="calendarData" border style="width: 100%">
+          <!-- 表头-日期列 -->
+          <el-table-column fixed prop="name" label="人员" width="120" />
+          
+          <!-- 动态生成日期列 -->
+          <el-table-column
+            v-for="day in daysInMonth"
+            :key="day"
+            :label="formatDay(day)"
+            :width="120"
+          >
+            <template #default="scope">
+              <div class="attendance-cell">
+                <template v-if="scope.row.records[day]">
+                  <div
+                    v-for="(record, index) in scope.row.records[day]"
+                    :key="index"
+                    :class="['attendance-item', record.recordType]"
+                  >
+                    {{ formatTimeRange(record.startTime, record.endTime) }}
+                    <el-tooltip 
+                      :content="getTooltipContent(record)"
+                      placement="top"
+                    >
+                      <span class="attendance-type">
+                        {{ getTypeLabel(record.recordType) }}
+                      </span>
+                    </el-tooltip>
+                  </div>
+                </template>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, watch, onMounted } from 'vue'
+import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import { listAttendanceRecord } from '@/api/oa/attendanceRecord'
+
+// 查询日期范围
+const startDate = ref('')
+const endDate = ref('')
+
+// 考勤类型映射
+const typeLabels = {
+  attendance: '出勤',
+  overtime: '加班',
+  travel: '出差'
+}
+
+// 考勤记录数据
+const attendanceRecords = ref([])
+
+// 获取考勤记录
+const getAttendanceRecords = async () => {
+  if (!startDate.value || !endDate.value) {
+    ElMessage.warning('请选择起止日期')
+    return
+  }
+
+  try {
+    const response = await listAttendanceRecord({
+      startTime: startDate.value + ' 00:00:00',
+      endTime: endDate.value + ' 23:59:59'
+    })
+    attendanceRecords.value = response.rows
+  } catch (error) {
+    console.error('获取考勤记录失败:', error)
+    ElMessage.error('获取考勤记录失败')
+  }
+}
+
+// 转换数据格式
+const calendarData = computed(() => {
+  // 按人员分组
+  const groupedData = {}
+  
+  attendanceRecords.value.forEach(record => {
+    if (!groupedData[record.nickName]) {
+      groupedData[record.nickName] = {
+        name: record.nickName,
+        records: {}
+      }
+    }
+    
+    // 获取日期
+    const date = new Date(record.recordDate)
+    const day = date.getDate()
+    
+    if (!groupedData[record.nickName].records[day]) {
+      groupedData[record.nickName].records[day] = []
+    }
+    
+    // 格式化时间
+    const formatTime = (date) => {
+      if (!date) return ''
+      return new Date(date).toLocaleTimeString('zh-CN', {
+        hour: '2-digit',
+        minute: '2-digit'
+      })
+    }
+    
+    groupedData[record.nickName].records[day].push({
+      recordType: record.recordType,
+      startTime: formatTime(record.startTime),
+      endTime: formatTime(record.endTime),
+      status: record.status,
+      durationHour: record.durationHour,
+      remark: record.remark
+    })
+  })
+  
+  return Object.values(groupedData)
+})
+
+// 设置本月日期范围
+const setCurrentMonth = () => {
+  const now = new Date()
+  const firstDay = new Date(now.getFullYear(), now.getMonth(), 1)
+  const lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0)
+  
+  startDate.value = firstDay.toISOString().split('T')[0]
+  endDate.value = lastDay.toISOString().split('T')[0]
+  handleSearch()
+}
+
+// 查询处理
+const handleSearch = () => {
+  if (!startDate.value || !endDate.value) {
+    ElMessage.warning('请选择起止日期')
+    return
+  }
+  getAttendanceRecords()
+}
+
+// 初始加载数据
+onMounted(() => {
+  setCurrentMonth()
+})
+
+// 计算日期范围内的天数
+const daysInMonth = computed(() => {
+  if (!startDate.value || !endDate.value) return []
+  
+  const start = new Date(startDate.value)
+  const end = new Date(endDate.value)
+  const days = []
+  
+  for (let date = new Date(start); date <= end; date.setDate(date.getDate() + 1)) {
+    days.push(date.getDate())
+  }
+  
+  return days
+})
+
+// 格式化日期显示
+const formatDay = (day) => {
+  const date = new Date(startDate.value)
+  date.setDate(day)
+  const weekDay = ['日', '一', '二', '三', '四', '五', '六'][date.getDay()]
+  return `${day}日(${weekDay})`
+}
+
+// 格式化时间范围
+const formatTimeRange = (start, end) => {
+  return `${start}-${end}`
+}
+
+// 获取考勤类型标签
+const getTypeLabel = (type) => {
+  return typeLabels[type] || type
+}
+
+// 获取提示内容
+const getTooltipContent = (record) => {
+  const status = {
+    'pending': '待审批',
+    'approved': '已通过',
+    'rejected': '已拒绝'
+  }
+  return [
+    `类型：${getTypeLabel(record.recordType)}`,
+    `时间：${formatTimeRange(record.startTime, record.endTime)}`,
+    `时长：${record.durationHour}小时`,
+    `状态：${status[record.status] || record.status}`,
+    record.remark ? `备注：${record.remark}` : ''
+  ].filter(Boolean).join('\n')
+}
+</script>
+
+<style scoped>
+.attendance-calendar {
+  padding: 20px;
+}
+
+.calendar-header {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+
+.month-title {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.calendar-container {
+  margin-top: 20px;
+}
+
+.attendance-cell {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.attendance-item {
+  font-size: 12px;
+  padding: 2px 4px;
+  border-radius: 4px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.attendance-type {
+  font-weight: bold;
+}
+
+/* 考勤类型样式 */
+.attendance {
+  background-color: #e1f3d8;
+  color: #67c23a;
+}
+
+.overtime {
+  background-color: #fdf6ec;
+  color: #e6a23c;
+}
+
+.travel {
+  background-color: #ecf5ff;
+  color: #409eff;
+}
+</style>
diff --git a/gear-ui3/src/views/peoples/overtime/index.vue b/gear-ui3/src/views/peoples/attendance/overtime.vue
similarity index 100%
rename from gear-ui3/src/views/peoples/overtime/index.vue
rename to gear-ui3/src/views/peoples/attendance/overtime.vue
diff --git a/gear-ui3/src/views/peoples/attendance/snapshot.vue b/gear-ui3/src/views/peoples/attendance/snapshot.vue
new file mode 100644
index 0000000..e69de29
diff --git a/gear-ui3/src/views/peoples/travel/index.vue b/gear-ui3/src/views/peoples/attendance/travel.vue
similarity index 100%
rename from gear-ui3/src/views/peoples/travel/index.vue
rename to gear-ui3/src/views/peoples/attendance/travel.vue