1.新增排班时间管理页面及其对接接口

2.对接排班人员列表接口
3.修改部分样式

src/views/integratedManage/attendManage/components/attendTrend.vue

@@ -242,7 +242,7 @@ onMounted(() => {
     background-color: #fff;
     border-radius: 8px;
     overflow: hidden;
-    height: 500px;
+    height: 435px;
     width: 100%;
     padding: 10px;
     box-sizing: border-box;
@@ -288,7 +288,7 @@ onMounted(() => {
 
 @media (max-width: 768px) {
     .chart-container {
-        height: 450px;
+        height: 435px;
     }
 }
 

src/views/integratedManage/attendManage/components/renyuanguanliDialog.vue

@@ -43,11 +43,12 @@
               multiple 
               filterable
             >
-              <el-option label="张三" value="1"></el-option>
-              <el-option label="李四" value="2"></el-option>
-              <el-option label="王五" value="3"></el-option>
-              <el-option label="赵六" value="4"></el-option>
-              <el-option label="钱七" value="5"></el-option>
+              <el-option 
+                v-for="person in props.personnelList" 
+                :key="person.value" 
+                :label="person.label" 
+                :value="person.value"
+              ></el-option>
             </el-select>
             
             <!-- 删除按钮 (仅在不是第一个项目时显示) -->
@@ -97,6 +98,17 @@ const props = defineProps({
   manageAttendDialogVisible: {
     type: Boolean,
     default: false
+  },
+  // 排班人员列表数据
+  personnelList: {
+    type: Array,
+    default: () => [
+      { label: '张三', value: '1' },
+      { label: '李四', value: '2' },
+      { label: '王五', value: '3' },
+      { label: '赵六', value: '4' },
+      { label: '钱七', value: '5' }
+    ]
   }
 });
 

src/views/integratedManage/attendManage/components/renyuanpaiban.vue

@@ -37,6 +37,19 @@
         </template>
       </el-table-column>
     </el-table>
+    
+    <!-- 分页组件 -->
+    <div class="pagination-container">
+      <el-pagination
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -110,9 +123,17 @@ const getCurrentMonthDates = () => {
   return dates;
 };
 
+// 分页相关状态
+const currentPage = ref(1);
+const pageSize = ref(10);
+const total = ref(50); // 总数据条数，模拟数据
+
 // 生成排班数据
 const scheduleData = computed(() => {
-  return Array.from({ length: 20 }, (_, index) => {
+  const startIndex = (currentPage.value - 1) * pageSize.value;
+  const endIndex = startIndex + pageSize.value;
+  
+  return Array.from({ length: total.value }, (_, index) => {
     // 循环使用员工数据
     const employee = employees[index % employees.length];
     
@@ -131,9 +152,20 @@ const scheduleData = computed(() => {
     });
     
     return rowData;
-  });
+  }).slice(startIndex, endIndex);
 });
 
+// 分页大小变化处理
+const handleSizeChange = (size: number) => {
+  pageSize.value = size;
+  currentPage.value = 1; // 重置为第一页
+};
+
+// 当前页码变化处理
+const handleCurrentChange = (current: number) => {
+  currentPage.value = current;
+};
+
 // 组件挂载时获取当前月数据
 onMounted(() => {
   currentMonthDates.value = getCurrentMonthDates();
@@ -216,7 +248,20 @@ const handleCellClick = (rowData: any, columnData: any, cellEvent: any) => {
 }
 
 .week-day {
-  font-size: 12px;
-  color: #666;
-}
+    font-size: 12px;
+    color: #666;
+  }
+  
+  /* 分页容器样式 */
+  .pagination-container {
+    margin-top: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+  
+  /* 分页组件样式优化 */
+  :deep(.el-pagination) {
+    font-size: 14px;
+  }
 </style>

src/views/integratedManage/attendManage/index.vue

@@ -72,6 +72,7 @@
         <renyuanguanliDialog 
             v-model:manageAttendDialogVisible="manageAttendDialogVisible"
             @confirm="handleAttendConfirm"
+            :personnel-list="paibanRenYuanList"
         />
         
         <!-- 编辑排班弹窗 -->
@@ -107,13 +108,49 @@
 <script setup lang="ts">
 import infoBox from '@/views/integratedManage/attendManage/components/infoBox.vue'
 import attendTrend from '@/views/integratedManage/attendManage/components/attendTrend.vue'
-import todayAttend from '@/views/integratedManage/attendManage/components/leftBox/todayAttend.vue'
-import approval from '@/views/integratedManage/attendManage/components/leftBox/approval.vue'
-import calendar from '@/views/integratedManage/attendManage/components/leftBox/calendar.vue'
+import todayAttend from '@/views/integratedManage/attendManage/components/rightBox/todayAttend.vue'
+import approval from '@/views/integratedManage/attendManage/components/rightBox/approval.vue'
+import calendar from '@/views/integratedManage/attendManage/components/rightBox/calendar.vue'
 import totalView from '@/views/integratedManage/attendManage/components/totalView.vue'
 import renyuanpaiban from '@/views/integratedManage/attendManage/components/renyuanpaiban.vue'
 import renyuanguanliDialog from '@/views/integratedManage/attendManage/components/renyuanguanliDialog.vue'
-import { ref } from 'vue';
+import { getPaibanRenYuanList } from '@/api/renyuan/paiban';
+import { ref, onMounted } from 'vue';
+// 导入用户store
+import { useUserStore } from '@/store/modules/user';
+
+// 排班人员列表
+const paibanRenYuanList = ref([]);
+
+// 获取排班人员列表
+const fetchPaibanRenYuanList = async (deptId?: string) => {
+  try {
+    // 如果没有提供deptId，默认使用当前登录用户的部门ID
+    const targetDeptId = deptId || userStore.deptId;
+    if (!targetDeptId) {
+      console.warn('未提供部门ID，无法获取排班人员列表');
+      return;
+    }
+    const response = await getPaibanRenYuanList(targetDeptId);
+    // 格式化人员列表数据，确保每个人员对象包含label和value属性
+    paibanRenYuanList.value = response.data?.map((user: any) => ({
+      label: user.nickName || user.userName || '未知用户',
+      value: user.userId || user.id || ''
+    })) || [];
+    
+    console.log('获取排班人员列表成功:', paibanRenYuanList.value);
+  } catch (error) {
+    console.error('获取排班人员列表失败:', error);
+    // 错误情况下提供模拟数据，确保功能可用
+    paibanRenYuanList.value = [
+      { label: '张三', value: '1' },
+      { label: '李四', value: '2' },
+      { label: '王五', value: '3' },
+      { label: '赵六', value: '4' },
+      { label: '钱七', value: '5' }
+    ];
+  }
+};
 
 // 人员排班弹窗
 const manageAttendDialogVisible = ref(false);
@@ -329,6 +366,13 @@ const calendarData = ref({
 });
 
 
+// 初始化用户store
+const userStore = useUserStore();
+
+onMounted(() => {
+  fetchPaibanRenYuanList(String(userStore.deptId));
+});
+
 </script>
 
 <style scoped lang="scss">