diff --git a/app/management/person/dashboard/page.tsx b/app/management/person/dashboard/page.tsx
index ef47f2a..0da1889 100644
--- a/app/management/person/dashboard/page.tsx
+++ b/app/management/person/dashboard/page.tsx
@@ -84,7 +84,8 @@ function StatCard(props: {
radius={"md"}
pos="relative"
style={{
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
overflow: "hidden",
display: "flex",
}}>
@@ -181,7 +182,8 @@ export default function PersonDashboardPage() {
p="md"
style={{
width: 160,
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
display: "flex",
flexDirection: "column",
gap: 16,
@@ -251,7 +253,8 @@ export default function PersonDashboardPage() {
withBorder
p="md"
style={{
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
display: "flex",
flexDirection: "column",
minHeight: 0,
@@ -266,7 +269,8 @@ export default function PersonDashboardPage() {
withBorder
p="md"
style={{
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
display: "flex",
flexDirection: "column",
minHeight: 0,
diff --git a/app/management/person/report/page.tsx b/app/management/person/report/page.tsx
index 8748b43..dcbfaff 100644
--- a/app/management/person/report/page.tsx
+++ b/app/management/person/report/page.tsx
@@ -434,7 +434,10 @@ export default function PersonReportPage() {
withBorder
p="md"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
@@ -619,7 +622,8 @@ export default function PersonReportPage() {
p="md"
radius="md"
style={{
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
flex: 1,
minHeight: 0,
display: "flex",
diff --git a/app/management/project/audit/page.tsx b/app/management/project/audit/page.tsx
index 94e5b57..590a59b 100644
--- a/app/management/project/audit/page.tsx
+++ b/app/management/project/audit/page.tsx
@@ -403,7 +403,10 @@ export default function ProjectAuditPage() {
withBorder
p="md"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
项目审核
@@ -465,7 +468,7 @@ export default function ProjectAuditPage() {
onChange={(e) =>
setFilters((s) => ({
...s,
- project_name: e.currentTarget.value,
+ project_name: e.target.value,
}))
}
/>
@@ -477,7 +480,7 @@ export default function ProjectAuditPage() {
onChange={(e) =>
setFilters((s) => ({
...s,
- project_type: e.currentTarget.value,
+ project_type: e.target.value,
}))
}
/>
@@ -527,7 +530,8 @@ export default function ProjectAuditPage() {
p="md"
radius="md"
style={{
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
flex: 1,
minHeight: 0,
display: "flex",
diff --git a/app/management/project/detail/InfoSettingContainer.tsx b/app/management/project/detail/InfoSettingContainer.tsx
index bd42def..96cb17c 100644
--- a/app/management/project/detail/InfoSettingContainer.tsx
+++ b/app/management/project/detail/InfoSettingContainer.tsx
@@ -5,7 +5,7 @@ import { ProjectDetail } from "@/components/label/api/project/typing"
import { useAllUserStore } from "@/components/label/store/auth"
import { Button, Group, Paper, Stack, Switch, Text } from "@mantine/core"
import { notifications } from "@mantine/notifications"
-import { JSX, useMemo, useState } from "react"
+import { useMemo, useState } from "react"
import AdminUserModal from "./components/AdminUserModal"
import LabelSchemeContainer from "./components/LabelSchemeContainer"
import NoteRulesTable from "./components/NoteRulesTable"
@@ -14,7 +14,6 @@ import TaskStageTabsContainer from "./components/TaskStageTabsContainer"
export default function InfoSettingContainer(props: {
info: ProjectDetail.DataProps | undefined
- menuAction?: () => JSX.Element
userEnums: {
allEnum: Map
labelEnum: Map
@@ -23,7 +22,7 @@ export default function InfoSettingContainer(props: {
}
updateAction: () => void
}) {
- const { info, menuAction, userEnums, updateAction } = props
+ const { info, userEnums, updateAction } = props
const projectId = info?.id ?? -1
const { userOpts } = useAllUserStore()
@@ -78,9 +77,11 @@ export default function InfoSettingContainer(props: {
withBorder
p="sm"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
- {menuAction ? {menuAction()}
: null}
基础配置
+
+
+ }
+ onClick={() => {
+ const next = createInitialFilters()
+ setFilters(next)
+ setForm(next)
+ setPageNumber(1)
+ }}>
+ 重置
+
+ }
+ onClick={() => {
+ setPageNumber(1)
+ setForm({ ...filters })
+ }}>
+ 查询
+
+
+
+
+
+
- setForm((s) => ({ ...s, search_id: e.currentTarget.value }))
+ setFilters((s) => ({
+ ...s,
+ search_id: e.target.value,
+ }))
}
style={{ width: 160 }}
/>
+
+
+
+
-
+
+
+
+
handleAcquireTask(1)}>
@@ -288,6 +378,7 @@ export default function OwnTaskTableContainer(props: {
handleAcquireTask(2)}>
@@ -295,61 +386,42 @@ export default function OwnTaskTableContainer(props: {
handleAcquireTask(3)}>
领取复审
- {
- resetParams()
- setForm({ search_id: "", search_status: "0" })
- setQueryTrigger((v) => v + 1)
- }}>
- 重置
-
- {
- setPagination(1, params.page_size ?? 20)
- setQueryTrigger((v) => v + 1)
- }}>
- 查询
-
-
-
+
+
+
+
+
+
+ width="100%"
+ style={{ width: "100%" }}
+ withTableBorder
+ withRowBorders
+ pinFirstColumn
+ pinLastColumn
+ scrollAreaProps={{ type: "auto" }}
+ fetching={loading}
+ records={records}
+ columns={columns}
+ totalRecords={total}
+ recordsPerPage={pageSize}
+ page={pageNumber}
+ onPageChange={(p) => setPageNumber(p)}
+ onRecordsPerPageChange={(s) => {
+ setPageSize(s)
+ setPageNumber(1)
+ }}
+ recordsPerPageOptions={[10, 15, 20]}
+ noRecordsText="暂无数据"
+ recordsPerPageLabel="当前页数"
+ />
-
-
-
- width="100%"
- style={{ width: "100%" }}
- withTableBorder
- withRowBorders
- pinFirstColumn
- pinLastColumn
- scrollAreaProps={{ type: "auto" }}
- fetching={loading}
- records={records}
- columns={columns}
- totalRecords={total}
- recordsPerPage={params.page_size ?? 20}
- page={params.page_number ?? 1}
- onPageChange={(p) => {
- setPagination(p, params.page_size ?? 20)
- setQueryTrigger((v) => v + 1)
- }}
- onRecordsPerPageChange={(s) => {
- setPagination(1, s)
- setQueryTrigger((v) => v + 1)
- }}
- recordsPerPageOptions={[10, 20, 50, 100]}
- noRecordsText="暂无数据"
- />
-
)
}
diff --git a/app/management/project/detail/TaskBoardContainer.tsx b/app/management/project/detail/TaskBoardContainer.tsx
index d1f02b0..5c707ee 100644
--- a/app/management/project/detail/TaskBoardContainer.tsx
+++ b/app/management/project/detail/TaskBoardContainer.tsx
@@ -8,7 +8,10 @@ export default function TaskBoardContainer() {
withBorder
p="md"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
统计信息
diff --git a/app/management/project/detail/TaskTableContainer.tsx b/app/management/project/detail/TaskTableContainer.tsx
index 1f89716..c46e7ce 100644
--- a/app/management/project/detail/TaskTableContainer.tsx
+++ b/app/management/project/detail/TaskTableContainer.tsx
@@ -18,15 +18,10 @@ import {
TextInput,
} from "@mantine/core"
import { notifications } from "@mantine/notifications"
-import {
- IconArrowsShuffle,
- IconRefresh,
- IconRoute,
- IconTrashX,
-} from "@tabler/icons-react"
+import { IconArrowsShuffle, IconRoute, IconTrashX } from "@tabler/icons-react"
import { DataTable, DataTableColumn } from "mantine-datatable"
import { useSearchParams } from "next/navigation"
-import { JSX, useCallback, useEffect, useMemo, useState } from "react"
+import { useCallback, useEffect, useMemo, useState } from "react"
import DispatchModal from "./components/DispatchModal"
import ReleaseModal from "./components/ReleaseModal"
import TaskStatusTag from "./components/TaskStatusTag"
@@ -34,7 +29,6 @@ import WorkflowModal from "./components/WorkflowModal"
export default function TaskTableContainer(props: {
info: ProjectDetail.DataProps | undefined
- menuAction?: () => JSX.Element
userEnums: {
allEnum: Map
labelEnum: Map
@@ -42,7 +36,7 @@ export default function TaskTableContainer(props: {
review2Enum: Map
}
}) {
- const { info, menuAction, userEnums } = props
+ const { info, userEnums } = props
false && console.log(info)
const urlParams = useSearchParams()
@@ -216,9 +210,11 @@ export default function TaskTableContainer(props: {
withBorder
p="sm"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
- {menuAction ? {menuAction()}
: null}
- setForm((s) => ({ ...s, search_id: e.currentTarget.value }))
+ setForm((s) => ({ ...s, search_id: e.target.value }))
}
style={{ width: 160 }}
/>
@@ -246,13 +242,6 @@ export default function TaskTableContainer(props: {
allowDeselect={false}
style={{ width: 160 }}
/>
- }
- loading={loading}
- onClick={() => setQueryTrigger((v) => v + 1)}>
- 刷新
-
diff --git a/app/management/project/detail/components/LabelSchemeContainer.tsx b/app/management/project/detail/components/LabelSchemeContainer.tsx
index 1fb0928..c4dfbae 100644
--- a/app/management/project/detail/components/LabelSchemeContainer.tsx
+++ b/app/management/project/detail/components/LabelSchemeContainer.tsx
@@ -76,7 +76,10 @@ export default function LabelSchemeContainer(props: {
withBorder
p="sm"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
标注方案
diff --git a/app/management/project/detail/components/NoteRulesTable.tsx b/app/management/project/detail/components/NoteRulesTable.tsx
index b9eec14..3c52d1c 100644
--- a/app/management/project/detail/components/NoteRulesTable.tsx
+++ b/app/management/project/detail/components/NoteRulesTable.tsx
@@ -15,7 +15,10 @@ export default function NoteRulesTable(props: {
withBorder
p="sm"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
批注规则
diff --git a/app/management/project/detail/components/SamplingPlanContainer.tsx b/app/management/project/detail/components/SamplingPlanContainer.tsx
index 482b135..1afe6cc 100644
--- a/app/management/project/detail/components/SamplingPlanContainer.tsx
+++ b/app/management/project/detail/components/SamplingPlanContainer.tsx
@@ -98,7 +98,10 @@ export default function SamplingPlanContainer(props: {
withBorder
p="sm"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
抽检方案
@@ -131,7 +134,10 @@ export default function SamplingPlanContainer(props: {
withBorder
p="sm"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
等级 {g}
+ style={{
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+ }}>
任务工序配置
@@ -104,7 +107,8 @@ export default function TaskStageTabsContainer(props: {
p="sm"
radius="md"
style={{
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor:
+ "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
flex: "1 1 260px",
minWidth: 260,
}}>
diff --git a/app/management/project/detail/page.tsx b/app/management/project/detail/page.tsx
index 5a276af..332ec7a 100644
--- a/app/management/project/detail/page.tsx
+++ b/app/management/project/detail/page.tsx
@@ -9,14 +9,13 @@ import {
} from "@/components/label/store/auth"
import {
Breadcrumbs,
- Button,
+ Flex,
Group,
Paper,
Stack,
Text,
UnstyledButton,
} from "@mantine/core"
-import { IconChevronLeft } from "@tabler/icons-react"
import { useRouter, useSearchParams } from "next/navigation"
import { useEffect, useMemo, useState } from "react"
import InfoSettingContainer from "./InfoSettingContainer"
@@ -114,10 +113,12 @@ export default function CollectionDetailPage() {
: type === "dynamic"
? "动态项目"
: "全部项目"
- : "我的收藏",
+ : "全部项目",
href: type
- ? `/management/project?type=${type}`
- : "/management/project?type=collect",
+ ? type === "collect"
+ ? `/management/person/collection`
+ : "/management/project/dynamic"
+ : "/management/project/all",
},
{
title: info?.name || "项目名称",
@@ -177,11 +178,10 @@ export default function CollectionDetailPage() {
paddingRight: 14,
paddingTop: 6,
paddingBottom: 6,
- borderTopLeftRadius: index === 0 ? 10 : 0,
- borderBottomLeftRadius: index === 0 ? 10 : 0,
- borderTopRightRadius: index === menuItems.length - 1 ? 10 : 0,
- borderBottomRightRadius:
- index === menuItems.length - 1 ? 10 : 0,
+ borderTopLeftRadius: index === 0 ? 4 : 0,
+ borderBottomLeftRadius: index === 0 ? 4 : 0,
+ borderTopRightRadius: index === menuItems.length - 1 ? 4 : 0,
+ borderBottomRightRadius: index === menuItems.length - 1 ? 4 : 0,
background: active
? "var(--mantine-color-brand-filled)"
: "rgba(0,0,0,0.04)",
@@ -198,45 +198,21 @@ export default function CollectionDetailPage() {
return (
-
+
-
- }
- onClick={() => {
- router.push(
- type
- ? `/management/project?type=${type}`
- : "/management/project?type=collect"
- )
- }}>
- 返回
-
+
{breadcrumbsItems}
-
+ {DetailMenuItems()}
+
{selectKey === "own" ? (
-
+
) : null}
{selectKey === "all" ? (
-
+
) : null}
{selectKey === "board" ? : null}
{selectKey === "setting" ? (
@@ -244,7 +220,6 @@ export default function CollectionDetailPage() {
info={info}
userEnums={userEnums}
updateAction={updateProjectInfo}
- menuAction={DetailMenuItems}
/>
) : null}
diff --git a/components/label/OptStore.tsx b/components/label/OptStore.tsx
index f0cd1fd..077cfae 100644
--- a/components/label/OptStore.tsx
+++ b/components/label/OptStore.tsx
@@ -5,7 +5,6 @@ import { useEffect } from "react"
import {
useAllTaskStore,
useAllUserStore,
- useOwnTaskStore,
usePermissionStore,
} from "./store/auth"
import { getUserAll, getUserGroupTree } from "./api/user"
@@ -91,7 +90,6 @@ export function OptStore() {
useEffect(() => {
if (pathname !== "/project/info/detail" && pathname !== "/label") {
useAllTaskStore.getState().resetParams()
- useOwnTaskStore.getState().resetParams()
}
}, [pathname])
diff --git a/components/project/index.tsx b/components/project/index.tsx
index 6e12aa5..7e7ceeb 100644
--- a/components/project/index.tsx
+++ b/components/project/index.tsx
@@ -588,7 +588,7 @@ export default function ProjectInfoPage({
withBorder
p="md"
radius="md"
- style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+ style={{ borderColor: "var(--mantine-color-brand-text)" }}>
@@ -765,7 +765,7 @@ export default function ProjectInfoPage({
p="md"
radius="md"
style={{
- borderColor: "rgba(0,0,0,0.06)",
+ borderColor: "var(--mantine-color-brand-text)",
flex: 1,
minHeight: 0,
display: "flex",