From 1e1cedc70758a7c17ccf63ea11d1db70c409aa66 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 09:45:15 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/dashboard/index.jsx | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/dashboard/index.jsx b/rsf-admin/src/page/dashboard/index.jsx
index d47caa1..a41514c 100644
--- a/rsf-admin/src/page/dashboard/index.jsx
+++ b/rsf-admin/src/page/dashboard/index.jsx
@@ -3,6 +3,7 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import SensorOccupiedIcon from '@mui/icons-material/SensorOccupied';
import CardWithIcon from '../components/CardWithIcon';
+import CommentIcon from '@mui/icons-material/Comment';
import WifiIcon from '@mui/icons-material/Wifi';
import { useTheme } from '@mui/material/styles';
import { useNavigate } from 'react-router-dom';
@@ -75,18 +76,24 @@
const [stock, setStock] = useState([]);
const [deadStock, setDeadStock] = useState([]);
const [locUsage, setLocUsages] = useState([]);
+ const [tasks, setTasks] = useState([]);
+ const [total, setTotal] = useState(0);
+
useEffect(() => {
getDashBoardHeader()
getRecentTrands()
getRecentStocks()
getRecentUsage()
+ getExcingTasks()
}, [])
const getDashBoardHeader = async () => {
await request.post('/asnOrder/dashbord/header').then(res => {
- const { code, msg, data } = res.data?.data;
+ const { code, msg, data } = res?.data;
+ console.log(code);
+
if (code === 200) {
setStatistic(data);
} else {
@@ -110,11 +117,23 @@
})
}
+ const getExcingTasks = async () => {
+ await request.post('/task/page', { current: 1, pageSize: 100, orderBy: 'sort desc' }).then(res => {
+ const { code, msg, data } = res?.data;
+ if (code === 200) {
+ setTasks(data?.records)
+ setTotal(data?.total)
+ } else {
+ notify(msg, { type: 'error', messageArgs: { _: msg } });
+ }
+ }).catch((error) => {
+ notify(error.message, { type: 'error', messageArgs: { _: error.message } });
+ })
+ }
+
const getRecentUsage = () => {
request.post("/loc/pie/list").then(res => {
const { code, msg, data } = res?.data;
- console.log(data);
- console.log(code);
if (code === 200) {
setLocUsages(data?.data)
} else {
@@ -157,7 +176,7 @@
<CardWithIcon
icon={SensorOccupiedIcon}
subtitle={translate('page.dashboard.header.outStockQty')}
- title={`${statistic?.membersTotalQua}`}
+ title={`${statistic?.outAnf}`}
type={"out"}
statistic={statistic}
/>
@@ -177,16 +196,17 @@
<Box sx={{ display: 'flex' }}>
<Spacer />
<NbCard
- icon={SensorOccupiedIcon}
+ icon={CommentIcon}
subtitle={translate('page.dashboard.header.taskWorkQty')}
- title={`${statistic?.membersTotalQua}`}
+ title={`${statistic?.taskQty}`}
+ total={total}
to={{
pathname: '/task',
search: JSON.stringify({
filter: JSON.stringify({ status: 1 }),
}),
}}
- list={deadStock}
+ tasks={tasks}
/>
</Box>
</Grid>
--
Gitblit v1.9.1