diff --git a/ruoyi-fastapi-frontend/.env.development b/ruoyi-fastapi-frontend/.env.development
index a086d04f20937a7ebffda817dc0507fbe764d6bc..218f52fd21a9391751f0022c57cb186e404f89cf 100644
--- a/ruoyi-fastapi-frontend/.env.development
+++ b/ruoyi-fastapi-frontend/.env.development
@@ -1,8 +1,8 @@
 # 页面标题
-VITE_APP_TITLE = vfadmin管理系统
+VITE_APP_TITLE = 考勤管理系统
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
-# vfadmin管理系统/开发环境
+# 考勤管理系统/开发环境
 VITE_APP_BASE_API = '/dev-api'
diff --git a/ruoyi-fastapi-frontend/.env.production b/ruoyi-fastapi-frontend/.env.production
index ac80031b54463541d6565ae7fd180113f9204f1e..a260241273c3f60e35475d1431096eb1b969c7eb 100644
--- a/ruoyi-fastapi-frontend/.env.production
+++ b/ruoyi-fastapi-frontend/.env.production
@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = vfadmin管理系统
+VITE_APP_TITLE = 考勤管理系统
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
-# vfadmin管理系统/生产环境
+# 考勤管理系统/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
diff --git a/ruoyi-fastapi-frontend/.env.staging b/ruoyi-fastapi-frontend/.env.staging
index c3fcf1a9a0aac916fadbd2210f9655e3471ec9ca..0ad21e956fff34936dee098899612c42a17ebb30 100644
--- a/ruoyi-fastapi-frontend/.env.staging
+++ b/ruoyi-fastapi-frontend/.env.staging
@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = vfadmin管理系统
+VITE_APP_TITLE = 考勤管理系统
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'
 
-# vfadmin管理系统/生产环境
+# 考勤管理系统/生产环境
 VITE_APP_BASE_API = '/stage-api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
diff --git a/ruoyi-fastapi-frontend/index.html b/ruoyi-fastapi-frontend/index.html
index ab221b8c192361bfd79bc895f91da8dc26e5c687..78ebd7f067bf380ef2cfc936dbea8aff084f38ed 100644
--- a/ruoyi-fastapi-frontend/index.html
+++ b/ruoyi-fastapi-frontend/index.html
@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
-  <title>vfadmin管理系统</title>
+  <title>考勤管理系统</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,
diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json
index cc0e258a56b3f503e862fcc918863d6dad173d77..f20246c62af20b0470db5bdc013e4fd7132963f0 100644
--- a/ruoyi-fastapi-frontend/package.json
+++ b/ruoyi-fastapi-frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vfadmin",
   "version": "1.4.0",
-  "description": "vfadmin管理系统",
+  "description": "考勤管理系统",
   "author": "insistence",
   "license": "MIT",
   "type": "module",
diff --git a/ruoyi-fastapi-frontend/src/api/rost/batch.js b/ruoyi-fastapi-frontend/src/api/rost/batch.js
new file mode 100644
index 0000000000000000000000000000000000000000..4fd38b4f9b0c73e318ac66f223d52750b22032e1
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/api/rost/batch.js
@@ -0,0 +1,63 @@
+import request from "@/utils/request";
+
+// 批量分配中的员工列表
+export function listEployees(query) {
+  return request({
+    url: "/kaoqin/record/authUser/unallocatedList",
+    method: "get",
+    params: query,
+  });
+}
+
+// 批量导入考勤记录
+export function importAttendance(data) {
+  return request({
+    url: "/kaoqin/record/importData",
+    method: "post",
+    data: data,
+  });
+}
+
+// 新增排班模板分组
+export function addRostGroup(data) {
+  return request({
+    url: "/kaoqin/roster",
+    method: "post",
+    data: data,
+  });
+}
+
+// 删除排班模板分组
+export function delRostGroup(rosterIds) {
+  return request({
+    url: "/kaoqin/roster/" + rosterIds,
+    method: "delete",
+  });
+}
+
+// 新增员工排班
+export function addRost(data) {
+  return request({
+    url: "/kaoqin/rosterpaiban",
+    method: "post",
+    data: data,
+  });
+}
+
+// 查询时间模板列表
+export function listTimeTemplate(query) {
+  return request({
+    url: "/kaoqin/time_span/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询排班分组列表
+export function listRostGroup(query) {
+  return request({
+    url: "/kaoqin/roster/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/api/rost/leave.js b/ruoyi-fastapi-frontend/src/api/rost/leave.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b55055ec5b79ef468659ee4958d00ba4e73f380
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/api/rost/leave.js
@@ -0,0 +1,32 @@
+import request from "@/utils/request";
+
+// 新增用户请假信息
+export function addUserLeave(data) {
+  return request({
+    url: "/kaoqin/leave",
+    method: "post",
+    data: data,
+  });
+}
+
+
+// 修改请假信息
+export function editUserLeave(data) {
+  return request({
+    url: "/kaoqin/leave",
+    method: "put",
+    data: data,
+  });
+}
+
+// 获取用户详细信息
+export function getUserInfo(query) {
+  return request({
+    url: "/kaoqin/leave/info",
+    method: "get",
+    params: query
+  });
+}
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/api/rost/time.js b/ruoyi-fastapi-frontend/src/api/rost/time.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f1c87c33e6cf4719c0a0eb5cc72d39485cb3c8d
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/api/rost/time.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询时间模板列表
+export function listTimeTemplate(query) {
+  return request({
+    url: '/kaoqin/time_span/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增时间模板
+export function addTimeTemplate(data) {
+  return request({
+    url: '/kaoqin/time_span',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除时间模板
+export function delTimeTemplate(timeTemplateIds) {
+  return request({
+    url: '/kaoqin/time_span/' + timeTemplateIds,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue b/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue
index 05e15af227c9454eff98fea4e79274b85226f00f..252660c649ed0b5471b3d2e1ba8c6c909cba2652 100644
--- a/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue
+++ b/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue
@@ -8,9 +8,9 @@
       <template v-if="appStore.device !== 'mobile'">
         <header-search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
diff --git a/ruoyi-fastapi-frontend/src/views/dashboard/index.vue b/ruoyi-fastapi-frontend/src/views/dashboard/index.vue
index 68023f70b0008c67c5ff165c0066050058d7dec4..cd344e4e77a11f6e38d1877ae0336fb1b7d79c5e 100644
--- a/ruoyi-fastapi-frontend/src/views/dashboard/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/dashboard/index.vue
@@ -1,738 +1,220 @@
 <template>
   <div>
-    <div class="pageHeaderContent">
-      <div class="avatar">
-        <a-avatar size="large" :src="currentUser.avatar" />
-      </div>
-      <div class="content">
-        <div class="contentTitle">
-          早安，
-          {{ currentUser.name }}
-          ，祝你开心每一天！
-        </div>
-        <div>{{ currentUser.title }} |{{ currentUser.group }}</div>
+    <div class="contentTitle">
+      {{ greeting }} 尊贵的{{ IndexUser.nickName }}，{{ IndexUser.userName }}祝你开心每一天！<br />
+    </div>
+    <div class="charts-container">
+      <div class="bar-chart-container">
+        <!-- <div class="bar-chart-title">部门打卡状态</div> 将标题放靠近图表 -->
+        <div ref="barChart" class="chart bar-chart"></div> <!-- 堆叠柱状图 -->
       </div>
-      <div class="extraContent">
-        <div class="statItem">
-          <a-statistic title="项目数" :value="56" />
-        </div>
-        <div class="statItem">
-          <a-statistic title="团队内排名" :value="8" suffix="/ 24" />
-        </div>
-        <div class="statItem">
-          <a-statistic title="项目访问" :value="2223" />
-        </div>
+      <div class="pie-charts-container">
+       
+        <div ref="dailyChart" class="chart pie-chart"></div> <!-- 日度饼图 -->
+        <div class="pie-chart-title">日度打卡情况</div>
+        
+        <div ref="monthlyChart" class="chart pie-chart"></div> <!-- 月度饼图 -->
+        <div class="pie-chart-title">月度打卡情况</div>
       </div>
     </div>
-
-    <div style="padding: 10px">
-      <a-row :gutter="24">
-        <a-col :xl="16" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card
-            class="projectList"
-            :style="{ marginBottom: '24px' }"
-            title="进行中的项目"
-            :bordered="false"
-            :loading="false"
-            :body-style="{ padding: 0 }"
-          >
-            <template #extra>
-              <a href=""> <span style="color: #1890ff">全部项目</span> </a>
-            </template>
-            <a-card-grid
-              v-for="item in projectNotice"
-              :key="item.id"
-              class="projectGrid"
-            >
-              <a-card
-                :body-style="{ padding: 0 }"
-                style="box-shadow: none"
-                :bordered="false"
-              >
-                <a-card-meta :description="item.description" class="w-full">
-                  <template #title>
-                    <div class="cardTitle">
-                      <a-avatar size="small" :src="item.logo" />
-                      <a :href="item.href">
-                        {{ item.title }}
-                      </a>
-                    </div>
-                  </template>
-                </a-card-meta>
-                <div class="projectItemContent">
-                  <a :href="item.memberLink">
-                    {{ item.member || "" }}
-                  </a>
-                  <span class="datetime" ml-2 :title="item.updatedAt">
-                    {{ item.updatedAt }}
-                  </span>
-                </div>
-              </a-card>
-            </a-card-grid>
-          </a-card>
-          <a-card
-            :body-style="{ padding: 0 }"
-            :bordered="false"
-            class="activeCard"
-            title="动态"
-            :loading="false"
-          >
-            <a-list :data-source="activities" class="activitiesList">
-              <template #renderItem="{ item }">
-                <a-list-item :key="item.id">
-                  <a-list-item-meta>
-                    <template #title>
-                      <span>
-                        <a class="username">{{ item.user.name }}</a
-                        >&nbsp;
-                        <span class="event">
-                          <span>{{ item.template1 }}</span
-                          >&nbsp;
-                          <a href="" style="color: #1890ff">
-                            {{ item?.group?.name }} </a
-                          >&nbsp; <span>{{ item.template2 }}</span
-                          >&nbsp;
-                          <a href="" style="color: #1890ff">
-                            {{ item?.project?.name }}
-                          </a>
-                        </span>
-                      </span>
-                    </template>
-                    <template #avatar>
-                      <a-avatar :src="item.user.avatar" />
-                    </template>
-                    <template #description>
-                      <span class="datetime" :title="item.updatedAt">
-                        {{ item.updatedAt }}
-                      </span>
-                    </template>
-                  </a-list-item-meta>
-                </a-list-item>
-              </template>
-            </a-list>
-          </a-card>
-        </a-col>
-        <a-col :xl="8" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card
-            :style="{ marginBottom: '24px' }"
-            title="快速开始 / 便捷导航"
-            :bordered="false"
-            :body-style="{ padding: 0 }"
-          >
-            <EditableLinkGroup />
-          </a-card>
-          <a-card
-            :style="{ marginBottom: '24px' }"
-            :bordered="false"
-            title="XX 指数"
-          >
-            <div class="chart">
-              <div ref="radarContainer" />
-            </div>
-          </a-card>
-          <a-card
-            :body-style="{ paddingTop: '12px', paddingBottom: '12px' }"
-            :bordered="false"
-            title="团队"
-          >
-            <div class="members">
-              <a-row :gutter="48">
-                <a-col
-                  v-for="item in projectNotice"
-                  :key="`members-item-${item.id}`"
-                  :span="12"
-                >
-                  <a :href="item.href">
-                    <a-avatar :src="item.logo" size="small" />
-                    <span class="member">{{ item.member }}</span>
-                  </a>
-                </a-col>
-              </a-row>
-            </div>
-          </a-card>
-        </a-col>
-      </a-row>
-    </div>
   </div>
 </template>
 
-<script>
-import {
-  Statistic,
-  Row,
-  Col,
-  Card,
-  CardGrid,
-  CardMeta,
-  List,
-  ListItem,
-  ListItemMeta,
-  Avatar,
-} from "ant-design-vue";
-import 'ant-design-vue/dist/reset.css';
+<script setup>
+import * as echarts from 'echarts';
+import { onMounted, ref, computed, onUnmounted } from 'vue';
+import { getInfo } from '@/api/login';
+
+// 定义图表引用
+const dailyChart = ref(null);
+const monthlyChart = ref(null);
+const barChart = ref(null);
+
+// 初始化数据
+const dayData = ref({
+  normal: 200000,
+  lateAndLeaveEarly: 20000,
+  leaveAndAbsence: 20000,
+});
 
-export default {
-  components: {
-    AStatistic: Statistic,
-    ARow: Row,
-    ACol: Col,
-    ACard: Card,
-    ACardGrid: CardGrid,
-    ACardMeta: CardMeta,
-    AList: List,
-    AListItem: ListItem,
-    AListItemMeta: ListItemMeta,
-    AAvatar: Avatar,
-  },
+// 获取问候语
+const getCurrentGreeting = () => {
+  const hour = new Date().getHours();
+  return hour >= 6 && hour < 12 ? '早上好!' :
+    hour >= 12 && hour < 18 ? '下午好!' : '晚上好，加班辛苦了';
 };
-</script>
 
+const greeting = computed(() => getCurrentGreeting());
 
-<script setup>
-import { Radar } from "@antv/g2plot";
-import EditableLinkGroup from "./editable-link-group.vue";
+// 定时更新问候语
+const updateGreeting = () => {
+  const intervalId = setInterval(() => {
+    greeting.value = getCurrentGreeting();
+  }, 60000);
+  onUnmounted(() => clearInterval(intervalId));
+};
 
-defineOptions({
-  name: "DashBoard",
-});
+// 初始化图表
+const initCharts = () => {
+  if (dailyChart.value) {
+    dailyChart.value = echarts.init(dailyChart.value);
+    const dailyOption = getPieChartOption('日度打卡情况');
+    dailyChart.value.setOption(dailyOption);
+  }
 
-const currentUser = {
-  avatar: "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
-  name: "吴彦祖",
-  userid: "00000001",
-  email: "antdesign@alipay.com",
-  signature: "海纳百川，有容乃大",
-  title: "交互专家",
-  group: "蚂蚁金服－某某某事业群－某某平台部－某某技术部－UED",
-};
+  if (monthlyChart.value) {
+    monthlyChart.value = echarts.init(monthlyChart.value);
+    const monthlyOption = getPieChartOption('月度打卡情况');
+    monthlyChart.value.setOption(monthlyOption);
+  }
 
-const projectNotice = [
-  {
-    id: "xxx1",
-    title: "Alipay",
-    logo: "https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png",
-    description: "那是一种内在的东西，他们到达不了，也无法触及的",
-    updatedAt: "几秒前",
-    member: "科学搬砖组",
-    href: "",
-    memberLink: "",
-  },
-  {
-    id: "xxx2",
-    title: "Angular",
-    logo: "https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png",
-    description: "希望是一个好东西，也许是最好的，好东西是不会消亡的",
-    updatedAt: "6 年前",
-    member: "全组都是吴彦祖",
-    href: "",
-    memberLink: "",
-  },
-  {
-    id: "xxx3",
-    title: "Ant Design",
-    logo: "https://gw.alipayobjects.com/zos/rmsportal/dURIMkkrRFpPgTuzkwnB.png",
-    description: "城镇中有那么多的酒馆，她却偏偏走进了我的酒馆",
-    updatedAt: "几秒前",
-    member: "中二少女团",
-    href: "",
-    memberLink: "",
-  },
-  {
-    id: "xxx4",
-    title: "Ant Design Pro",
-    logo: "https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png",
-    description: "那时候我只会想自己想要什么，从不想自己拥有什么",
-    updatedAt: "6 年前",
-    member: "程序员日常",
-    href: "",
-    memberLink: "",
-  },
-  {
-    id: "xxx5",
-    title: "Bootstrap",
-    logo: "https://gw.alipayobjects.com/zos/rmsportal/siCrBXXhmvTQGWPNLBow.png",
-    description:
-      "凛冬将至",
-    updatedAt: "6 年前",
-    member: "高逼格设计天团",
-    href: "",
-    memberLink: "",
-  },
-  {
-    id: "xxx6",
-    title: "React",
-    logo: "https://gw.alipayobjects.com/zos/rmsportal/kZzEzemZyKLKFsojXItE.png",
-    description: "生命就像一盒巧克力，结果往往出人意料",
-    updatedAt: "6 年前",
-    member: "骗你来学计算机",
-    href: "",
-    memberLink: "",
-  },
-];
+  if (barChart.value) {
+    barChart.value = echarts.init(barChart.value);
+    const barOption = getBarChartOption();
+    barChart.value.setOption(barOption);
+  }
 
-const activities = [
-  {
-    id: "trend-1",
-    updatedAt: "几秒前",
-    user: {
-      name: "曲丽丽",
-      avatar:
-        "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
-    },
-    group: {
-      name: "高逼格设计天团",
-      link: "http://github.com/",
-    },
-    project: {
-      name: "六月迭代",
-      link: "http://github.com/",
-    },
-    template1: "在",
-    template2: "新建项目",
-  },
-  {
-    id: "trend-2",
-    updatedAt: "几秒前",
-    user: {
-      name: "付小小",
-      avatar:
-        "https://gw.alipayobjects.com/zos/rmsportal/cnrhVkzwxjPwAaCfPbdc.png",
-    },
-    group: {
-      name: "高逼格设计天团",
-      link: "http://github.com/",
-    },
-    project: {
-      name: "六月迭代",
-      link: "http://github.com/",
-    },
-    template1: "在",
-    template2: "新建项目",
-  },
-  {
-    id: "trend-3",
-    updatedAt: "几秒前",
-    user: {
-      name: "林东东",
-      avatar:
-        "https://gw.alipayobjects.com/zos/rmsportal/gaOngJwsRYRaVAuXXcmB.png",
-    },
-    group: {
-      name: "中二少女团",
-      link: "http://github.com/",
-    },
-    project: {
-      name: "六月迭代",
-      link: "http://github.com/",
-    },
-    template1: "在",
-    template2: "新建项目",
-  },
-  {
-    id: "trend-4",
-    updatedAt: "几秒前",
-    user: {
-      name: "周星星",
-      avatar:
-        "https://gw.alipayobjects.com/zos/rmsportal/WhxKECPNujWoWEFNdnJE.png",
-    },
-    group: {
-      name: "5 月日常迭代",
-      link: "http://github.com/",
-    },
-    template1: "将",
-    template2: "更新至已发布状态",
-  },
-  {
-    id: "trend-5",
-    updatedAt: "几秒前",
-    user: {
-      name: "朱偏右",
-      avatar:
-        "https://gw.alipayobjects.com/zos/rmsportal/ubnKSIfAJTxIgXOKlciN.png",
-    },
-    group: {
-      name: "工程效能",
-      link: "http://github.com/",
-    },
-    project: {
-      name: "留言",
-      link: "http://github.com/",
-    },
-    template1: "在",
-    template2: "发布了",
-  },
-  {
-    id: "trend-6",
-    updatedAt: "几秒前",
-    user: {
-      name: "乐哥",
-      avatar:
-        "https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png",
-    },
-    group: {
-      name: "程序员日常",
-      link: "http://github.com/",
-    },
-    project: {
-      name: "品牌迭代",
-      link: "http://github.com/",
-    },
-    template1: "在",
-    template2: "新建项目",
-  },
-];
+  window.addEventListener('resize', resizeCharts);
+};
 
-const radarContainer = ref();
-const radarData = [
-  {
-    name: "个人",
-    label: "引用",
-    value: 10,
-  },
-  {
-    name: "个人",
-    label: "口碑",
-    value: 8,
-  },
-  {
-    name: "个人",
-    label: "产量",
-    value: 4,
-  },
-  {
-    name: "个人",
-    label: "贡献",
-    value: 5,
-  },
-  {
-    name: "个人",
-    label: "热度",
-    value: 7,
-  },
-  {
-    name: "团队",
-    label: "引用",
-    value: 3,
-  },
-  {
-    name: "团队",
-    label: "口碑",
-    value: 9,
-  },
-  {
-    name: "团队",
-    label: "产量",
-    value: 6,
-  },
-  {
-    name: "团队",
-    label: "贡献",
-    value: 3,
-  },
-  {
-    name: "团队",
-    label: "热度",
-    value: 1,
-  },
-  {
-    name: "部门",
-    label: "引用",
-    value: 4,
-  },
-  {
-    name: "部门",
-    label: "口碑",
-    value: 1,
-  },
-  {
-    name: "部门",
-    label: "产量",
-    value: 6,
-  },
-  {
-    name: "部门",
-    label: "贡献",
-    value: 5,
-  },
-  {
-    name: "部门",
-    label: "热度",
-    value: 7,
-  },
-];
-let radar;
-onMounted(() => {
-  radar = new Radar(radarContainer.value, {
-    data: radarData,
-    xField: "label",
-    yField: "value",
-    seriesField: "name",
-    point: {
-      size: 4,
-    },
-    legend: {
-      layout: "horizontal",
-      position: "bottom",
-    },
-  });
-  radar.render();
+// 获取柱状图配置
+const getBarChartOption = () => ({
+  tooltip: {
+    trigger: 'item', // 设置触发类型为 item
+    formatter: params => {
+      // 自定义 tooltip 内容
+      return `${params[0].seriesName} : ${params[0].value} <br/> ${params[1] ? params[1].seriesName + ' : ' + params[1].value : ''}`;
+    }
+  },
+  legend: {
+    data: ['正常打卡', '迟到,早退', '未打卡'],
+    bottom: '0%', // 设置图例位置在柱状图下方
+    orient: 'horizontal', // 水平排列
+  },
+  grid: { left: '5%', right: '1%', bottom: '10%', top: '5%', containLabel: true },
+  xAxis: { type: 'value' },
+  yAxis: {
+    type: 'category',
+    data: getFactoryData(),
+    axisLabel: { fontSize: 16 }, // Y 轴字体大小
+  },
+  series: [
+    { name: '正常打卡', type: 'bar', stack: '总量', data: Array(26).fill(dayData.value.normal), barWidth: '70%' },
+    { name: '迟到,早退', type: 'bar', stack: '总量', data: Array(26).fill(dayData.value.lateAndLeaveEarly), barWidth: '70%' },
+    { name: '未打卡', type: 'bar', stack: '总量', data: Array(26).fill(dayData.value.leaveAndAbsence), barWidth: '70%' }
+  ]
 });
 
-onBeforeUnmount(() => {
-  radar?.destroy?.();
+// 获取饼图配置
+const getPieChartOption = (name) => ({
+  tooltip: { trigger: 'item', formatter: '{a} <br/>{b}: {c} ({d}%)' },
+  series: [{
+    name,
+    type: 'pie',
+    radius: '75%',
+    data: [
+      { value: dayData.value.normal, name: '正常打卡' },
+      { value: dayData.value.lateAndLeaveEarly, name: '迟到早退' },
+      { value: dayData.value.leaveAndAbsence, name: '未打卡' }
+    ],
+    emphasis: {
+      itemStyle: {
+        shadowBlur: 10,
+        shadowOffsetX: 0,
+        shadowColor: 'rgba(0, 0, 0, 0.5)'
+      }
+    }
+  }]
 });
-</script>
 
-<style scoped lang="less">
-.textOverflow() {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  word-break: break-all;
-}
+// 获取工厂数据
+const getFactoryData = () => [
+  '一分厂', '二分厂', '三分厂', '四分厂', '五分厂', 
+  '六分厂', '七分厂', '八分厂', '九分厂', '十分厂', 
+  '十一分厂', '十二分厂', '十三分厂', '十四分厂', 
+  '十五分厂', '十六分厂', '十七分厂', '十八分厂', 
+  '十九分厂', '二十厂', '二十一分厂', '二十二分厂', 
+  '二十三分厂', '二十四分厂', '二十五分厂', '二十六分厂'
+];
 
-// mixins for clearfix
-// ------------------------
-.clearfix() {
-  zoom: 1;
-  &::before,
-  &::after {
-    display: table;
-    content: " ";
-  }
-  &::after {
-    clear: both;
-    height: 0;
-    font-size: 0;
-    visibility: hidden;
-  }
-}
+// 窗口大小改变时重绘图表
+const resizeCharts = () => {
+  if (dailyChart.value) dailyChart.value.resize();
+  if (monthlyChart.value) monthlyChart.value.resize();
+  if (barChart.value) barChart.value.resize();
+};
 
-.activitiesList {
-  padding: 0 24px 8px 24px;
-  .username {
-    color: rgba(0, 0, 0, 0.65);
-  }
-  .event {
-    font-weight: normal;
-  }
-}
+// 用户信息
+const IndexUser = ref("");
 
-.pageHeaderContent {
-  display: flex;
-  padding: 12px;
-  margin-bottom: 24px;
-  box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;
-  .avatar {
-    flex: 0 1 72px;
-    & > span {
-      display: block;
-      width: 72px;
-      height: 72px;
-      border-radius: 72px;
-    }
+const perInfo = async () => {
+  const res = await getInfo();
+  if (res.code === 200) {
+    IndexUser.value = res.user;
   }
-  .content {
-    position: relative;
-    top: 4px;
-    flex: 1 1 auto;
-    margin-left: 24px;
-    color: rgba(0, 0, 0, 0.45);
-    line-height: 22px;
-    .contentTitle {
-      margin-bottom: 12px;
-      color: rgba(0, 0, 0, 0.85);
-      font-weight: 500;
-      font-size: 20px;
-      line-height: 28px;
-    }
-  }
-}
+};
 
-.extraContent {
-  .clearfix();
+onMounted(() => {
+  initCharts();
+  perInfo();
+  updateGreeting();
+});
+</script>
 
-  float: right;
-  white-space: nowrap;
-  .statItem {
-    position: relative;
-    display: inline-block;
-    padding: 0 32px;
-    > p:first-child {
-      margin-bottom: 4px;
-      color: rgba(0, 0, 0, 0.45);
-      font-size: 14px;
-      line-height: 22px;
-    }
-    > p {
-      margin: 0;
-      color: rgba(0, 0, 0, 0.85);
-      font-size: 30px;
-      line-height: 38px;
-      > span {
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 20px;
-      }
-    }
-    &::after {
-      position: absolute;
-      top: 8px;
-      right: 0;
-      width: 1px;
-      height: 40px;
-      background-color: #e8e8e8;
-      content: "";
-    }
-    &:last-child {
-      padding-right: 0;
-      &::after {
-        display: none;
-      }
-    }
-  }
+<style scoped>
+.charts-container {
+  display: flex; 
+  justify-content: space-between; 
+  align-items: flex-start; 
+  margin: 10px 0; 
 }
 
-.members {
-  a {
-    display: block;
-    height: 24px;
-    margin: 12px 0;
-    color: rgba(0, 0, 0, 0.65);
-    transition: all 0.3s;
-    .textOverflow();
-    .member {
-      margin-left: 12px;
-      font-size: 14px;
-      line-height: 24px;
-      vertical-align: top;
-    }
-    &:hover {
-      color: #1890ff;
-    }
-  }
+.bar-chart-container {
+  flex: 1;
+  margin-right: 20px; 
+  display: flex;
+  flex-direction: column; /* 竖直排列标题和柱状图 */
+  align-items: center; 
 }
 
-.projectList {
-  :deep(.ant-card-meta-description) {
-    height: 44px;
-    overflow: hidden;
-    color: rgba(0, 0, 0, 0.45);
-    line-height: 22px;
-  }
-  .cardTitle {
-    font-size: 0;
-    a {
-      display: inline-block;
-      height: 24px;
-      margin-left: 12px;
-      color: rgba(0, 0, 0, 0.85);
-      font-size: 14px;
-      line-height: 24px;
-      vertical-align: top;
-      &:hover {
-        color: #1890ff;
-      }
-    }
-  }
-  .projectGrid {
-    width: 33.33%;
-  }
-  .projectItemContent {
-    display: flex;
-    flex-basis: 100%;
-    height: 20px;
-    margin-top: 8px;
-    overflow: hidden;
-    font-size: 12px;
-    line-height: 20px;
-    .textOverflow();
-    a {
-      display: inline-block;
-      flex: 1 1 0;
-      color: rgba(0, 0, 0, 0.45);
-      .textOverflow();
-      &:hover {
-        color: #1890ff;
-      }
-    }
-    .datetime {
-      flex: 0 0 auto;
-      float: right;
-      color: rgba(0, 0, 0, 0.25);
-    }
-  }
+.pie-charts-container {
+  display: flex;
+  flex-direction: column; 
+  align-items: center; 
 }
 
-.datetime {
-  color: rgba(0, 0, 0, 0.25);
+.pie-chart-title {
+  font-size: 1.5em; 
+  color: #007bff; 
+  margin-bottom: 10px; 
 }
 
-@media screen and (max-width: 1200px) and (min-width: 992px) {
-  .activeCard {
-    margin-bottom: 24px;
-  }
-  .members {
-    margin-bottom: 0;
-  }
-  .extraContent {
-    margin-left: -44px;
-    .statItem {
-      padding: 0 16px;
-    }
-  }
+.bar-chart-title {
+  font-size: 1.5em; /* 设置标题的字体大小 */
+  color: #343a40; /* 深色文本 */
+  margin-bottom: 10px; /* 增加与图表之间的间距 */
+  text-align: center; /* 居中对齐 */
 }
 
-@media screen and (max-width: 992px) {
-  .activeCard {
-    margin-bottom: 24px;
-  }
-  .members {
-    margin-bottom: 0;
-  }
-  .extraContent {
-    float: none;
-    margin-right: 0;
-    .statItem {
-      padding: 0 16px;
-      text-align: left;
-      &::after {
-        display: none;
-      }
-    }
-  }
+.bar-chart {
+  width: 100%; 
+  height: 800px; 
 }
 
-@media screen and (max-width: 768px) {
-  .extraContent {
-    margin-left: -16px;
-  }
-  .projectList {
-    .projectGrid {
-      width: 50%;
-    }
-  }
+.pie-chart {
+  width: 300px; 
+  height: 300px; 
 }
 
-@media screen and (max-width: 576px) {
-  .pageHeaderContent {
-    display: block;
-    .content {
-      margin-left: 0;
-    }
-  }
-  .extraContent {
-    .statItem {
-      float: none;
-    }
-  }
+.chart {
+  margin: 10px;
 }
 
-@media screen and (max-width: 480px) {
-  .projectList {
-    .projectGrid {
-      width: 100%;
-    }
-  }
+.contentTitle {
+  text-align: center;
+  color: #343a40; 
+  font-size: 2em; 
+  font-weight: bold; 
+  margin: 20px 0 0 0; 
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/ruoyi-fastapi-frontend/src/views/dashboard/index1.vue b/ruoyi-fastapi-frontend/src/views/dashboard/index1.vue
new file mode 100644
index 0000000000000000000000000000000000000000..68023f70b0008c67c5ff165c0066050058d7dec4
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/dashboard/index1.vue
@@ -0,0 +1,738 @@
+<template>
+  <div>
+    <div class="pageHeaderContent">
+      <div class="avatar">
+        <a-avatar size="large" :src="currentUser.avatar" />
+      </div>
+      <div class="content">
+        <div class="contentTitle">
+          早安，
+          {{ currentUser.name }}
+          ，祝你开心每一天！
+        </div>
+        <div>{{ currentUser.title }} |{{ currentUser.group }}</div>
+      </div>
+      <div class="extraContent">
+        <div class="statItem">
+          <a-statistic title="项目数" :value="56" />
+        </div>
+        <div class="statItem">
+          <a-statistic title="团队内排名" :value="8" suffix="/ 24" />
+        </div>
+        <div class="statItem">
+          <a-statistic title="项目访问" :value="2223" />
+        </div>
+      </div>
+    </div>
+
+    <div style="padding: 10px">
+      <a-row :gutter="24">
+        <a-col :xl="16" :lg="24" :md="24" :sm="24" :xs="24">
+          <a-card
+            class="projectList"
+            :style="{ marginBottom: '24px' }"
+            title="进行中的项目"
+            :bordered="false"
+            :loading="false"
+            :body-style="{ padding: 0 }"
+          >
+            <template #extra>
+              <a href=""> <span style="color: #1890ff">全部项目</span> </a>
+            </template>
+            <a-card-grid
+              v-for="item in projectNotice"
+              :key="item.id"
+              class="projectGrid"
+            >
+              <a-card
+                :body-style="{ padding: 0 }"
+                style="box-shadow: none"
+                :bordered="false"
+              >
+                <a-card-meta :description="item.description" class="w-full">
+                  <template #title>
+                    <div class="cardTitle">
+                      <a-avatar size="small" :src="item.logo" />
+                      <a :href="item.href">
+                        {{ item.title }}
+                      </a>
+                    </div>
+                  </template>
+                </a-card-meta>
+                <div class="projectItemContent">
+                  <a :href="item.memberLink">
+                    {{ item.member || "" }}
+                  </a>
+                  <span class="datetime" ml-2 :title="item.updatedAt">
+                    {{ item.updatedAt }}
+                  </span>
+                </div>
+              </a-card>
+            </a-card-grid>
+          </a-card>
+          <a-card
+            :body-style="{ padding: 0 }"
+            :bordered="false"
+            class="activeCard"
+            title="动态"
+            :loading="false"
+          >
+            <a-list :data-source="activities" class="activitiesList">
+              <template #renderItem="{ item }">
+                <a-list-item :key="item.id">
+                  <a-list-item-meta>
+                    <template #title>
+                      <span>
+                        <a class="username">{{ item.user.name }}</a
+                        >&nbsp;
+                        <span class="event">
+                          <span>{{ item.template1 }}</span
+                          >&nbsp;
+                          <a href="" style="color: #1890ff">
+                            {{ item?.group?.name }} </a
+                          >&nbsp; <span>{{ item.template2 }}</span
+                          >&nbsp;
+                          <a href="" style="color: #1890ff">
+                            {{ item?.project?.name }}
+                          </a>
+                        </span>
+                      </span>
+                    </template>
+                    <template #avatar>
+                      <a-avatar :src="item.user.avatar" />
+                    </template>
+                    <template #description>
+                      <span class="datetime" :title="item.updatedAt">
+                        {{ item.updatedAt }}
+                      </span>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+              </template>
+            </a-list>
+          </a-card>
+        </a-col>
+        <a-col :xl="8" :lg="24" :md="24" :sm="24" :xs="24">
+          <a-card
+            :style="{ marginBottom: '24px' }"
+            title="快速开始 / 便捷导航"
+            :bordered="false"
+            :body-style="{ padding: 0 }"
+          >
+            <EditableLinkGroup />
+          </a-card>
+          <a-card
+            :style="{ marginBottom: '24px' }"
+            :bordered="false"
+            title="XX 指数"
+          >
+            <div class="chart">
+              <div ref="radarContainer" />
+            </div>
+          </a-card>
+          <a-card
+            :body-style="{ paddingTop: '12px', paddingBottom: '12px' }"
+            :bordered="false"
+            title="团队"
+          >
+            <div class="members">
+              <a-row :gutter="48">
+                <a-col
+                  v-for="item in projectNotice"
+                  :key="`members-item-${item.id}`"
+                  :span="12"
+                >
+                  <a :href="item.href">
+                    <a-avatar :src="item.logo" size="small" />
+                    <span class="member">{{ item.member }}</span>
+                  </a>
+                </a-col>
+              </a-row>
+            </div>
+          </a-card>
+        </a-col>
+      </a-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  Statistic,
+  Row,
+  Col,
+  Card,
+  CardGrid,
+  CardMeta,
+  List,
+  ListItem,
+  ListItemMeta,
+  Avatar,
+} from "ant-design-vue";
+import 'ant-design-vue/dist/reset.css';
+
+export default {
+  components: {
+    AStatistic: Statistic,
+    ARow: Row,
+    ACol: Col,
+    ACard: Card,
+    ACardGrid: CardGrid,
+    ACardMeta: CardMeta,
+    AList: List,
+    AListItem: ListItem,
+    AListItemMeta: ListItemMeta,
+    AAvatar: Avatar,
+  },
+};
+</script>
+
+
+<script setup>
+import { Radar } from "@antv/g2plot";
+import EditableLinkGroup from "./editable-link-group.vue";
+
+defineOptions({
+  name: "DashBoard",
+});
+
+const currentUser = {
+  avatar: "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
+  name: "吴彦祖",
+  userid: "00000001",
+  email: "antdesign@alipay.com",
+  signature: "海纳百川，有容乃大",
+  title: "交互专家",
+  group: "蚂蚁金服－某某某事业群－某某平台部－某某技术部－UED",
+};
+
+const projectNotice = [
+  {
+    id: "xxx1",
+    title: "Alipay",
+    logo: "https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png",
+    description: "那是一种内在的东西，他们到达不了，也无法触及的",
+    updatedAt: "几秒前",
+    member: "科学搬砖组",
+    href: "",
+    memberLink: "",
+  },
+  {
+    id: "xxx2",
+    title: "Angular",
+    logo: "https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png",
+    description: "希望是一个好东西，也许是最好的，好东西是不会消亡的",
+    updatedAt: "6 年前",
+    member: "全组都是吴彦祖",
+    href: "",
+    memberLink: "",
+  },
+  {
+    id: "xxx3",
+    title: "Ant Design",
+    logo: "https://gw.alipayobjects.com/zos/rmsportal/dURIMkkrRFpPgTuzkwnB.png",
+    description: "城镇中有那么多的酒馆，她却偏偏走进了我的酒馆",
+    updatedAt: "几秒前",
+    member: "中二少女团",
+    href: "",
+    memberLink: "",
+  },
+  {
+    id: "xxx4",
+    title: "Ant Design Pro",
+    logo: "https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png",
+    description: "那时候我只会想自己想要什么，从不想自己拥有什么",
+    updatedAt: "6 年前",
+    member: "程序员日常",
+    href: "",
+    memberLink: "",
+  },
+  {
+    id: "xxx5",
+    title: "Bootstrap",
+    logo: "https://gw.alipayobjects.com/zos/rmsportal/siCrBXXhmvTQGWPNLBow.png",
+    description:
+      "凛冬将至",
+    updatedAt: "6 年前",
+    member: "高逼格设计天团",
+    href: "",
+    memberLink: "",
+  },
+  {
+    id: "xxx6",
+    title: "React",
+    logo: "https://gw.alipayobjects.com/zos/rmsportal/kZzEzemZyKLKFsojXItE.png",
+    description: "生命就像一盒巧克力，结果往往出人意料",
+    updatedAt: "6 年前",
+    member: "骗你来学计算机",
+    href: "",
+    memberLink: "",
+  },
+];
+
+const activities = [
+  {
+    id: "trend-1",
+    updatedAt: "几秒前",
+    user: {
+      name: "曲丽丽",
+      avatar:
+        "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
+    },
+    group: {
+      name: "高逼格设计天团",
+      link: "http://github.com/",
+    },
+    project: {
+      name: "六月迭代",
+      link: "http://github.com/",
+    },
+    template1: "在",
+    template2: "新建项目",
+  },
+  {
+    id: "trend-2",
+    updatedAt: "几秒前",
+    user: {
+      name: "付小小",
+      avatar:
+        "https://gw.alipayobjects.com/zos/rmsportal/cnrhVkzwxjPwAaCfPbdc.png",
+    },
+    group: {
+      name: "高逼格设计天团",
+      link: "http://github.com/",
+    },
+    project: {
+      name: "六月迭代",
+      link: "http://github.com/",
+    },
+    template1: "在",
+    template2: "新建项目",
+  },
+  {
+    id: "trend-3",
+    updatedAt: "几秒前",
+    user: {
+      name: "林东东",
+      avatar:
+        "https://gw.alipayobjects.com/zos/rmsportal/gaOngJwsRYRaVAuXXcmB.png",
+    },
+    group: {
+      name: "中二少女团",
+      link: "http://github.com/",
+    },
+    project: {
+      name: "六月迭代",
+      link: "http://github.com/",
+    },
+    template1: "在",
+    template2: "新建项目",
+  },
+  {
+    id: "trend-4",
+    updatedAt: "几秒前",
+    user: {
+      name: "周星星",
+      avatar:
+        "https://gw.alipayobjects.com/zos/rmsportal/WhxKECPNujWoWEFNdnJE.png",
+    },
+    group: {
+      name: "5 月日常迭代",
+      link: "http://github.com/",
+    },
+    template1: "将",
+    template2: "更新至已发布状态",
+  },
+  {
+    id: "trend-5",
+    updatedAt: "几秒前",
+    user: {
+      name: "朱偏右",
+      avatar:
+        "https://gw.alipayobjects.com/zos/rmsportal/ubnKSIfAJTxIgXOKlciN.png",
+    },
+    group: {
+      name: "工程效能",
+      link: "http://github.com/",
+    },
+    project: {
+      name: "留言",
+      link: "http://github.com/",
+    },
+    template1: "在",
+    template2: "发布了",
+  },
+  {
+    id: "trend-6",
+    updatedAt: "几秒前",
+    user: {
+      name: "乐哥",
+      avatar:
+        "https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png",
+    },
+    group: {
+      name: "程序员日常",
+      link: "http://github.com/",
+    },
+    project: {
+      name: "品牌迭代",
+      link: "http://github.com/",
+    },
+    template1: "在",
+    template2: "新建项目",
+  },
+];
+
+const radarContainer = ref();
+const radarData = [
+  {
+    name: "个人",
+    label: "引用",
+    value: 10,
+  },
+  {
+    name: "个人",
+    label: "口碑",
+    value: 8,
+  },
+  {
+    name: "个人",
+    label: "产量",
+    value: 4,
+  },
+  {
+    name: "个人",
+    label: "贡献",
+    value: 5,
+  },
+  {
+    name: "个人",
+    label: "热度",
+    value: 7,
+  },
+  {
+    name: "团队",
+    label: "引用",
+    value: 3,
+  },
+  {
+    name: "团队",
+    label: "口碑",
+    value: 9,
+  },
+  {
+    name: "团队",
+    label: "产量",
+    value: 6,
+  },
+  {
+    name: "团队",
+    label: "贡献",
+    value: 3,
+  },
+  {
+    name: "团队",
+    label: "热度",
+    value: 1,
+  },
+  {
+    name: "部门",
+    label: "引用",
+    value: 4,
+  },
+  {
+    name: "部门",
+    label: "口碑",
+    value: 1,
+  },
+  {
+    name: "部门",
+    label: "产量",
+    value: 6,
+  },
+  {
+    name: "部门",
+    label: "贡献",
+    value: 5,
+  },
+  {
+    name: "部门",
+    label: "热度",
+    value: 7,
+  },
+];
+let radar;
+onMounted(() => {
+  radar = new Radar(radarContainer.value, {
+    data: radarData,
+    xField: "label",
+    yField: "value",
+    seriesField: "name",
+    point: {
+      size: 4,
+    },
+    legend: {
+      layout: "horizontal",
+      position: "bottom",
+    },
+  });
+  radar.render();
+});
+
+onBeforeUnmount(() => {
+  radar?.destroy?.();
+});
+</script>
+
+<style scoped lang="less">
+.textOverflow() {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: break-all;
+}
+
+// mixins for clearfix
+// ------------------------
+.clearfix() {
+  zoom: 1;
+  &::before,
+  &::after {
+    display: table;
+    content: " ";
+  }
+  &::after {
+    clear: both;
+    height: 0;
+    font-size: 0;
+    visibility: hidden;
+  }
+}
+
+.activitiesList {
+  padding: 0 24px 8px 24px;
+  .username {
+    color: rgba(0, 0, 0, 0.65);
+  }
+  .event {
+    font-weight: normal;
+  }
+}
+
+.pageHeaderContent {
+  display: flex;
+  padding: 12px;
+  margin-bottom: 24px;
+  box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;
+  .avatar {
+    flex: 0 1 72px;
+    & > span {
+      display: block;
+      width: 72px;
+      height: 72px;
+      border-radius: 72px;
+    }
+  }
+  .content {
+    position: relative;
+    top: 4px;
+    flex: 1 1 auto;
+    margin-left: 24px;
+    color: rgba(0, 0, 0, 0.45);
+    line-height: 22px;
+    .contentTitle {
+      margin-bottom: 12px;
+      color: rgba(0, 0, 0, 0.85);
+      font-weight: 500;
+      font-size: 20px;
+      line-height: 28px;
+    }
+  }
+}
+
+.extraContent {
+  .clearfix();
+
+  float: right;
+  white-space: nowrap;
+  .statItem {
+    position: relative;
+    display: inline-block;
+    padding: 0 32px;
+    > p:first-child {
+      margin-bottom: 4px;
+      color: rgba(0, 0, 0, 0.45);
+      font-size: 14px;
+      line-height: 22px;
+    }
+    > p {
+      margin: 0;
+      color: rgba(0, 0, 0, 0.85);
+      font-size: 30px;
+      line-height: 38px;
+      > span {
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 20px;
+      }
+    }
+    &::after {
+      position: absolute;
+      top: 8px;
+      right: 0;
+      width: 1px;
+      height: 40px;
+      background-color: #e8e8e8;
+      content: "";
+    }
+    &:last-child {
+      padding-right: 0;
+      &::after {
+        display: none;
+      }
+    }
+  }
+}
+
+.members {
+  a {
+    display: block;
+    height: 24px;
+    margin: 12px 0;
+    color: rgba(0, 0, 0, 0.65);
+    transition: all 0.3s;
+    .textOverflow();
+    .member {
+      margin-left: 12px;
+      font-size: 14px;
+      line-height: 24px;
+      vertical-align: top;
+    }
+    &:hover {
+      color: #1890ff;
+    }
+  }
+}
+
+.projectList {
+  :deep(.ant-card-meta-description) {
+    height: 44px;
+    overflow: hidden;
+    color: rgba(0, 0, 0, 0.45);
+    line-height: 22px;
+  }
+  .cardTitle {
+    font-size: 0;
+    a {
+      display: inline-block;
+      height: 24px;
+      margin-left: 12px;
+      color: rgba(0, 0, 0, 0.85);
+      font-size: 14px;
+      line-height: 24px;
+      vertical-align: top;
+      &:hover {
+        color: #1890ff;
+      }
+    }
+  }
+  .projectGrid {
+    width: 33.33%;
+  }
+  .projectItemContent {
+    display: flex;
+    flex-basis: 100%;
+    height: 20px;
+    margin-top: 8px;
+    overflow: hidden;
+    font-size: 12px;
+    line-height: 20px;
+    .textOverflow();
+    a {
+      display: inline-block;
+      flex: 1 1 0;
+      color: rgba(0, 0, 0, 0.45);
+      .textOverflow();
+      &:hover {
+        color: #1890ff;
+      }
+    }
+    .datetime {
+      flex: 0 0 auto;
+      float: right;
+      color: rgba(0, 0, 0, 0.25);
+    }
+  }
+}
+
+.datetime {
+  color: rgba(0, 0, 0, 0.25);
+}
+
+@media screen and (max-width: 1200px) and (min-width: 992px) {
+  .activeCard {
+    margin-bottom: 24px;
+  }
+  .members {
+    margin-bottom: 0;
+  }
+  .extraContent {
+    margin-left: -44px;
+    .statItem {
+      padding: 0 16px;
+    }
+  }
+}
+
+@media screen and (max-width: 992px) {
+  .activeCard {
+    margin-bottom: 24px;
+  }
+  .members {
+    margin-bottom: 0;
+  }
+  .extraContent {
+    float: none;
+    margin-right: 0;
+    .statItem {
+      padding: 0 16px;
+      text-align: left;
+      &::after {
+        display: none;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 768px) {
+  .extraContent {
+    margin-left: -16px;
+  }
+  .projectList {
+    .projectGrid {
+      width: 50%;
+    }
+  }
+}
+
+@media screen and (max-width: 576px) {
+  .pageHeaderContent {
+    display: block;
+    .content {
+      margin-left: 0;
+    }
+  }
+  .extraContent {
+    .statItem {
+      float: none;
+    }
+  }
+}
+
+@media screen and (max-width: 480px) {
+  .projectList {
+    .projectGrid {
+      width: 100%;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/views/login.vue b/ruoyi-fastapi-frontend/src/views/login.vue
index 28904a7f7da1308c78b3021074b8d647bb5c8085..d9556c9e3d846d87662a1a91ef7483f77b38d088 100644
--- a/ruoyi-fastapi-frontend/src/views/login.vue
+++ b/ruoyi-fastapi-frontend/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">vfadmin后台管理系统</h3>
+      <h3 class="title">考勤管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
diff --git a/ruoyi-fastapi-frontend/src/views/register.vue b/ruoyi-fastapi-frontend/src/views/register.vue
index 810dea828857d4f4c2a185016abb350dd514c05b..08c94d18b17c85f6d8bd1926f321a142c55b760d 100644
--- a/ruoyi-fastapi-frontend/src/views/register.vue
+++ b/ruoyi-fastapi-frontend/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">vfadmin后台管理系统</h3>
+      <h3 class="title">考勤管理系统</h3>
       <el-form-item prop="username">
         <el-input 
           v-model="registerForm.username" 
diff --git a/ruoyi-fastapi-frontend/src/views/roster/batch/authUser.vue b/ruoyi-fastapi-frontend/src/views/roster/batch/authUser.vue
new file mode 100644
index 0000000000000000000000000000000000000000..66b5f5e6cc1216b2249b58a947db6d49e5b16111
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/roster/batch/authUser.vue
@@ -0,0 +1,172 @@
+
+<template>
+   <div class="app-container">
+      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
+         <el-form-item label="用户名称" prop="userName">
+            <el-input
+               v-model="queryParams.userName"
+               placeholder="请输入用户名称"
+               clearable
+               style="width: 240px"
+               @keyup.enter="handleQuery"
+            />
+         </el-form-item>
+         <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+               v-model="queryParams.phonenumber"
+               placeholder="请输入手机号码"
+               clearable
+               style="width: 240px"
+               @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-row :gutter="10" class="mb8">
+         <el-col :span="1.5">
+            <el-button
+               type="primary"
+               plain
+               icon="Plus"
+               @click="openSelectUser"
+               v-hasPermi="['system:role:add']"
+            >添加用户</el-button>
+         </el-col>
+         <el-col :span="1.5">
+            <el-button
+               type="danger"
+               plain
+               icon="CircleClose"
+               :disabled="multiple"
+               @click="cancelAuthUserAll"
+               v-hasPermi="['system:role:remove']"
+            >批量取消授权</el-button>
+         </el-col>
+         <el-col :span="1.5">
+            <el-button 
+               type="warning" 
+               plain 
+               icon="Close"
+               @click="handleClose"
+            >关闭</el-button>
+         </el-col>
+         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+
+      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+         <el-table-column type="selection" width="55" align="center" />
+         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+         <el-table-column label="状态" align="center" prop="status">
+            <template #default="scope">
+               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+            </template>
+         </el-table-column>
+         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template #default="scope">
+               <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+         </el-table-column>
+         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template #default="scope">
+               <el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']">取消授权</el-button>
+            </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"
+      />
+      <select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
+   </div>
+</template>
+
+<script setup name="AuthUser">
+import selectUser from "./selectUser";
+import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
+
+const route = useRoute();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+const userList = ref([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const userIds = ref([]);
+
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  roleId: route.params.roleId,
+  userName: undefined,
+  phonenumber: undefined,
+});
+
+/** 查询授权用户列表 */
+function getList() {
+  loading.value = true;
+  allocatedUserList(queryParams).then(response => {
+    userList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+// 返回按钮
+function handleClose() {
+  const obj = { path: "/system/role" };
+  proxy.$tab.closeOpenPage(obj);
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  userIds.value = selection.map(item => item.userId);
+  multiple.value = !selection.length;
+}
+/** 打开授权用户表弹窗 */
+function openSelectUser() {
+  proxy.$refs["selectRef"].show();
+}
+/** 取消授权按钮操作 */
+function cancelAuthUser(row) {
+  proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
+    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("取消授权成功");
+  }).catch(() => {});
+}
+/** 批量取消授权按钮操作 */
+function cancelAuthUserAll(row) {
+  const roleId = queryParams.roleId;
+  const uIds = userIds.value.join(",");
+  proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {
+    return authUserCancelAll({ roleId: roleId, userIds: uIds });
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("取消授权成功");
+  }).catch(() => {});
+}
+
+getList();
+</script>
diff --git a/ruoyi-fastapi-frontend/src/views/roster/batch/index.vue b/ruoyi-fastapi-frontend/src/views/roster/batch/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..71cba593e8f0a6e4da9cccbf28c428a188608e0c
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/roster/batch/index.vue
@@ -0,0 +1,395 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
+
+      <el-form-item label="分组描述" prop="rosterName">
+        <el-input v-model="queryParams.rosterName" placeholder="请输入分组描述" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="员工" prop="userNames">
+        <el-select v-model="queryParams.userNames" placeholder="选择员工" filterable clearable style="width: 240px"
+          multiple>
+          <el-option v-for="employee in allEmployeeList" :key="employee[0]" :label="employee[1]" :value="employee[0]" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:rost:add']">新增</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:rost:remove']">删除</el-button>
+      </el-col>
+
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 表格数据 -->
+    <el-table v-loading="loading" :data="fenzuList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="分组ID" prop="rosterId" width="120" />
+      <el-table-column label="分组描述" prop="rosterName" width="120" />
+      <el-table-column label="上班时间" prop="rosterTimeIds" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="排班日期" prop="rosterDatetime" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="员工" prop="userNames" :show-overflow-tooltip="true" width="150" />
+
+      <el-table-column label="创建时间" align="center" prop="rosterCreateTime">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.rosterCreateTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <!-- <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']"></el-button>
+          </el-tooltip> -->
+          <el-tooltip content="删除" placement="top" v-if="scope.row.rosterId !== 1">
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:rosterId:remove']"></el-button>
+          </el-tooltip>
+
+          <el-tooltip content="添加员工" placement="top" v-if="scope.row.rosterId !== 1">
+            <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)"
+              v-hasPermi="['system:rosterId:edit']"></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-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="rostRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="分组名称" prop="rostName">
+          <el-input v-model="form.rosterName" placeholder="请输入分组描述" />
+        </el-form-item>
+
+        <el-form-item label="上班时间" prop="workTime">
+          <el-select v-model="form.rosterTimeIds" multiple clearable placeholder="请选择上班时间">
+            <el-option v-for="(item, index) in workTimeList" :key="index" :label="index + 1" :value="item.timeId">
+              {{ item.timeStart }} - {{ item.timeEnd }}
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="排班日期" prop="workDateList">
+          <el-date-picker v-model="form.rosterDatetime" type="dates" placeholder="请选择排班日期" format="YYYY/MM/DD"
+            value-format="YYYY-MM-DD" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 弹出对话框 -->
+    <el-dialog v-model="showDialog" title="选择员工">
+      <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange(checkAll)">
+        全选
+      </el-checkbox>
+      <el-checkbox-group v-model="rosterallEmployeeList" @change="handleCheckedEmployeesChange(rosterallEmployeeList)">
+        <el-checkbox v-for="employee in allEmployeeList" :key="employee[0]" :label="employee[0]" :value="employee[0]">{{
+      employee[1] }}</el-checkbox>
+      </el-checkbox-group>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="addSelectedEmployees(rosterallEmployeeList)">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 分配角色数据权限对话框 -->
+
+  </div>
+</template>
+
+<script setup name="RosterBatch">
+
+import { listEployees, addRostGroup, delRostGroup, addRost, listTimeTemplate, listRostGroup } from "@/api/rost/batch";
+import { ref } from "vue";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+
+
+// 对应分组分配员工列表
+const allEmployeeList = ref([]);   // 所有员工列表，二维数组[[1，黎明],[2,limi]]
+const selectedEmployees = ref([]);    // 选中的员工id列表
+const showDialog = ref(false);
+const isIndeterminate = ref(false);
+const checkAll = ref(false);
+const rosterallEmployeeList = ref([]);      // 需要提交的员工id列表（接口参数）
+const fenzuRosterId = ref("");
+
+const workTimeList = ref([]);
+// const roleList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    rosterName: undefined,
+    userNames: undefined,
+    rosterCreateTime: undefined
+  },
+  rules: {
+    rosterName: [{ required: true, message: "排班名称不能为空", trigger: "blur" }],
+    rosterTimeIds: [{ required: true, message: "上班时间不能为空", trigger: "blur" }],
+    rosterDatetime: [{ required: true, message: "排班日期不能为空", trigger: "blur" }]
+  },
+  selectedEmployees: [],
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const fenzuList = ref([]);
+//{ rosterId: '22', rosterName: '白班', rosterTime: '8:00-12:00', employees: '张三,李四,王五', createTime: '2024-10-08', rosterDatetime: '2022-01-01' }
+
+/** 查询分组列表 */
+function getList() {
+  loading.value = true;
+
+  console.log('queryParams', queryParams.value);
+
+  listRostGroup(queryParams.value).then(response => {
+    console.log(response);
+    total.value = response.total;
+    fenzuList.value = response.rows;
+    // fenzuList.splice(0, fenzuList.length);
+    // response.rows.forEach(item => {
+    //   fenzuList.push(item);
+    // });
+    console.log('fenzuList', fenzuList);
+
+  });
+
+  loading.value = false;
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  // queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  // 重置表单
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    rosterName: undefined,
+    userNames: undefined,
+    rosterCreateTime: undefined
+  };
+  handleQuery();
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  console.log('row', row.rosterId);
+  const rosterIds = row.rosterId || ids.value;
+  proxy.$modal.confirm('是否确认删除分组编号为"' + rosterIds + '"的数据项?').then(function () {
+    return delRostGroup(rosterIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.rosterId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 重置新增的表单以及其他数据  */
+function reset() {
+  form.value = {
+    rosterId: Number,
+    rosterName: '',
+    rosterTimeIds: [],
+    rosterDatetime: []
+  };
+  proxy.resetForm("rostRef");
+}
+/** 添加分组信息 */
+function handleAdd() {
+  reset();
+  // getMenuTreeselect();
+  listTimeTemplate().then(res => {
+    console.log(res)
+    workTimeList.value = res.rows;
+    console.log('workTimeList', workTimeList)
+  })
+  open.value = true;
+  title.value = "添加分组排班信息";
+}
+/** 修改分组信息 */
+// function handleUpdate(row) {
+//   reset();
+//   const roleId = row.roleId || ids.value;
+//   const roleMenu = getRoleMenuTreeselect(roleId);
+//   getRole(roleId).then(response => {
+//     form.value = response.data;
+//     form.value.roleSort = Number(form.value.roleSort);
+//     open.value = true;
+//     nextTick(() => {
+//       roleMenu.then((res) => {
+//         let checkedKeys = res.checkedKeys;
+//         checkedKeys.forEach((v) => {
+//           nextTick(() => {
+//             menuRef.value.setChecked(v, true, false);
+//           });
+//         });
+//       });
+//     });
+//     title.value = "修改分组排班信息";
+//   });
+// }
+
+/** 提交按钮 */
+function submitForm() {
+  console.log('当前表单数据:', form.value);
+
+  let params = {
+    ...form.value,
+    rosterTimeIds: form.value.rosterTimeIds.join(','),
+    rosterDatetime: form.value.rosterDatetime.join(',')
+  };
+
+  console.log('提交参数:', params);
+
+  proxy.$refs["rostRef"].validate(valid => {
+    if (valid && form.value.rosterId !== undefined) {
+      addRostGroup(params)
+        .then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+          console.log('表单提交后的数据:', form.value);
+          proxy.resetForm("rostRef");
+        })
+        .catch(error => {
+          console.error('新增失败:', error);
+        });
+    }
+  });
+}
+
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+/** 分配用户 */
+function handleAuthUser(row) {
+  rosterallEmployeeList.value = [];
+  showDialog.value = true;
+  fenzuRosterId.value = row.rosterId;
+  console.log('row:', row);
+
+  // 获取员工列表并设置初始已选中员工
+  getallEmployeeList(row.rosterId);
+}
+
+/** 获取员工列表 */
+function getallEmployeeList(rosterId) {
+
+  console.log('rosterId', rosterId);
+  // 假设从 API 获取员工列表
+
+  // 获取当前分组的员工列表
+  listEployees({ rosterId: rosterId }).then(res => {
+    console.log('res', res);
+    // 将当前分组员工的ID设置为初始选中值
+    rosterallEmployeeList.value = res.msg[1].map(employee => employee[0]); // 这里假设 ID 在数组的第一个位置
+    allEmployeeList.value = res.msg[0];
+
+    console.log('allEmployeeList', allEmployeeList);
+    console.log('rosterallEmployeeList', rosterallEmployeeList);
+    // 检查全选和部分选择状态
+    const checkedCount = rosterallEmployeeList.value.length;
+    const totalCount = allEmployeeList.value.length;
+
+    checkAll.value = checkedCount === totalCount; // 更新全选框状态
+    isIndeterminate.value = checkedCount > 0 && checkedCount < totalCount; // 更新部分选择状态
+  });
+
+
+}
+
+// 分配员工多选框全选操作
+function handleCheckAllChange(val) {
+  console.log('val', val);
+
+  // 如果全选框被选中，将所有员工添加到 rosterallEmployeeList，否则清空 rosterallEmployeeList
+  rosterallEmployeeList.value = val ? allEmployeeList.value.map(employee => employee[0]) : [];
+
+  isIndeterminate.value = false; // 重置部分选择状态
+
+  console.log('rosterallEmployeeList', rosterallEmployeeList);
+}
+// 处理手动选择复选框时的变化
+function handleCheckedEmployeesChange(value) {
+  const checkedCount = value.length; // 获取当前选中的员工数量
+  const totalCount = allEmployeeList.value.length; // 获取所有员工的数量
+
+  // 更新全选框的状态
+  checkAll.value = checkedCount === totalCount; // 如果选中的数量等于总数量，则全选框勾选
+  isIndeterminate.value = checkedCount > 0 && checkedCount < totalCount; // 部分选中状态
+}
+
+
+// 在对应排班信息中添加选中的员工
+function addSelectedEmployees(val) {
+  // console.log(val)
+  rosterallEmployeeList.value = val;
+  // console.log('rosterallEmployeeList', rosterallEmployeeList);
+
+  addRost({ rosterallEmployeeList, fenzuRosterId }).then(response => {
+    console.log(response);
+    showDialog.value = false;
+    selectedEmployees.value = [];
+
+    isIndeterminate.value = false;
+    checkAll.value = false;
+    getList();
+    proxy.$modal.msgSuccess("添加成功");
+  });
+  selectedEmployees.value = [];
+}
+
+getList();
+getallEmployeeList();
+</script>
diff --git a/ruoyi-fastapi-frontend/src/views/roster/batch/selectUser.vue b/ruoyi-fastapi-frontend/src/views/roster/batch/selectUser.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9269f5cde361a3938f229156545c4cc71ad2fd9d
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/roster/batch/selectUser.vue
@@ -0,0 +1,138 @@
+<template>
+   <!-- 授权用户 -->
+   <el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
+      <el-form :model="queryParams" ref="queryRef" :inline="true">
+         <el-form-item label="用户名称" prop="userName">
+            <el-input
+               v-model="queryParams.userName"
+               placeholder="请输入用户名称"
+               clearable
+               style="width: 180px"
+               @keyup.enter="handleQuery"
+            />
+         </el-form-item>
+         <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+               v-model="queryParams.phonenumber"
+               placeholder="请输入手机号码"
+               clearable
+               style="width: 180px"
+               @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-row>
+         <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+            <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+            <el-table-column label="状态" align="center" prop="status">
+               <template #default="scope">
+                  <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+               </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+               <template #default="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+               </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-row>
+      <template #footer>
+         <div class="dialog-footer">
+            <el-button type="primary" @click="handleSelectUser">确 定</el-button>
+            <el-button @click="visible = false">取 消</el-button>
+         </div>
+      </template>
+   </el-dialog>
+</template>
+
+<script setup name="SelectUser">
+import { authUserSelectAll, unallocatedUserList } from "@/api/system/role";
+
+const props = defineProps({
+  roleId: {
+    type: [Number, String]
+  }
+});
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+const userList = ref([]);
+const visible = ref(false);
+const total = ref(0);
+const userIds = ref([]);
+
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  roleId: undefined,
+  userName: undefined,
+  phonenumber: undefined
+});
+
+// 显示弹框
+function show() {
+  queryParams.roleId = props.roleId;
+  getList();
+  visible.value = true;
+}
+/**选择行 */
+function clickRow(row) {
+  proxy.$refs["refTable"].toggleRowSelection(row);
+}
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  userIds.value = selection.map(item => item.userId);
+}
+// 查询表数据
+function getList() {
+  unallocatedUserList(queryParams).then(res => {
+    userList.value = res.rows;
+    total.value = res.total;
+  });
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+const emit = defineEmits(["ok"]);
+/** 选择授权用户操作 */
+function handleSelectUser() {
+  const roleId = queryParams.roleId;
+  const uIds = userIds.value.join(",");
+  if (uIds == "") {
+    proxy.$modal.msgError("请选择要分配的用户");
+    return;
+  }
+  authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => {
+    proxy.$modal.msgSuccess(res.msg);
+    visible.value = false;
+    emit("ok");
+  });
+}
+
+defineExpose({
+  show,
+});
+</script>
diff --git a/ruoyi-fastapi-frontend/src/views/roster/leave/index.vue b/ruoyi-fastapi-frontend/src/views/roster/leave/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2837ecfa1dfa51da11e62c67f788d6f06e9f4161
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/roster/leave/index.vue
@@ -0,0 +1,488 @@
+<template>
+    <div class="app-container">
+        <el-row :gutter="20">
+            <!--部门数据-->
+            <el-col :span="4" :xs="24">
+                <div class="head-container">
+                    <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
+                        style="margin-bottom: 20px" />
+                </div>
+                <div class="head-container">
+                    <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }"
+                        :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id"
+                        highlight-current default-expand-all @node-click="handleNodeClick" />
+                </div>
+            </el-col>
+            <!--用户数据-->
+            <el-col :span="20" :xs="24">
+                <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+                    <el-form-item label="用户名称" prop="userName">
+                        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="手机号码" prop="phonenumber">
+                        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+                            @keyup.enter="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="状态" prop="status">
+                        <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+                            <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                                :value="dict.value" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="创建时间" style="width: 308px;">
+                        <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange"
+                            range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                    </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-row :gutter="10" class="mb8">
+
+                    <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                            v-hasPermi="['system:user:edit']">修改</el-button>
+                    </el-col>
+
+                    <el-col :span="1.5">
+                        <el-button type="info" plain icon="Upload" @click="handleImport"
+                            v-hasPermi="['system:user:import']">导入</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport"
+                            v-hasPermi="['system:user:export']">导出</el-button>
+                    </el-col>
+                    <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"
+                        :columns="columns"></right-toolbar>
+                </el-row>
+
+                <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="50" align="center" />
+                    <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+                    <el-table-column label="用户名称" align="center" key="userName" prop="userName"
+                        v-if="columns[1].visible" :show-overflow-tooltip="true" />
+                    <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName"
+                        v-if="columns[2].visible" :show-overflow-tooltip="true" />
+                    <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName"
+                        v-if="columns[3].visible" :show-overflow-tooltip="true" />
+                    <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+                        v-if="columns[4].visible" width="120" />
+                    <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+                        <template #default="scope">
+                            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                                @change="handleStatusChange(scope.row)"></el-switch>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible"
+                        width="160">
+                        <template #default="scope">
+                            <span>{{ parseTime(scope.row.createTime) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+                        <template #default="scope">
+
+                            <el-tooltip content="请假申请修改" placement="top" v-if="scope.row.userId !== 1">
+                                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                                    v-hasPermi="['system:role:edit']"></el-button>
+                            </el-tooltip>
+
+
+                            <el-tooltip content="请假申请" placement="top" v-if="scope.row.userId !== 1">
+                                <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)"
+                                    v-hasPermi="['system:role:edit']"></el-button>
+                            </el-tooltip>
+                            <el-tooltip content="请假详情" placement="top" v-if="scope.row.userId !== 1">
+                                <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+                                    v-hasPermi="['system:role:view']"></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-col>
+        </el-row>
+
+        <!-- 添加或修改员工请假信息对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body destroy-on-close @close="reset">
+            <el-form ref="leaveRef" :model="form" :rules="rules" label-width="100px">
+                <div v-if="title === '请假申请'">
+                    <el-form-item label="请假类别" prop="leaveType">
+                        <el-input v-model="form.leaveType" placeholder="请输入请假类别" />
+                    </el-form-item>
+                    <el-form-item label="请假事由" prop="leaveReason">
+                        <el-input v-model="form.leaveReason" placeholder="请输入请假事由" />
+                    </el-form-item>
+                </div>
+
+                <el-form-item label="修改前时间" prop="leaveId" v-if="title === '请假信息修改'">
+                    <el-select v-model="form.leaveId" filterable>
+                        <el-option v-for="leavedDatetime in leavedDatetimeList" :key="leavedDatetime.leave_id"
+                            :label="`${leavedDatetime.leave_datetime[0]} - ${leavedDatetime.leave_datetime[1]}`"
+                            :value="leavedDatetime.leave_id">
+                            {{ leavedDatetime.leave_datetime[0] }} - {{ leavedDatetime.leave_datetime[1] }}
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="修改后时间" prop="newLeaveDatetime">
+
+                    <el-date-picker v-model="form.newLeaveDatetime" type="datetimerange" start-placeholder="开始时间"
+                        end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd"
+                        time-format="A hh:mm:ss" />
+
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <!-- 用户导入对话框 -->
+        <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+            <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+                <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                <template #tip>
+                    <div class="el-upload__tip text-center">
+                        <div class="el-upload__tip">
+                            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                        </div>
+                        <span>仅允许导入xls、xlsx格式文件。</span>
+                        <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                            @click="importTemplate">下载模板</el-link>
+                    </div>
+                </template>
+            </el-upload>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitFileForm">确 定</el-button>
+                    <el-button @click="upload.open = false">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <!-- 查看详情弹出对话框 -->
+        <el-dialog v-model="dialogTableVisible" title="已请假详情" width="800">
+            <el-table :data="gridData">
+                <el-table-column property="leave_id" label="leaveId" width="150" />
+                <el-table-column property="leave_type" label="请假类别" width="200" />
+                <el-table-column property="leave_reason" label="请假事由" width="200" />
+                <el-table-column property="leave_datetime" label="已请假时间" width="200" />
+            </el-table>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="leaveUser">
+import { getToken } from "@/utils/auth";
+import { listUser, deptTreeSelect } from "@/api/system/user";
+
+import { addUserLeave, editUserLeave, getUserInfo } from '@/api/rost/leave';
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable", "sys_user_sex");
+
+const userList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+const deptName = ref("");
+const deptOptions = ref(undefined);
+
+const dialogTableVisible = ref(false); // 个人所有请假信息详情弹窗
+const gridData = ref([]); // 个人所有请假信息详情数据
+
+const leavedDatetimeList = ref([]); // 个人已请假时间列表
+
+/*** 用户导入参数 */
+const upload = reactive({
+    // 是否显示弹出层（用户导入）
+    open: false,
+    // 弹出层标题（用户导入）
+    title: "",
+    // 是否禁用上传
+    isUploading: false,
+    // 是否更新已经存在的用户数据
+    updateSupport: 0,
+    // 设置上传的请求头部
+    headers: { Authorization: "Bearer " + getToken() },
+    // 上传的地址
+    url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+});
+// 列显隐信息
+const columns = ref([
+    { key: 0, label: `用户编号`, visible: true },
+    { key: 1, label: `用户名称`, visible: true },
+    { key: 2, label: `用户昵称`, visible: true },
+    { key: 3, label: `部门`, visible: true },
+    { key: 4, label: `手机号码`, visible: true },
+    { key: 5, label: `状态`, visible: true },
+    { key: 6, label: `创建时间`, visible: true }
+]);
+
+const data = reactive({
+    form: {},
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined
+    },
+    rules: {
+        leaveId: [{ required: true, message: "请假时间不能为空", trigger: "blur" }],
+        leaveType: [{ required: true, message: "请假类别不能为空", trigger: "blur" }],
+        leaveReason: [{ required: true, message: "请假原因不能为空", trigger: "blur" }],
+        newLeaveDatetime: [{ required: true, message: "请假时间不能为空", trigger: "blur" }]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 通过条件过滤节点  */
+const filterNode = (value, data) => {
+    if (!value) return true;
+    return data.label.indexOf(value) !== -1;
+};
+/** 根据名称筛选部门树 */
+watch(deptName, val => {
+    proxy.$refs["deptTreeRef"].filter(val);
+});
+/** 查询部门下拉树结构 */
+function getDeptTree() {
+    deptTreeSelect().then(response => {
+        deptOptions.value = response.data;
+    });
+};
+/** 查询用户列表 */
+function getList() {
+    loading.value = true;
+    listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+        console.log('user', res);
+        loading.value = false;
+        userList.value = res.rows;
+        total.value = res.total;
+    });
+};
+/** 节点单击事件 */
+function handleNodeClick(data) {
+    queryParams.value.deptId = data.id;
+    handleQuery();
+};
+/** 搜索按钮操作 */
+function handleQuery() {
+    queryParams.value.pageNum = 1;
+    getList();
+};
+/** 重置按钮操作 */
+function resetQuery() {
+    dateRange.value = [];
+    proxy.resetForm("queryRef");
+    queryParams.value.deptId = undefined;
+    proxy.$refs.deptTreeRef.setCurrentKey(null);
+    handleQuery();
+};
+
+/** 导出按钮操作 */
+function handleExport() {
+    proxy.download("system/user/export", {
+        ...queryParams.value,
+    }, `user_${new Date().getTime()}.xlsx`);
+};
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.userId);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+};
+/** 导入按钮操作 */
+function handleImport() {
+    upload.title = "用户导入";
+    upload.open = true;
+};
+/** 下载模板操作 */
+function importTemplate() {
+    proxy.download("system/user/importTemplate", {
+    }, `user_template_${new Date().getTime()}.xlsx`);
+};
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+    upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+    upload.open = false;
+    upload.isUploading = false;
+    proxy.$refs["uploadRef"].handleRemove(file);
+    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+    getList();
+};
+/** 提交上传文件 */
+function submitFileForm() {
+    proxy.$refs["uploadRef"].submit();
+};
+/** 重置操作表单 */
+function reset() {
+    form.value = {
+        userId: undefined,
+        deptId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: [],
+        leaveType: undefined,
+        leaveReason: undefined,
+        leavedDatetimeList: undefined,
+        leaveId: undefined,
+        newLeaveDatetime: undefined,
+        timeStart: "",
+        timeEnd: "",
+    };
+    proxy.resetForm("leaveRef");
+};
+/** 取消按钮 */
+function cancel() {
+    open.value = false;
+    reset();
+};
+
+/** 请假申请弹出框 */
+function handleAuthUser(row) {
+    form.value.userId = row.userId;
+    open.value = true;
+    title.value = "请假申请";
+
+}
+
+/** 修改请假信息 */
+function handleUpdate(row) {
+    // form.value.userId = row.userId;
+    open.value = true;
+    title.value = "请假信息修改";
+    // 根据工号获取员工的所有请假信息
+    const user_id = row.userId;
+    getUserInfo({ user_id: user_id }).then(response => {
+        console.log('response', response);
+        const data = response.msg;
+        leavedDatetimeList.value = [];
+        for (let i = 0; i < data.length; i++) {
+            leavedDatetimeList.value.push({
+                leave_id: data[i].leave_id,
+                leave_datetime: data[i].leave_datetime.split(','),
+                leave_type: data[i].leave_type,
+                leave_reason: data[i].leave_reason,
+            })
+        }
+
+
+        console.log('leavedDatetimeList', leavedDatetimeList.value);
+
+    });
+
+}
+
+/** 提交按钮 */
+function submitForm() {
+    console.log('form.value', form.value);
+
+    proxy.$refs["leaveRef"].validate(valid => {
+        console.log('valid', valid)
+        if (valid) {
+            // 格式化请假时间为字符串 'YYYY-MM-DD HH:mm:ss'
+            if (Array.isArray(form.value.newLeaveDatetime) && form.value.newLeaveDatetime.length === 2) {
+                form.value.newLeaveDatetime = [
+                    convertToDateTimeString(form.value.newLeaveDatetime[0]),
+                    convertToDateTimeString(form.value.newLeaveDatetime[1]),
+                ];
+                form.value.newLeaveDatetime = form.value.newLeaveDatetime.join(",");
+            }
+
+            if (title.value === "请假申请") {
+                addUserLeave(form.value).then(response => {
+                    console.log('response', response);
+                    proxy.$modal.msgSuccess("提交申请成功！");
+                    open.value = false;
+                    getList();
+                });
+            } else {
+                // 遍历已请假时间列表，给form赋值选中的请假信息（根据选中的）
+                for (let i = 0; i < leavedDatetimeList.value.length; i++) {
+                    if (leavedDatetimeList.value[i].leave_id === form.value.leaveId) {
+                        form.value.leaveType = leavedDatetimeList.value[i].leave_type;
+                        form.value.leaveReason = leavedDatetimeList.value[i].leave_reason;
+                    }
+                }
+                // form.value.leaveReason = "";
+                // form.value.leaveType = "";
+                editUserLeave(form.value).then(response => {
+                    console.log('response', response);
+                    proxy.$modal.msgSuccess("修改成功！");
+                    open.value = false;
+                    getList();
+                    leavedDatetimeList.value = [];
+                });
+            }
+        }
+    });
+}
+
+// 格式化日期字符串
+function convertToDateTimeString(dateString) {
+    // 创建一个 Date 对象
+    const date = new Date(dateString);
+
+    // 获取年份、月份和日期，并格式化为字符串
+    const year = date.getFullYear();
+    // getMonth 返回的月份范围是0-11，因此需加1
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+
+    // 获取小时、分钟和秒，并格式化为字符串
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+
+    // 返回格式化后的字符串
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+
+function handleView(row) {
+    console.log('row', row);
+    form.value.userId = row.userId;
+    const user_id = row.userId;
+    dialogTableVisible.value = true;
+    getUserInfo({ user_id: user_id }).then(response => {
+        console.log('response', response);
+        gridData.value = response.msg;
+    });
+}
+getDeptTree();
+getList();
+</script>
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/views/roster/leave/index1.vue b/ruoyi-fastapi-frontend/src/views/roster/leave/index1.vue
new file mode 100644
index 0000000000000000000000000000000000000000..838ae7aeae4abe58fb476930d508fdf3a3155c6c
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/roster/leave/index1.vue
@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
+
+      <el-form-item label="员工工号" prop="eployeeId">
+        <el-input v-model="queryParams.eployeeId" placeholder="请输入员工工号" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="员工姓名" prop="employeeName">
+        <el-select v-model="queryParams.employeeName" placeholder="请输入员工姓名" filterable style="width: 240px">
+          <el-option v-for="employee in xlSelectList" :key="employee[0]" :label="employee[1]" :value="employee[0]" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="所属部门" prop="dept">
+        <el-select v-model="queryParams.deptId" placeholder="请选择部门" clearable style="width: 240px">
+          <el-option v-for="dept in deptList" :key="dept.deptId" :label="dept.deptName" :value="dept.deptId" />
+        </el-select>
+      </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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:role:remove']">删除</el-button>
+      </el-col>
+
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+
+    <!-- 表格数据 -->
+    <el-table v-loading="loading" :data="allEmployeeList">
+      <el-table-column label="员工工号" prop="employeeId" width="120" />
+      <el-table-column label="员工姓名" prop="employeeName" width="120" />
+      <el-table-column label="所属部门" prop="dept" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="排班日期" prop="rosterDatetime" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="请假日期" prop="leaveDateTime" :show-overflow-tooltip="true" width="150" />
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-tooltip content="请假申请修改" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']"></el-button>
+          </el-tooltip>
+          <!-- <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:role:remove']"></el-button>
+          </el-tooltip> -->
+
+          <el-tooltip content="请假申请" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)"
+              v-hasPermi="['system:role:edit']"></el-button>
+          </el-tooltip>
+          <el-tooltip content="查看详情" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+              v-hasPermi="['system:role:view']"></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-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="leaveRef" :model="form" :rules="rules" label-width="100px">
+        <div v-if="title === '请假申请'">
+          <el-form-item label="请假类别" prop="leaveType">
+            <el-input v-model="form.leaveType" placeholder="请输入请假类别" />
+          </el-form-item>
+          <el-form-item label="请假事由" prop="leaveReason">
+            <el-input v-model="form.leaveReason" placeholder="请输入请假事由" />
+          </el-form-item>
+        </div>
+
+        <el-form-item label="已请假时间" prop="leavedDateTimes" v-if="title === '请假信息修改'">
+          <el-select v-model="form.leavedDateTimes" multiple>
+            <el-option v-for="(item, index) in workTimeList" :key="index" :label="index + 1" :value="item.timeId">
+              {{ item.timeStart }} - {{ item.timeEnd }}
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="请假时间" prop="leaveDateTime">
+
+          <el-date-picker v-model="form.timeEnd" type="datetimerange" start-placeholder="Start date"
+            end-placeholder="End date" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd"
+            time-format="A hh:mm:ss" />
+
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+  
+    <!-- 查看详情弹出对话框 -->
+    <el-dialog v-model="dialogTableVisible" title="Shipping address" width="800">
+      <el-table :data="gridData">
+        <el-table-column property="date" label="Date" width="150" />
+        <el-table-column property="name" label="Name" width="200" />
+        <el-table-column property="address" label="Address" />
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Leave">
+
+const dialogTableVisible = ref(false)
+const gridData = [
+  {
+    date: '2016-05-02',
+    name: 'John Smith',
+    address: 'No.1518,  Jinshajiang Road, Putuo District',
+  },
+  {
+    date: '2016-05-04',
+    name: 'John Smith',
+    address: 'No.1518,  Jinshajiang Road, Putuo District',
+  },
+  {
+    date: '2016-05-01',
+    name: 'John Smith',
+    address: 'No.1518,  Jinshajiang Road, Putuo District',
+  },
+  {
+    date: '2016-05-03',
+    name: 'John Smith',
+    address: 'No.1518,  Jinshajiang Road, Putuo District',
+  },
+]
+
+import { listEployees, addRostGroup,  listRostGroup } from "@/api/rost/batch";
+import { getListEployees } from '@/api/rost/leave'
+import { ref } from "vue";
+
+const { proxy } = getCurrentInstance();
+
+// 部门列表
+const deptList = ref([
+  { deptId: 1, deptName: "总公司" },
+  { deptId: 2, deptName: "分公司" },
+  { deptId: 3, deptName: "部门1" },
+]);
+
+// 下拉框选择的员工列表
+const xlSelectList = ref([]);
+
+const workTimeList = ref([]);
+// const roleList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+const menuRef = ref(null);
+
+
+
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    eployeeId: "",
+    employeeName: "",
+    deptId: "",
+  },
+  rules: {
+    rosterName: [{ required: true, message: "排班名称不能为空", trigger: "blur" }],
+    rosterTimeIds: [{ required: true, message: "上班时间不能为空", trigger: "blur" }],
+    rosterDatetime: [{ required: true, message: "排班日期不能为空", trigger: "blur" }]
+  },
+  selectedEmployees: [],
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+// 所有员工列表
+const allEmployeeList = ref([]);
+
+/** 查询所有员工表格 */
+function getList() {
+  loading.value = true;
+
+  getListEployees(queryParams.value).then(response => {
+    console.log('get list response', response);
+    total.value = response.total;
+    allEmployeeList.value = response.rows;
+    console.log('allEmployeeList111', allEmployeeList);
+  });
+
+  loading.value = false;
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+/** 重置新增的表单以及其他数据  */
+function reset() {
+  form.value = {
+    employeeId: undefined,
+    leaveType: undefined,
+    leaveReason: undefined,
+    leavedDateTimes: [],
+    leaveDateTime: [],
+    timeStart: "",
+    timeEnd: "",
+  };
+  proxy.resetForm("leaveRef");
+}
+
+/** 修改请假信息 */
+function handleUpdate(row) {
+  reset();
+  open.value = true;
+  title.value = "请假信息修改";
+  // 根据工号获取员工的所有请假信息
+
+  // getMenuTreeselect();
+  const roleId = row.roleId || ids.value;
+  const roleMenu = getRoleMenuTreeselect(roleId);
+  getRole(roleId).then(response => {
+    form.value = response.data;
+    form.value.roleSort = Number(form.value.roleSort);
+    open.value = true;
+    nextTick(() => {
+      roleMenu.then((res) => {
+        let checkedKeys = res.checkedKeys;
+        checkedKeys.forEach((v) => {
+          nextTick(() => {
+            menuRef.value.setChecked(v, true, false);
+          });
+        });
+      });
+    });
+    title.value = "修改分组排班信息";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  console.log('form.value:', form.value);
+  proxy.$refs["rostRef"].validate(valid => {
+    if (valid) {
+      if (form.value.rosterId !== undefined) {
+        addRostGroup(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+/** 请假申请弹出框 */
+function handleAuthUser(row) {
+  form.value.userId = row.userId;
+  open.value = true;
+  title.value = "请假申请";
+
+}
+
+// 查看详情弹出框
+function handleView(row) {
+  form.value.userId = row.userId;
+  dialogTableVisible.value = true;
+}
+
+// 获取员工列表
+function getXlsSelectList() {
+  listEployees().then(response => {
+    console.log('response', response);
+    xlSelectList.value = response.msg[0];
+    console.log(xlSelectList.value);
+  });
+}
+
+getList();
+getXlsSelectList();
+</script>
diff --git a/ruoyi-fastapi-frontend/src/views/roster/timeTemplate/index.vue b/ruoyi-fastapi-frontend/src/views/roster/timeTemplate/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..117f26903dfb1cb1efc4a26582cbc83134d50254
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/roster/timeTemplate/index.vue
@@ -0,0 +1,192 @@
+<template>
+    <el-container>
+        <el-main>
+            <el-header>
+                <h1>自定义时间模板</h1>
+            </el-header>
+            <el-form :model="customTemplate" ref="customTemplateForm" label-width="100px">
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="模板名称" prop="timeName">
+                            <el-input v-model="customTemplate.timeName"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="上班时间" prop="timeStart">
+                            <el-time-select v-model="customTemplate.timeStart" start='00:00' step='00:05' end='23:55'
+                                placeholder="选择时间">
+                            </el-time-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="下班时间" prop="timeEnd">
+                            <el-time-select v-model="customTemplate.timeEnd" start='00:00' step='00:05' end='23:55'
+                                placeholder="选择时间">
+                            </el-time-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2">
+                        <el-form-item>
+                            <el-button type="primary" @click="addCustomTemplate">添加模板</el-button>
+                        </el-form-item>
+
+                    </el-col>
+                    <el-col :span="2">
+                        <el-form-item>
+                            <el-button type="primary" @click="getTimeTemlateList">刷新</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <el-row :gutter="20">
+                <el-col :span="8" v-for="(template, index) in templates" :key="index">
+                    <el-card class="box-card">
+                        <template #header>
+                            <div class="card-header">
+                                <span>{{ template.timeName }}</span>
+                                <el-button style="float: right; padding: 3px 0" type="text"
+                                    @click="confirmDeleteTimeTemplate(template)">删除</el-button>
+                            </div>
+                        </template>
+                        <div>
+                            <p>上班时间：{{ template.timeStart }}</p>
+                            <p>下班时间：{{ template.timeEnd }}</p>
+                        </div>
+                    </el-card>
+                </el-col>
+            </el-row>
+
+        </el-main>
+    </el-container>
+</template>
+
+<script>
+import { ref } from 'vue';
+import { ElMessageBox, ElContainer, ElHeader, ElMain, ElRow, ElCol, ElCard, ElButton, ElDivider, ElForm, ElFormItem, ElInput, ElTimeSelect } from 'element-plus';
+import { listTimeTemplate, addTimeTemplate, delTimeTemplate } from '@/api/rost/time'
+
+export default {
+    components: {
+        ElContainer,
+        ElHeader,
+        ElMain,
+        ElRow,
+        ElCol,
+        ElCard,
+        ElButton,
+        ElDivider,
+        ElForm,
+        ElFormItem,
+        ElInput,
+        ElTimeSelect,
+        ElMessageBox
+    },
+    setup() {
+        const templates = ref([
+        ]);
+
+        const customTemplate = ref({
+            timeName: '',
+            timeStart: '',
+            timeEnd: ''
+        });
+
+        const addCustomTemplate = () => {
+            if (customTemplate.value.timeName && customTemplate.value.timeStart && customTemplate.value.timeEnd) {
+                console.log('customTemplate.value', customTemplate.value);
+                addTimeTemlate(customTemplate.value);
+                // 清空表单
+                customTemplate.value.name = '';
+                customTemplate.value.startTime = '';
+                customTemplate.value.endTime = '';
+            } else {
+                alert('请填写完整的模板信息');
+            }
+        };
+
+        const selectTemplate = (template) => {
+            const index = templates.value.indexOf(template);
+
+            const temp = [];
+            for (let i = 0; i < templates.value.length; i++) {
+                console.log(templates.value[i]);
+                if (i !== index) {
+                    temp.push(templates.value[i]);
+                }
+            }
+            templates.value = temp;
+            // alert(`您选择了 ${template.name} 模板`);
+            // 这里可以添加选择模板后的逻辑处理
+        };
+
+        // 获取模板列表
+        const getTimeTemlateList = () => {
+            listTimeTemplate().then(res => {
+                if (res.code === 200) {
+                    console.log(res);
+                    templates.value = res.rows;
+                    console.log(templates.value);
+                }
+            });
+        };
+
+        // 添加模板
+        const addTimeTemlate = () => {
+            addTimeTemplate(customTemplate.value).then(res => {
+                if (res.code === 200) {
+                    getTimeTemlateList();
+                    alert('添加成功');
+                }
+            });
+        };
+
+        // 删除模板确认函数
+        const confirmDeleteTimeTemplate = (template) => {
+            ElMessageBox.confirm(
+                '此操作将永久删除该模板, 是否继续?',
+                '提示',
+                {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }
+            ).then(() => {
+                console.log('template', template);
+                delTimeTemplate(template.timeId).then(res => {
+                    if (res.code === 200) {
+                        getTimeTemlateList();
+                    }
+                });
+            }).catch(() => {
+                // 用户取消了删除操作
+                console.log('Delete canceled');
+            });
+        };
+
+        // 监听模板列表变化
+        templates.value = getTimeTemlateList();
+
+        return {
+            templates,
+            customTemplate,
+            addCustomTemplate,
+            selectTemplate,
+            getTimeTemlateList,
+            addTimeTemlate,
+            confirmDeleteTimeTemplate
+        };
+    }
+};
+</script>
+
+<style scoped>
+.card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.box-card {
+    margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/vite.config.js b/ruoyi-fastapi-frontend/vite.config.js
index ba9fd12b982321cd5129513289edfe07b58efd19..a210ce1215c8e57ea9308457018d4f494a975a79 100644
--- a/ruoyi-fastapi-frontend/vite.config.js
+++ b/ruoyi-fastapi-frontend/vite.config.js
@@ -31,7 +31,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://127.0.0.1:9099',
+          target: 'http://192.168.10.10:9099',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }