diff --git a/apps/server/src/tasks/init/gendev.service.ts b/apps/server/src/tasks/init/gendev.service.ts
index 3700965..a0107ea 100755
--- a/apps/server/src/tasks/init/gendev.service.ts
+++ b/apps/server/src/tasks/init/gendev.service.ts
@@ -52,8 +52,8 @@ export class GenDevService {
await this.generateStaffs(4);
//await this.generateTerms(2, 6);
//await this.generateCourses(8);
- //await this.generateTrainContent(2,6)
- //await this.generateTrainSituations()
+ await this.generateTrainContent(2,6)
+ await this.generateTrainSituations()
} catch (err) {
this.logger.error(err);
}
diff --git a/apps/web/src/app/main/layout/NavigationMenu.tsx b/apps/web/src/app/main/layout/NavigationMenu.tsx
index 1cd78c5..b8c2ef8 100644
--- a/apps/web/src/app/main/layout/NavigationMenu.tsx
+++ b/apps/web/src/app/main/layout/NavigationMenu.tsx
@@ -7,20 +7,20 @@ export default function NavigationMenu() {
console.log(location.pathname);
// 导航菜单项配置
const menuItems = [
- { key: 'staff', label: '人员总览', path: '/staff' },
+ { key: 'staff', label: '人员总览', path: '/' }, // 将path改为根路径
{ key: 'plan', label: '培训计划', path: '/plan' },
{ key: 'day', label: '每日填报', path: '/daily' },
{ key: 'exam', label: '考核成绩', path: '/exam' },
];
+
return (
<>
- {/* 导航菜单 */}
+
是
+
{(fields, { add, remove }) => (
<>
@@ -117,6 +130,7 @@ export default function StaffModal() {
>
staff.absent));
const { create, update } = useStaff();
const {editingRecord, setEditingRecord} = useMainContext();
const colnums = [
@@ -31,8 +32,8 @@ export default function StaffTable() {
},
{
title: "职务",
- dataIndex: "position",
- key: "position",
+ dataIndex: "positionId",
+ key: "positionId",
},
{
title: "在位",
diff --git a/packages/common/prisma/schema.prisma b/packages/common/prisma/schema.prisma
index aa70075..3b53c46 100755
--- a/packages/common/prisma/schema.prisma
+++ b/packages/common/prisma/schema.prisma
@@ -429,7 +429,7 @@ model Staff {
phoneNumber String? @unique @map("phone_number")
age Int? @map("age")
sex Boolean? @map("sex")
- absent Boolean? @map("absent")
+ absent Boolean? @map("absent")@default(false)
trainSituations TrainSituation[]
position Position? @relation("StaffPosition", fields: [positionId], references: [id])