From 030e621129da3c5071c281494ae7e6129058efe5 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Wed, 7 May 2025 14:07:03 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20feat(=E6=A8=A1=E5=9D=97):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=AA=E5=BE=88=E6=A3=92=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/leftSelectTree/leftSelectTree.tsx | 3 ++- src/pages/examine/errorRecord/index.tsx | 2 +- src/pages/examine/index/index.tsx | 2 +- src/pages/examine/modal/index.tsx | 8 ++++++-- src/pages/examine/question/index.tsx | 2 +- src/pages/examine/record/index.tsx | 2 +- src/pages/examine/recordSummary/index.tsx | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/components/leftSelectTree/leftSelectTree.tsx b/src/components/leftSelectTree/leftSelectTree.tsx index 849a8d0..7019448 100644 --- a/src/components/leftSelectTree/leftSelectTree.tsx +++ b/src/components/leftSelectTree/leftSelectTree.tsx @@ -55,8 +55,9 @@ const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width, // data.data.list[0].key = data.data.list[0].id // data = data.data.list } - console.log('datatree', data); + data = data.filter((item: any) => item.value !== 530) + console.log('datatree', data); // 判断是否有多个片区的权限 if (data && data.length > 1) { diff --git a/src/pages/examine/errorRecord/index.tsx b/src/pages/examine/errorRecord/index.tsx index 0cf8193..f2bba10 100644 --- a/src/pages/examine/errorRecord/index.tsx +++ b/src/pages/examine/errorRecord/index.tsx @@ -501,5 +501,5 @@ const ErrorRecord: React.FC<{ currentUser: any }> = (props) => { } export default connect(({ user }: ConnectState) => ({ - currentUser: user.data + currentUser: user.currentUser }))(ErrorRecord); \ No newline at end of file diff --git a/src/pages/examine/index/index.tsx b/src/pages/examine/index/index.tsx index d4e7f3c..190e245 100644 --- a/src/pages/examine/index/index.tsx +++ b/src/pages/examine/index/index.tsx @@ -219,5 +219,5 @@ const examineIndex: React.FC<{ currentUser: any }> = (props) => { } export default connect(({ user }: ConnectState) => ({ - currentUser: user.data + currentUser: user.currentUser }))(examineIndex); diff --git a/src/pages/examine/modal/index.tsx b/src/pages/examine/modal/index.tsx index c1a30d2..5019d29 100644 --- a/src/pages/examine/modal/index.tsx +++ b/src/pages/examine/modal/index.tsx @@ -17,6 +17,8 @@ import { ArrowDownOutlined, ArrowUpOutlined } from "@ant-design/icons"; const examineModal: React.FC<{ currentUser: any }> = (props) => { const { currentUser } = props + console.log('props', props); + const actionRef = useRef(); const cloneActionRef = useRef(); @@ -653,8 +655,10 @@ const examineModal: React.FC<{ currentUser: any }> = (props) => { label={"服务区名"} name={"serverPartId"} request={async () => { + console.log('currentUser?.provinceCode', currentUser?.provinceCode); + const req = { - ProvinceCode: currentUser?.provinceCode, + ProvinceCode: currentUser?.provinceCode || "510000", StatisticsType: 1000 } const data = await handleGetServerpartDDL(req) @@ -1335,6 +1339,6 @@ const examineModal: React.FC<{ currentUser: any }> = (props) => { } export default connect(({ user }: ConnectState) => ({ - currentUser: user.data + currentUser: user.currentUser }))(examineModal); diff --git a/src/pages/examine/question/index.tsx b/src/pages/examine/question/index.tsx index 77ef10a..616ad67 100644 --- a/src/pages/examine/question/index.tsx +++ b/src/pages/examine/question/index.tsx @@ -375,5 +375,5 @@ const examineQuestion: React.FC<{ currentUser: any }> = (props) => { } export default connect(({ user }: ConnectState) => ({ - currentUser: user.data + currentUser: user.currentUser }))(examineQuestion); diff --git a/src/pages/examine/record/index.tsx b/src/pages/examine/record/index.tsx index 53e3140..518971e 100644 --- a/src/pages/examine/record/index.tsx +++ b/src/pages/examine/record/index.tsx @@ -481,5 +481,5 @@ const examineRecord: React.FC<{ currentUser: any }> = (props) => { } export default connect(({ user }: ConnectState) => ({ - currentUser: user.data + currentUser: user.currentUser }))(examineRecord); \ No newline at end of file diff --git a/src/pages/examine/recordSummary/index.tsx b/src/pages/examine/recordSummary/index.tsx index 2803294..0a820a2 100644 --- a/src/pages/examine/recordSummary/index.tsx +++ b/src/pages/examine/recordSummary/index.tsx @@ -790,5 +790,5 @@ const recordSummary: React.FC<{ currentUser: any }> = (props) => { } export default connect(({ user }: ConnectState) => ({ - currentUser: user.data + currentUser: user.currentUser }))(recordSummary); \ No newline at end of file