diff --git a/front/src/lib/jwt.ts b/front/src/lib/jwt.ts index e6bfc89..53f69f0 100644 --- a/front/src/lib/jwt.ts +++ b/front/src/lib/jwt.ts @@ -30,20 +30,7 @@ export function CheckAndGetJWT(tx: 'raw'): string | null; export function CheckAndGetJWT(tx: 'raw' | 'parsed'): WtsJWT | string | null { if (!browser) { - if (tx === 'parsed') { - return { - openid: '', - access: 'unregistered', - sid: '', - username: '', - avatar: '', - name: '', - - } as WtsJWT; - } - if (tx === 'raw') { - return "aaaaa"; - } + return null; } let token: string; token = localStorage.getItem('jwt'); @@ -105,6 +92,10 @@ export function Guard(a: (subject: WtsAccess) => boolean) { return; } if (!a(jwt.access)) { + if(jwt.access === "unregistered"){ + goto('/register'); + return; + } console.log('Guard():权限不足,跳转到首页'); goto('/forbidden'); return; diff --git a/front/src/routes/op/ticket_search/+page.svelte b/front/src/routes/op/ticket_search/+page.svelte index afa0e29..9aa46c3 100644 --- a/front/src/routes/op/ticket_search/+page.svelte +++ b/front/src/routes/op/ticket_search/+page.svelte @@ -1,11 +1,11 @@ @@ -190,12 +195,12 @@

选择您需要检索报修工单的条件

-{#if IsAdmin(CheckAndGetJWT('parsed').access)} -
- - - - +{#if IsAdmin(token.access)} +
+ + + + {/if}
@@ -213,26 +218,39 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
- { - const { toggled } = e.detail as { toggled: boolean }; - zoneSelected = toggled ? [...zoneOptions] : []; + { + const { toggled } = e.detail as { toggled: boolean }; + zoneSelected = toggled ? [...zoneOptions] : []; }} - > + > 全不选 全选 @@ -243,36 +261,35 @@ - - - - - {#if IsAdmin(CheckAndGetJWT('parsed').access)} - - + + + + + + + + + + + + + {#if IsAdmin(token.access)} + + + + + + {/if}
- { - const { toggled } = e.detail as { toggled: boolean }; - req.status = toggled ? [...statusOptions] : []; + { + const { toggled } = e.detail as { toggled: boolean }; + req.status = toggled ? [...statusOptions] : []; }} - > + > 全不选 全选 @@ -283,34 +300,33 @@ - - - - - - + + + + + + + + + + + + + + + + + +
- { - const { toggled } = e.detail as { toggled: boolean }; - req.priority = toggled ? [...priorityOptions] : []; + { + const { toggled } = e.detail as { toggled: boolean }; + req.priority = toggled ? [...priorityOptions] : []; }} - > + > 全不选 全选 @@ -320,33 +336,30 @@ - - - - - + + + + + + + + + + + + + + +
- { - const { toggled } = e.detail as { toggled: boolean }; - req.category = toggled ? [...categoryOptions] : []; + { + const { toggled } = e.detail as { toggled: boolean }; + req.category = toggled ? [...categoryOptions] : []; }} - > + > 全不选 全选 @@ -357,28 +370,31 @@ - - - - - + + + + + + + + + + + + + +
- { - const { toggled } = e.detail as { toggled: boolean }; - req.isp = toggled ? [...ispOptions] : []; + { + const { toggled } = e.detail as { toggled: boolean }; + req.isp = toggled ? [...ispOptions] : []; }} - > + > 全不选 全选 @@ -396,21 +412,14 @@

- +

- +

- \ No newline at end of file +