Compare commits

..

No commits in common. "c6b59483de1f9efb39da7e1d9c0f4cba9dde8d3b" and "ee320de2ca625f978d8940b37fc905d3c1baf5a9" have entirely different histories.

64 changed files with 9393 additions and 7722 deletions

0
.vscode/settings.json vendored Executable file → Normal file
View File

View File

View File

View File

View File

View File

0
apps/server/src/models/position/dailyTrain.module.ts Executable file → Normal file
View File

0
apps/server/src/models/position/dailyTrain.router.ts Executable file → Normal file
View File

0
apps/server/src/models/position/dailyTrain.service.ts Executable file → Normal file
View File

View File

0
apps/server/src/models/sys-logs/systemLog.module.ts Executable file → Normal file
View File

0
apps/server/src/models/sys-logs/systemLog.router.ts Executable file → Normal file
View File

0
apps/server/src/models/sys-logs/systemLog.service.ts Executable file → Normal file
View File

View File

View File

View File

View File

View File

View File

View File

View File

8
apps/server/src/upload/share-code.service.ts Executable file → Normal file
View File

@ -96,10 +96,10 @@ export class ShareCodeService {
}
// 标记分享码为已使用
// await db.shareCode.update({
// where: { id: shareCode.id },
// data: { isUsed: true },
// });
await db.shareCode.update({
where: { id: shareCode.id },
data: { isUsed: true },
});
// 记录使用日志
this.logger.log(`Share code ${code} used for file ${shareCode.fileId}`);

View File

View File

View File

View File

View File

View File

0
apps/web/src/app/main/admin/deptsettingpage/page.tsx Executable file → Normal file
View File

View File

View File

View File

View File

0
apps/web/src/app/main/daily/page.tsx Executable file → Normal file
View File

0
apps/web/src/app/main/layout/MainHeader.tsx Executable file → Normal file
View File

0
apps/web/src/app/main/layout/MainLayout.tsx Executable file → Normal file
View File

0
apps/web/src/app/main/layout/MainProvider.tsx Executable file → Normal file
View File

0
apps/web/src/app/main/layout/NavigationMenu.tsx Executable file → Normal file
View File

0
apps/web/src/app/main/plan/monthplan/page.tsx Executable file → Normal file
View File

0
apps/web/src/app/main/plan/weekplan/page.tsx Executable file → Normal file
View File

0
apps/web/src/app/main/staffinfo_show/page.tsx Executable file → Normal file
View File

View File

View File

0
apps/web/src/app/main/staffinfo_write/area-options.ts Executable file → Normal file
View File

0
apps/web/src/app/main/staffinfo_write/infoCard.tsx Executable file → Normal file
View File

View File

0
apps/web/src/app/main/systemlog/SystemLogPage.tsx Executable file → Normal file
View File

View File

View File

View File

View File

View File

View File

View File

View File

0
apps/web/src/data/area-options.ts Executable file → Normal file
View File

View File

@ -39,57 +39,50 @@ export type CustomRouteObject =
| CustomIndexRouteObject
| CustomNonIndexRouteObject;
export const routes: CustomRouteObject[] = [
// {
// path: "/",
// errorElement: <ErrorPage />,
// handle: {
// crumb() {
// return <Link to={"/"}>主页</Link>;
// },
// },
// children: [
// {
// element: <MainLayout></MainLayout>,
// children: [
// {
// index: true,
// element:<Dashboard></Dashboard>,
// },
// {
// path: "/staffinformation",
// element: <StaffInformation></StaffInformation>,
// },
// {
// path: "/staff",
// element: <StaffMessage></StaffMessage>,
// },
// {
// path: "/systemlog",
// element: <SystemLogPage></SystemLogPage>,
// },
// {
// path: "/admin",
// element: <AdminLayout></AdminLayout>,
// children:adminRoute.children
// },
// ],
// },
// ],
// },
// {
// path: "/login",
// breadcrumb: "登录",
// element: <LoginPage></LoginPage>,
// },
{
path: "/",
errorElement: <ErrorPage />,
handle: {
crumb() {
return <Link to={"/"}></Link>;
},
},
children: [
{
element: <MainLayout></MainLayout>,
children: [
{
index: true,
path: "/",
element:<DeptSettingPage></DeptSettingPage>,
errorElement: <ErrorPage />,
}
element:<Dashboard></Dashboard>,
},
{
path: "/staffinformation",
element: <StaffInformation></StaffInformation>,
},
{
path: "/staff",
element: <StaffMessage></StaffMessage>,
},
{
path: "/systemlog",
element: <SystemLogPage></SystemLogPage>,
},
{
path: "/admin",
element: <AdminLayout></AdminLayout>,
children:adminRoute.children
},
],
},
],
},
{
path: "/login",
breadcrumb: "登录",
element: <LoginPage></LoginPage>,
},
];
export const router = createBrowserRouter(routes);

0
packages/client/src/api/hooks/useTrainSituation.ts Executable file → Normal file
View File

View File

@ -154,6 +154,8 @@ export const trainSituationDetailSelect: Prisma.TrainSituationSelect = {
name: true,
},
},
age: true,
sex: true,
absent: true,
},
},
@ -171,6 +173,8 @@ export const staffDetailSelect: Prisma.StaffSelect = {
username: true,
deptId: true,
avatar: true,
age: true,
sex: true,
absent: true,
trainSituations:{
select:{

0
packages/utils/src/safePrismaQuery.ts Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff