From 4f8440695748eb6cc9173c61b3d8a87d734a5d75 Mon Sep 17 00:00:00 2001
From: xixi <123@qq.com>
Date: Wed, 29 May 2024 15:11:52 +0800
Subject: [PATCH] lyp

---
 src/components/LoginPage/LoginPage.tsx      |  4 +-
 src/components/card/CardProj.tsx            |  7 ++++
 src/route/proj/ProjEdit.tsx                 | 43 +++++++++++++--------
 src/route/proj/edit/ProjConfigLoginpage.tsx |  6 +--
 src/route/proj/edit/ProjEditStep1.tsx       |  7 ++--
 src/route/proj/edit/ProjEditStep2.tsx       |  3 --
 src/route/proj/edit/ProjEditStep3.tsx       |  6 +--
 7 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/components/LoginPage/LoginPage.tsx b/src/components/LoginPage/LoginPage.tsx
index 0aabbf8..dd8104a 100644
--- a/src/components/LoginPage/LoginPage.tsx
+++ b/src/components/LoginPage/LoginPage.tsx
@@ -561,9 +561,7 @@ export default function ProjConfigLoginpage(props: any) {
                             })
                             // props.closeModal()
                             props.closeModal()
-                            setTimeout(() => {
-                                window.location.reload()
-                            }, 500)
+                        
 
                         },
                         onFinally() {
diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx
index 3da0bc2..843fe58 100644
--- a/src/components/card/CardProj.tsx
+++ b/src/components/card/CardProj.tsx
@@ -474,6 +474,7 @@ export default function CardProj(props: { item: IProj }) {
             <Modal open={loginPageOpne}
                 title="登陆页面设置"
                 width={1700}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setLoginPageOpne(false);
@@ -488,6 +489,7 @@ export default function CardProj(props: { item: IProj }) {
             <Modal open={loginPageShowOpne}
                 title="登陆页面查看"
                 width={1700}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setLoginPageShowOpne(false);
@@ -502,6 +504,7 @@ export default function CardProj(props: { item: IProj }) {
             <Modal open={softwareManagementOpen}
                 title="软件功能管理设置"
                 width={1500}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setSoftwareManagementOpen(false);
@@ -515,6 +518,8 @@ export default function CardProj(props: { item: IProj }) {
             <Modal open={softwareManagementShowOpen}
                 title="软件功能管理查看"
                 width={1500}
+                destroyOnClose={true}
+
                 onCancel={() => {
                     setSoftwareManagementShowOpen(false);
                 }}
@@ -526,6 +531,7 @@ export default function CardProj(props: { item: IProj }) {
             <Modal open={displayOrderOpen}
                 title="设置功能列表显示顺序"
                 width={1500}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setDisplayOrderOpen(false);
@@ -538,6 +544,7 @@ export default function CardProj(props: { item: IProj }) {
             <Modal open={displayOrderShowOpen}
                 title="查看功能列表显示顺序"
                 width={1500}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setDisplayOrderShowOpen(false);
diff --git a/src/route/proj/ProjEdit.tsx b/src/route/proj/ProjEdit.tsx
index e094113..67be677 100644
--- a/src/route/proj/ProjEdit.tsx
+++ b/src/route/proj/ProjEdit.tsx
@@ -584,13 +584,14 @@ export default function ProjEdit() {
             <Modal open={titleIntroductionOpen}
                 title="软件简介确认"
                 width={1500}
+                destroyOnClose={true}
 
                 onCancel={() => {
 
                     setTitleIntroductionOpen(false);
-                    setTimeout(() => {
-                        window.location.reload()
-                    }, 500)
+                    // setTimeout(() => {
+                    //     window.location.reload()
+                    // }, 500)
 
                 }}
                 footer={null}
@@ -599,9 +600,10 @@ export default function ProjEdit() {
             </Modal>
             {/* 第1步查看 */}
             <Modal open={titleIntroductionShowOpen}
+                destroyOnClose={true}
+
                 title="软件简介查看"
                 width={1500}
-
                 onCancel={() => {
                     setTitleIntroductionShowOpen(false);
                 }}
@@ -613,16 +615,16 @@ export default function ProjEdit() {
             <Modal open={softwareInfoOpen}
                 title="软件基本信息填写"
                 width={1500}
-
+                destroyOnClose={true}
                 onCancel={() => {
                     setSoftwareOpen(false);
                     // setTimeout(() => {
                     //     props.closeModal()
                     //     window.location.reload(); // 刷新页面
                     // }, 1000);
-                    setTimeout(() => {
-                        window.location.reload()
-                    }, 500)
+                    // setTimeout(() => {
+                    //     window.location.reload()
+                    // }, 500)
                 }}
                 footer={null}
             >
@@ -632,7 +634,7 @@ export default function ProjEdit() {
             <Modal open={softwareInfoShowOpen}
                 title="软件基本信息查看"
                 width={1500}
-
+                destroyOnClose={true}
                 onCancel={() => {
                     setSoftwareShowOpen(false);
                 }}
@@ -644,12 +646,12 @@ export default function ProjEdit() {
             <Modal open={softwareFeaturesOpen}
                 title="软件功能特点设置"
                 width={1500}
-
+                destroyOnClose={true}
                 onCancel={() => {
                     setSoftwareFeaturesOpen(false);
-                    setTimeout(() => {
-                        window.location.reload()
-                    }, 500)
+                    // setTimeout(() => {
+                    //     window.location.reload()
+                    // }, 500)
 
                 }}
                 footer={null}
@@ -660,6 +662,7 @@ export default function ProjEdit() {
             <Modal open={softwareFeaturesShowOpen}
                 title="软件功能特点查看"
                 width={1500}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setSoftwareFeaturesShowOpen(false);
@@ -672,12 +675,13 @@ export default function ProjEdit() {
             <Modal open={loginPageOpne}
                 title="登陆页面设置"
                 width={1700}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setLoginPageOpne(false);
-                    setTimeout(() => {
-                        window.location.reload()
-                    }, 500)
+                    // setTimeout(() => {
+                    //     window.location.reload()
+                    // }, 500)
 
                 }}
                 footer={null}
@@ -688,6 +692,7 @@ export default function ProjEdit() {
             <Modal open={loginPageShowOpne}
                 title="登陆页面查看"
                 width={1700}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setLoginPageShowOpne(false);
@@ -700,6 +705,7 @@ export default function ProjEdit() {
             <Modal open={softwareManagementOpen}
                 title="软件功能管理设置"
                 width={1500}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setSoftwareManagementOpen(false);
@@ -715,6 +721,8 @@ export default function ProjEdit() {
                 onCancel={() => {
                     setSoftwareManagementShowOpen(false);
                 }}
+                destroyOnClose={true}
+
                 footer={null}
             >
                 <SoftwareManagementShow></SoftwareManagementShow>
@@ -723,6 +731,7 @@ export default function ProjEdit() {
             <Modal open={displayOrderOpen}
                 title="设置功能列表显示顺序"
                 width={1500}
+                destroyOnClose={true}
 
                 onCancel={() => {
                     setDisplayOrderOpen(false);
@@ -735,7 +744,7 @@ export default function ProjEdit() {
             <Modal open={displayOrderShowOpen}
                 title="查看功能列表显示顺序"
                 width={1500}
-
+                destroyOnClose={true}
                 onCancel={() => {
                     setDisplayOrderShowOpen(false);
                 }}
diff --git a/src/route/proj/edit/ProjConfigLoginpage.tsx b/src/route/proj/edit/ProjConfigLoginpage.tsx
index e291bd8..ac1bb66 100644
--- a/src/route/proj/edit/ProjConfigLoginpage.tsx
+++ b/src/route/proj/edit/ProjConfigLoginpage.tsx
@@ -204,9 +204,9 @@ export default function ProjConfigLoginpage(props: any) {
                                         type="default"
                                         className='seeButton' onClick={() => {
                                             props.closeModal()
-                                            setTimeout(()=>{
-                                                window.location.reload()
-                                            },500)
+                                            // setTimeout(()=>{
+                                            //     window.location.reload()
+                                            // },500)
 
                                         }}>返回</Button>
                                     <Button
diff --git a/src/route/proj/edit/ProjEditStep1.tsx b/src/route/proj/edit/ProjEditStep1.tsx
index 0869401..46fa31d 100644
--- a/src/route/proj/edit/ProjEditStep1.tsx
+++ b/src/route/proj/edit/ProjEditStep1.tsx
@@ -179,9 +179,7 @@ export default function ProjEditStep1(props: any) {
                                         size='large'
                                         onClick={() => {
                                             props.closeModal()
-                                            setTimeout(() => {
-                                                window.location.reload()
-                                            }, 500); // 刷新页面
+                                           
                                         }}>
                                         关闭
                                     </Button>
@@ -203,6 +201,7 @@ export default function ProjEditStep1(props: any) {
             <Modal title="提示"
                 okText="确定"
                 cancelText="取消"
+                destroyOnClose={true}
                 open={isEditModalOpen}
                 onOk={() => {
                     setIsEditModalOpen(false);
@@ -226,7 +225,7 @@ export default function ProjEditStep1(props: any) {
                             })
                             setTimeout(() => {
                                 props.closeModal()
-                                window.location.reload(); // 刷新页面
+                                // window.location.reload(); // 刷新页面
                             }, 1000);
 
                         },
diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx
index e888121..2bf15df 100644
--- a/src/route/proj/edit/ProjEditStep2.tsx
+++ b/src/route/proj/edit/ProjEditStep2.tsx
@@ -932,9 +932,6 @@ export default function ProjEditStep2(props: any) {
                                         <Flex align="center" justify="center" gap="large">
                                             <Button type="default" htmlType="button" onClick={() => {
                                                 props.closeModal()
-                                                setTimeout(() => {
-                                                    window.location.reload()
-                                                }, 500)
                                                 //    alert('发挥')
                                             }}
                                                 // style={{ height: '49px', width: '104px', color: '#4B4B4B', background: '#D1D1D1', fontSize: '16px' }}
diff --git a/src/route/proj/edit/ProjEditStep3.tsx b/src/route/proj/edit/ProjEditStep3.tsx
index 5582ec2..b567c5f 100644
--- a/src/route/proj/edit/ProjEditStep3.tsx
+++ b/src/route/proj/edit/ProjEditStep3.tsx
@@ -275,9 +275,9 @@ export default function ProjEditStep3(props:any) {
                         size='large'
                     onClick={()=>{
                         props.closeModal()
-                        setTimeout(()=>{
-                            window.location.reload()
-                        },500)
+                        // setTimeout(()=>{
+                        //     window.location.reload()
+                        // },500)
                         }}>
                         返回
                     </Button>