rht

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.generateTrainContent(2,6)
-      await this.generateTrainSituations()
+      //await this.generateTrainSituations()
     } catch (err) {
       this.logger.error(err);
     }

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: 'plan', label: '培训计划', path: '/plan' },
-    { key: 'month', label: '月统计', path: '/month' },
+    { key: 'day', label: '每日填报', path: '/daily' },
-    { key: 'year', label: '年度统计', path: '/year' }
+    { key: 'exam', label: '考核成绩', path: '/exam' },
   ];
   return (
     <>

apps/web/src/components/models/daily/DailyLayout.tsx

@@ -3,7 +3,7 @@ import { DailyMsgFormLayout } from "./dailyMsgForm/DailyMsgFormLayout";
 
 export default function DailyLayout(){
     return (
-        <div className="w-full h-full bg-slate-400">
+        <div className="w-full h-[calc(100vh-100px)]">
             <DailyMsgFormLayout></DailyMsgFormLayout>
             <DailyMsgDisplayLayout></DailyMsgDisplayLayout>
         </div>

apps/web/src/components/models/daily/dailyMsgDisplay/DailyMsgDisplayLayout.tsx

@@ -1,12 +1,73 @@
-import DailyPersonMsg from "../dailyMsgForm/DailyPersonMsg";
+import { Button, DatePicker, Form, Modal, TimePicker, TreeSelect } from "antd";
-import DailyTrainMsg from "../dailyMsgForm/DailyTrainMsg";
+import TextArea from "antd/es/input/TextArea";
-import { useDaily } from "../DailyContext";
+import dayjs from "dayjs";
-export default function DailyMsgDisplayLayout(){
+import { useState } from "react";
-    const {selectedUserMsg} = useDaily()
+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 (
-        <div>
+        <>  
-            <DailyPersonMsg selectedUserMsg={selectedUserMsg} />
+            <Button onClick={() => { setOpen(true) }}>创建计划</Button>
-            <DailyTrainMsg selectedUserMsg={selectedUserMsg} />
+            <Modal
-        </div>
+                open={open}
+                onCancel={() => { setOpen(false) }}
+                footer={null}
+                centered={true}
+            >
+                <div className="p-6">
+                    <Form
+                        form={form}
+                    >
+                        <Form.Item name="trainDate" label="选择日期">
+                            <DatePicker picker="date" style={{ width: '100%' }} showNow={true} />
+                        </Form.Item>
+                        <Form.Item name="trainTime" label="选择时间">
+                            <TimePicker.RangePicker format="HH:mm" style={{ width: '100%' }} />
+                        </Form.Item>
+                        <Form.Item name="trainType" label="选择学科">
+                            <TreeSelect
+                                style={{ width: '100%' }}
+                                dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+                                treeData={treeData}
+                                placeholder="请选择学科或课程"
+                                treeDefaultExpandAll={false}
+                            //onChange={onChange}
+                            />
+                        </Form.Item>
+                        <Form.Item name="trainContent" label="填写内容">
+                            <TextArea rows={4} />
+                        </Form.Item>
+                        <Button type="primary" onClick={handleSave} style={{ width: '100%' }}>创建计划</Button>
+                    </Form>
+                </div>
+            </Modal>
+        </>
     )
 }

apps/web/src/components/models/daily/dailyMsgForm/DailyPersonMsg.tsx

@@ -1,13 +0,0 @@
-export default function DailyPersonMsg({selectedUserMsg}) {
-    return (
-        <div className="">
-            <span>{selectedUserMsg?.showname ? selectedUserMsg?.showname : "暂无数据"}</span>
-            <span>{selectedUserMsg?.age ? selectedUserMsg?.age : "暂无数据"}</span>
-            <span>{selectedUserMsg?.sex ? selectedUserMsg?.sex : "暂无数据"}</span>
-            <span>{selectedUserMsg?.absent ? selectedUserMsg?.absent : "暂无数据"}</span>
-            <span>{selectedUserMsg?.department?.name ? selectedUserMsg?.department?.name : "暂无数据"}</span>
-            <span>{selectedUserMsg?.position?.type ? selectedUserMsg?.position?.type : "暂无数据"}</span>
-            <span>{selectedUserMsg?.avatar ? selectedUserMsg?.avatar : "暂无数据"}</span>
-        </div>
-    )
-}

apps/web/src/components/models/daily/dailyMsgForm/DailyTrainMsg.tsx

@@ -1,7 +0,0 @@
-export default function DailyTrainMsg({selectedUserMsg}) {
-    return (
-        <div>
-            <span>每日培训消息</span>
-        </div>
-    )
-}

apps/web/src/routes/index.tsx

@@ -46,14 +46,14 @@ export const routes: CustomRouteObject[] = [
 				children: [
 					{
 						index: true,
-						element: <HomePage></HomePage>,
+						element:<StaffMessage></StaffMessage>,
 					},
 					{
 						path: "/staff",
 						element: <StaffMessage></StaffMessage>,
 					},
 					{
-						path:"/daily",
+						path:"/plan",
 						element:<DailyPage></DailyPage>
 					}
 				],

packages/common/prisma/schema.prisma

@@ -340,6 +340,8 @@ model TrainContent {
     id              String           @id @default(cuid())
     title           String           @map("title")
     trainSituations TrainSituation[]
+    trainPlans      TrainPlan[]      @relation("TrainPlanContent")
+
     type            String           @map("type")
     parentId        String?          @map("parent_id")
     parent          TrainContent?    @relation("ContentParent", fields: [parentId], references: [id]) // 指向自身
@@ -463,3 +465,20 @@ model Staff {
     @@index([order])
     @@map("staff")
 }
+
+model TrainPlan {
+    id           String    @id @default(cuid())
+    
+    trainDate    DateTime  @map("train_date")
+    trainTime    DateTime  @map("train_time")
+    trainType    String    @map("train_type")
+    trainContext String    @map("train_context")
+    
+    trainContents TrainContent[] @relation("TrainPlanContent")
+
+    createdAt    DateTime  @default(now()) @map("created_at")
+    updatedAt    DateTime  @updatedAt @map("updated_at")
+    deletedAt    DateTime? @map("deleted_at")
+
+    @@map("train_plan")
+}