From 5c4c86429b5efe73cd63ab2b0afdcd1d83a5bb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com> Date: Mon, 15 Aug 2022 14:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9basic=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .umirc.ts | 4 ++-- src/pages/Basic/List/Certificate/Step4/index.tsx | 2 +- src/pages/Basic/List/Device/index.tsx | 4 +++- src/pages/Basic/List/{Login => Index}/index.less | 0 src/pages/Basic/List/{Login => Index}/index.tsx | 0 src/pages/index.tsx | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) rename src/pages/Basic/List/{Login => Index}/index.less (100%) rename src/pages/Basic/List/{Login => Index}/index.tsx (100%) diff --git a/.umirc.ts b/.umirc.ts index 0ff304d..6b8a3d7 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -22,8 +22,8 @@ export default defineConfig({ component: '@/pages/Basic/Header', routes: [ { - path: '/basic/login', - component: '@/pages/Basic/List/Login', + path: '/basic/index', + component: '@/pages/Basic/List/Index', }, { path: '/basic/device', diff --git a/src/pages/Basic/List/Certificate/Step4/index.tsx b/src/pages/Basic/List/Certificate/Step4/index.tsx index b39b7e4..e992f32 100644 --- a/src/pages/Basic/List/Certificate/Step4/index.tsx +++ b/src/pages/Basic/List/Certificate/Step4/index.tsx @@ -20,7 +20,7 @@ const Page: FC = ({ basic, dispatch }) => { }); if (res.result === 'success') { message.success('开通证书系统成功'); - history.replace('/basic/login'); + history.replace('/basic/index'); } }; diff --git a/src/pages/Basic/List/Device/index.tsx b/src/pages/Basic/List/Device/index.tsx index a0350b9..db31c3f 100644 --- a/src/pages/Basic/List/Device/index.tsx +++ b/src/pages/Basic/List/Device/index.tsx @@ -119,13 +119,15 @@ const Page: FC = ({ basic, dispatch }) => { sendData.file2 = sendData.file2.name; sendData.file3 = sendData.file3.name; sendData.file4 = sendData.file4.name; + delete sendData.cert; + delete sendData.resource; const res = await Fetch('/openi/resource/openResourceNow', { method: 'post', data: sendData, }); if (res.result === 'success') { message.success('成功开通设施管理设备'); - history.replace('/basic/login'); + history.replace('/basic/index'); } }; diff --git a/src/pages/Basic/List/Login/index.less b/src/pages/Basic/List/Index/index.less similarity index 100% rename from src/pages/Basic/List/Login/index.less rename to src/pages/Basic/List/Index/index.less diff --git a/src/pages/Basic/List/Login/index.tsx b/src/pages/Basic/List/Index/index.tsx similarity index 100% rename from src/pages/Basic/List/Login/index.tsx rename to src/pages/Basic/List/Index/index.tsx diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 52af019..f92f7d0 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -10,7 +10,7 @@ const IndexPage = ({ ...props }) => { useEffect(() => { const basic = ['/', '/basic/device', '/basic/certificate']; if (basic.includes(props.location.pathname)) { - history.replace('/basic/login'); + history.replace('/basic/index'); } }, []);