From b40d547fc77d5d55f968b5099ecf763523b8ef10 Mon Sep 17 00:00:00 2001 From: YCA001 <2915341988@qq.com> Date: Fri, 26 May 2023 17:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index.html | 2 +- app/src/App.vue | 4 +- app/src/api/request.ts | 12 ++-- app/src/components/AppFooter.vue | 17 +++-- app/src/components/AppHeader.vue | 25 ++++++-- app/src/components/Permissions.vue | 10 +-- app/src/pages/apiTokens/ApiTokens.vue | 39 ++++++------ app/src/pages/apiTokens/GreateTokens.vue | 11 ++-- app/src/pages/listShow/ChangeCheck.vue | 8 +-- app/src/pages/listShow/CreatePgp.vue | 24 ++++--- app/src/pages/listShow/CreateX509.vue | 22 +++---- app/src/pages/listShow/ImportPgp.vue | 63 +++++++++++++----- app/src/pages/listShow/ImportX509.vue | 81 ++++++++++++++++++------ app/src/pages/listShow/PrivateTable.vue | 53 ++++++++++++---- app/src/pages/listShow/PublicTable.vue | 65 +++++++++++++------ app/src/router.ts | 21 +++--- app/src/shared/utils/login.ts | 2 +- app/src/store/data.ts | 9 +-- 18 files changed, 297 insertions(+), 171 deletions(-) diff --git a/app/index.html b/app/index.html index 21ec580..d7ea08b 100644 --- a/app/index.html +++ b/app/index.html @@ -4,7 +4,7 @@ - Signature + Signatrust
diff --git a/app/src/App.vue b/app/src/App.vue index 1847384..f23ba4d 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -3,11 +3,13 @@ import AppHeader from "@/components/AppHeader.vue"; import { useRoute, useRouter } from "vue-router"; import { getToken } from "@/api/show"; import { showGuard } from "@/shared/utils/login"; +import { useDataStore } from "@/store/data"; +const useData = useDataStore(); const router = useRouter(); const route = useRoute(); const queryToken = () => { getToken() - .then(() => router.push("./")) + .then((res:any) => {useData.email = res.email}) .catch(() => showGuard()); }; queryToken() diff --git a/app/src/api/request.ts b/app/src/api/request.ts index 0d0fbf2..2df5f4b 100644 --- a/app/src/api/request.ts +++ b/app/src/api/request.ts @@ -48,15 +48,15 @@ service.interceptors.response.use( // 超出 2xx 范围的状态码都会触发该函数。 // 对响应错误做点什么 if (error.response.status === 401) { - // ElMessage.error('Please log in again'); - // tokenFailIndicateLogin(); + ElMessage.error('Please log in again'); showGuard(); } - if (error.response.status === 403) { - // router.replace({path:'/'}); - // useUserStore.state.dialogFormVisible = true; + // if (error.response.status === 400) { + // ElMessage.error('Wrong request'); + // } + if (error.response.status === 500) { + ElMessage.error('Server error'); } - console.log(error); return Promise.reject(error); } ); diff --git a/app/src/components/AppFooter.vue b/app/src/components/AppFooter.vue index 0b00775..0cae870 100644 --- a/app/src/components/AppFooter.vue +++ b/app/src/components/AppFooter.vue @@ -60,19 +60,19 @@ const linksData = { const RIGHT_LIST=[ { - NAME: '品牌', + NAME: 'Trademark', URL: '/other/brand/', }, { - NAME: '隐私政策', + NAME: 'Privacy Policy', URL: '/other/privacy/', }, { - NAME: '法律声明', + NAME: 'Legal Notice', URL: '/other/legal/', }, { - NAME: '服务状态', + NAME: 'Service Status', URL: 'https://status.openeuler.org/', }, ]; @@ -105,7 +105,7 @@ const handleNavClick = (path: string) => { diff --git a/app/src/components/AppHeader.vue b/app/src/components/AppHeader.vue index dde50bd..9bd07f6 100644 --- a/app/src/components/AppHeader.vue +++ b/app/src/components/AppHeader.vue @@ -2,31 +2,42 @@ import { ref, onMounted, reactive, watch } from "vue"; import { showGuard, logout, useStoreData, getUserAuth } from "@/shared/utils/login"; import { useRouter } from "vue-router"; +import { useDataStore } from "@/store/data"; +const useData = useDataStore(); const router = useRouter(); const isLogin = ref(false); -const name = ref("Admin"); const dropdownCommand = (type: string) => { if (type === "logout") { isLogin.value = false; } }; const toTokens = () => { - router.push({ - path: "/apiTokens", - }); + router.push("/tokens"); +}; +const toHome = () => { + router.push("/"); +}; +const toOpenEuler = () => { + window.open("https://openeuler.org"); };