From 134a76b869874c36b9f501abeb85e172bb7d824a Mon Sep 17 00:00:00 2001 From: panqihua <1029559041@qq.com> Date: Fri, 17 Apr 2020 17:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BF=E5=AE=A2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 5 ++++- src/app/app.component.html | 5 ++++- src/app/app.module.ts | 5 ++++- src/app/forum/{forum => }/forum.module.ts | 2 +- .../forum/{ => forum}/forum.component.html | 0 .../forum/{ => forum}/forum.component.scss | 0 .../forum/{ => forum}/forum.component.spec.ts | 0 src/app/forum/{ => forum}/forum.component.ts | 14 +++++++------- src/app/interface/HttpInterface.ts | 4 +++- src/app/interface/Response.ts | 6 ++++++ src/app/interface/Visitor.ts | 19 +++++++++++++++++++ src/assets/i18n/en-US.json | 12 +++++++++++- src/assets/i18n/zh-CN.json | 19 ++++++++++++++++++- 13 files changed, 77 insertions(+), 14 deletions(-) rename src/app/forum/{forum => }/forum.module.ts (88%) rename src/app/forum/{ => forum}/forum.component.html (100%) rename src/app/forum/{ => forum}/forum.component.scss (100%) rename src/app/forum/{ => forum}/forum.component.spec.ts (100%) rename src/app/forum/{ => forum}/forum.component.ts (87%) create mode 100644 src/app/interface/Visitor.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5310f75..83b0420 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,8 +3,9 @@ import {RouterModule, Routes} from '@angular/router'; import {LoginComponent} from './account/login/login.component'; import {RegisterComponent} from './account/register/register.component'; import {ResetpwdComponent} from './account/resetpwd/resetpwd.component'; -import {ForumComponent} from './forum/forum.component'; +import {ForumComponent} from './forum/forum/forum.component'; import {NoticeComponent} from './forum/notice/notice.component'; +import {VisitorComponent} from './visitor/visitor/visitor.component'; // 路由配置 export const routes: Routes = [ @@ -18,6 +19,8 @@ export const routes: Routes = [ {path: 'forum', component: ForumComponent}, // 公告管理 {path: 'notice', component: NoticeComponent}, + // 访客管理 + {path: 'visitor', component: VisitorComponent}, // 自动重定向到登陆 {path: '', redirectTo: 'login', pathMatch: 'full'} ]; diff --git a/src/app/app.component.html b/src/app/app.component.html index bdc5699..8e30e90 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -3,7 +3,10 @@ {{ 'APP_TITLE' | translate }} - {{ 'forum.name' | translate }} + + {{ 'forum.name' | translate }} + {{ 'visitor.name' | translate }} +
; } + +// 访客信息响应 +export interface VisitorResponse extends Response { + visitorList: Page; +} diff --git a/src/app/interface/Visitor.ts b/src/app/interface/Visitor.ts new file mode 100644 index 0000000..4dd5d12 --- /dev/null +++ b/src/app/interface/Visitor.ts @@ -0,0 +1,19 @@ +export interface Visitor { + id: string; + // 预约人 + appointment: string; + // 预约时间 + time: number; + // 拜访目的 + notes: string; + // 审核状态 + status: VisitorStatus; + // 审核管理员 + managerName: string; +} + +export enum VisitorStatus { + uncheck = 'uncheck', + ok = 'ok', + fail = 'fail' +} diff --git a/src/assets/i18n/en-US.json b/src/assets/i18n/en-US.json index 1d36d5f..c73632b 100644 --- a/src/assets/i18n/en-US.json +++ b/src/assets/i18n/en-US.json @@ -34,7 +34,17 @@ "notice_title": "notice title", "notice_content": "notice content" }, - "tip":{ + "visitor": { + "name": "访客预约管理", + "username": "预约人", + "time": "预约时间", + "notes": "拜访目的", + "admin": "审核管理员", + "action": "操作", + "allow": "通过", + "reject": "拒绝" + }, + "tip": { "input": "please input {{value}}", "HELLO": "Hello {{value}} welcome to you", "notnull": "The {{value}} cannot be empty", diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json index b72ee51..bd23e93 100644 --- a/src/assets/i18n/zh-CN.json +++ b/src/assets/i18n/zh-CN.json @@ -34,7 +34,20 @@ "notice_title": "公告标题", "notice_content": "公告内容" }, - "tip":{ + "visitor": { + "name": "访客预约管理", + "username": "预约人", + "time": "预约时间", + "notes": "拜访目的", + "admin": "审核管理员", + "action": "操作", + "ok": "通过", + "fail": "拒绝", + "checked": "已审核", + "uncheck": "未审核", + "status": "审核状态" + }, + "tip": { "input": "请输入{{value}}", "HELLO": "欢迎管理员{{value}}登陆", "notnull": "{{value}}不能为空", @@ -108,6 +121,10 @@ "check_ok": "审核成功", "check_fail": "审核失败" } + }, + "visitor": { + "check_ok": "审核成功", + "check_fail": "审核失败" } } }