-
+
+
+
+
+
+
+
+ 向上重要
+
+
+
+
+
+
+
+ ←向左紧急←向左紧急←向左←向左紧急←向左紧急←向左紧急
+
+
+
+
+
+
+ 向上重要
+
+ {/*
{children}
*/}
+
+
+
-
{children}
);
-}
\ No newline at end of file
+}
diff --git a/src/app/task/layout.tsx b/src/app/task/layout.tsx
index 3f835c9..1e463ed 100644
--- a/src/app/task/layout.tsx
+++ b/src/app/task/layout.tsx
@@ -1,7 +1,12 @@
-import SideNav from '@/app/ui/dashboard/sidenav';
+'use client'
+import React from "react";
+import {TitleOperation} from "@/app/ui/task/TitleOperation";
+
+export default function Layout({children}: { children: React.ReactNode }) {
-export default function Layout({ children }: { children: React.ReactNode }) {
return (
-
{children}
+
+
+ {children}
);
-}
\ No newline at end of file
+}
diff --git a/src/app/task/project/page.tsx b/src/app/task/project/page.tsx
index a3965d8..f3b69de 100644
--- a/src/app/task/project/page.tsx
+++ b/src/app/task/project/page.tsx
@@ -1,10 +1,11 @@
import TreeTable from "@/app/ui/task/project/TreeTable";
+import TreeTablePro from "@/app/ui/task/project/TreeTablePro";
const Page: React.FC = () => {
-
return (
<>
-
+
+ {/*
*/}
);
};
diff --git a/src/app/ui/task/four/index.modules.css b/src/app/ui/task/four/index.modules.css
new file mode 100644
index 0000000..f324857
--- /dev/null
+++ b/src/app/ui/task/four/index.modules.css
@@ -0,0 +1,45 @@
+div{
+ overflow: auto;
+}
+.leftUp{
+ width: 49%;
+ height: 45vh;
+ background: red;
+}
+.up{
+ width: 2%;
+ height: 45vh;
+ background: dodgerblue;
+}
+.rightUp{
+ width: 49%;
+ height: 45vh;
+ background: yellow;
+}
+.left{
+ width: 100%;
+ height: 4vh;
+ background: dodgerblue;
+ overflow: hidden;
+}
+.leftDown{
+ width: 49%;
+ height: 45vh;
+ background: gray;
+}
+.rightDown{
+ /*float: right;*/
+ width: 49%;
+ height: 45vh;
+ background: green;
+}
+
+/*#tenLeft {*/
+/* display: inline-block;*/
+/* animation: scroll 10s linear infinite; !* 控制滚动速度和循环 *!*/
+/*}*/
+
+/*@keyframes scroll {*/
+/* 0% { transform: translateX(0); } !* 开始位置 *!*/
+/* 100% { transform: translateX(-100%); } !* 结束位置 *!*/
+/*}*/
diff --git a/src/app/ui/task/project/DetailForm.tsx b/src/app/ui/task/project/DetailForm.tsx
index f4239a1..3e8a5b5 100644
--- a/src/app/ui/task/project/DetailForm.tsx
+++ b/src/app/ui/task/project/DetailForm.tsx
@@ -1,5 +1,6 @@
'use client'
import React, {useEffect, useState} from 'react';
+import '@/app/ui/task/project/detailForm.modules.css'
import {PlusOutlined} from '@ant-design/icons';
import {
Button,
@@ -28,6 +29,7 @@ import {
updateTask
} from "@/app/lib/task/project/data";
import {DataType, DictType} from "@/app/lib/definitions";
+import {DATE_TIME} from "@/app/lib/constants";
export interface DetailFormProps {
itemId: number,
@@ -43,7 +45,7 @@ export const DetailForm: React.FC
= (props) => {
const {RangePicker} = DatePicker;
const {TextArea} = Input;
// const [taskMessage,setTaskMessage]=useState({name:"useState没效果吗,是这样的"});
- let taskMessage;
+ // let taskMessage;
useEffect(() => {
if (props.operationId === OPERATION_BUTTON_TYPE.DETAIL||props.operationId === OPERATION_BUTTON_TYPE.UPDATE) {
getTask(props.itemId).then(task => {
@@ -52,6 +54,10 @@ export const DetailForm: React.FC = (props) => {
// setTaskMessage(task.data)
task.data.state=taskStateList.find(taskState=>taskState.code===task.data.state?.toString())?.name;
task.data.priority=taskPriorityList.find(taskPriority=>taskPriority.code===task.data.priority?.toString())?.name;
+ task.data.actualTimeRange = [task.data.expectedStartTime?dayjs(task.data.expectedStartTime,DATE_TIME):'',
+ task.data.expectedEndTime?dayjs(task.data.expectedEndTime,DATE_TIME):''];
+ task.data.expectedTimeRange = [task.data.actualStartTime?dayjs(task.data.actualStartTime,DATE_TIME):'',
+ task.data.actualEndTime?dayjs(task.data.actualEndTime,DATE_TIME):''];
form.setFieldsValue(task.data)
}else{
message.error(task.status.message);
@@ -108,20 +114,20 @@ export const DetailForm: React.FC = (props) => {
type: values.type,
children: []
}
- if (values.expectedStartTime) {
- if (values.expectedStartTime[0]) {
- request.expectedStartTime = values.expectedStartTime[0]
+ if (values.expectedTimeRange) {
+ if (values.expectedTimeRange[0]) {
+ request.expectedStartTime = values.expectedTimeRange[0]
}
- if (values.expectedStartTime[1]) {
- request.expectedEndTime = values.expectedStartTime[1]
+ if (values.expectedTimeRange[1]) {
+ request.expectedEndTime = values.expectedTimeRange[1]
}
}
- if (values.actualStartTime) {
- if (values.actualStartTime[0]) {
- request.actualStartTime = values.actualStartTime[0]
+ if (values.actualTimeRange) {
+ if (values.actualTimeRange[0]) {
+ request.actualStartTime = values.actualTimeRange[0]
}
- if (values.actualStartTime[1]) {
- request.actualEndTime = values.actualStartTime[1]
+ if (values.actualTimeRange[1]) {
+ request.actualEndTime = values.actualTimeRange[1]
}
}
if (props.operationId===OPERATION_BUTTON_TYPE.ADD_CHILD){
@@ -164,12 +170,12 @@ export const DetailForm: React.FC = (props) => {
{/**/}