diff --git a/apps/server/src/tasks/init/gendev.service.ts b/apps/server/src/tasks/init/gendev.service.ts index 2e8111e..3700965 100755 --- a/apps/server/src/tasks/init/gendev.service.ts +++ b/apps/server/src/tasks/init/gendev.service.ts @@ -49,11 +49,11 @@ export class GenDevService { try { await this.calculateCounts(); await this.generateDepartments(3, 6); - //await this.generateTerms(2, 6); 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 b836594..1cd78c5 100644 --- a/apps/web/src/app/main/layout/NavigationMenu.tsx +++ b/apps/web/src/app/main/layout/NavigationMenu.tsx @@ -7,11 +7,10 @@ export default function NavigationMenu() { console.log(location.pathname); // 导航菜单项配置 const menuItems = [ - { key: 'home', label: '首页', path: '/' }, { key: 'staff', label: '人员总览', path: '/staff' }, - { key: 'day', label: '日统计', path: '/daily' }, - { key: 'month', label: '月统计', path: '/month' }, - { key: 'year', label: '年度统计', path: '/year' } + { key: 'plan', label: '培训计划', path: '/plan' }, + { key: 'day', label: '每日填报', path: '/daily' }, + { key: 'exam', label: '考核成绩', path: '/exam' }, ]; return ( <> diff --git a/apps/web/src/components/models/daily/DailyLayout.tsx b/apps/web/src/components/models/daily/DailyLayout.tsx index 6d7ab8e..38d88e6 100644 --- a/apps/web/src/components/models/daily/DailyLayout.tsx +++ b/apps/web/src/components/models/daily/DailyLayout.tsx @@ -3,7 +3,7 @@ import { DailyMsgFormLayout } from "./dailyMsgForm/DailyMsgFormLayout"; export default function DailyLayout(){ return ( -
+
diff --git a/apps/web/src/components/models/daily/dailyMsgDisplay/DailyMsgDisplayLayout.tsx b/apps/web/src/components/models/daily/dailyMsgDisplay/DailyMsgDisplayLayout.tsx index 7357e23..3439a11 100644 --- a/apps/web/src/components/models/daily/dailyMsgDisplay/DailyMsgDisplayLayout.tsx +++ b/apps/web/src/components/models/daily/dailyMsgDisplay/DailyMsgDisplayLayout.tsx @@ -1,12 +1,73 @@ -import DailyPersonMsg from "../dailyMsgForm/DailyPersonMsg"; -import DailyTrainMsg from "../dailyMsgForm/DailyTrainMsg"; -import { useDaily } from "../DailyContext"; -export default function DailyMsgDisplayLayout(){ - const {selectedUserMsg} = useDaily() +import { Button, DatePicker, Form, Modal, TimePicker, TreeSelect } from "antd"; +import TextArea from "antd/es/input/TextArea"; +import dayjs from "dayjs"; +import { useState } from "react"; +export default function DailyMsgDisplayLayout() { + const [form] = Form.useForm() + const [open, setOpen] = useState(true) + const treeData = [ + { + title: 'Node1', + value: '0-0', + children: [ + { + title: 'Child Node1', + value: '0-0-1', + }, + { + title: 'Child Node2', + value: '0-0-2', + }, + ], + }, + { + title: 'Node2', + value: '0-1', + }, + ]; + const handleSave = () => { + //console.log(form.getFieldsValue()) + const { trainDate, trainTime, trainType, trainContent } = form.getFieldsValue() + const trainDateStr = dayjs(trainDate).format('YYYY-MM-DD') + const trainTimeBegin = dayjs(trainTime[0]).format('HH:mm') + const trainTimeEnd = dayjs(trainTime[1]).format('HH:mm') + } return ( -
- - -
+ <> + + { setOpen(false) }} + footer={null} + centered={true} + > +
+
+ + + + + + + + + + +