+
\ No newline at end of file
diff --git a/src/app/ui/tabbar/tabbar.component.html b/src/app/ui/tabbar/tabbar.component.html
new file mode 100644
index 0000000..b27de28
--- /dev/null
+++ b/src/app/ui/tabbar/tabbar.component.html
@@ -0,0 +1,19 @@
+
\ No newline at end of file
diff --git a/src/app/ui/tabbar/tabbar.component.scss b/src/app/ui/tabbar/tabbar.component.scss
new file mode 100644
index 0000000..a9a1c9a
--- /dev/null
+++ b/src/app/ui/tabbar/tabbar.component.scss
@@ -0,0 +1,9 @@
+.box{
+ width: 100%;
+ height: 62px;
+ background-image: linear-gradient(#001530, #051C3C ,#162f50, #243c55);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: #fff;
+}
diff --git a/src/app/ui/tabbar/tabbar.component.ts b/src/app/ui/tabbar/tabbar.component.ts
new file mode 100644
index 0000000..31654ac
--- /dev/null
+++ b/src/app/ui/tabbar/tabbar.component.ts
@@ -0,0 +1,81 @@
+import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+import { HttpClient } from '@angular/common/http'
+import { Router, ActivatedRoute } from '@angular/router'
+import { CacheTokenService } from '../../service/cache-token.service' //引入服务
+import { MatDialog } from '@angular/material/dialog';
+import { ChangepasswordComponent } from '../changepassword/changepassword.component'
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { CookieService } from 'ngx-cookie-service';
+
+
+
+@Component({
+ selector: 'app-tabbar',
+ templateUrl: './tabbar.component.html',
+ styleUrls: ['./tabbar.component.scss']
+})
+export class TabbarComponent implements OnInit {
+
+ constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, public dialog: MatDialog, public snackBar: MatSnackBar,
+ private cookieService: CookieService) { }
+
+ ngOnInit() {
+ setInterval(()=>{
+ this.getTime()
+ },1000);
+ }
+
+ //获得时间
+ time:string
+ getTime() {
+ let myDate = new Date();
+ let y = myDate.getFullYear();
+ let M = myDate.getMonth() + 1; //获取当前月份(0-11,0代表1月)
+ let d = myDate.getDate(); //获取当前日(1-31)
+ let h = myDate.getHours(); //获取当前小时数(0-23)
+ let m = myDate.getMinutes(); //获取当前分钟数(0-59)
+ let s = myDate.getSeconds(); //获取当前秒数(0-59)
+
+ //检查是否小于10
+ M = check(M);
+ d = check(d);
+ h = check(h);
+ m = check(m);
+ s = check(s);
+ let timestr = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+ this.time = timestr;
+ //时间数字小于10，则在之前加个“0”补位。
+ function check(i) {
+ let num = (i < 10) ? ("0" + i) : i;
+ return num;
+ }
+ }
+
+ //退出系统
+ signOut() {
+ let out = confirm("您确定要退出吗")
+ if (out) {
+ this.http.post('/api/CompanyAccount/SignOut', {}).subscribe(
+ data => {
+ this.token.delete()
+ sessionStorage.clear()
+ window.localStorage.clear()
+ this.cookieService.set("token", '', new Date(new Date().getTime() + 1), '/');
+ this.cookieService.set("refreshToken", '', new Date(new Date().getTime() + 1), '/');
+ this.router.navigate(['/login'])
+ }
+ )
+ }
+ }
+
+ //修改密码
+ changpsw() {
+ let dialogRef = this.dialog.open(ChangepasswordComponent,
+ { width: '348px' });
+
+ dialogRef.afterClosed().subscribe();
+ }
+
+
+
+}
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index 010eeba..9abf87f 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -8,40 +8,6 @@ import { ScrollingModule } from '@angular/cdk/scrolling';
import { CdkStepperModule } from '@angular/cdk/stepper';
import { CdkTableModule } from '@angular/cdk/table';
import { CdkTreeModule } from '@angular/cdk/tree';
-import { MatAutocompleteModule } from '@angular/material/autocomplete';
-import { MatBadgeModule } from '@angular/material/badge';
-import { MatBottomSheetModule } from '@angular/material/bottom-sheet';
-import { MatButtonModule } from '@angular/material/button';
-import { MatButtonToggleModule } from '@angular/material/button-toggle';
-import { MatCardModule } from '@angular/material/card';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatStepperModule } from '@angular/material/stepper';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatDialogModule } from '@angular/material/dialog';
-import { MatDividerModule } from '@angular/material/divider';
-import { MatExpansionModule } from '@angular/material/expansion';
-import { MatGridListModule } from '@angular/material/grid-list';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatListModule } from '@angular/material/list';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatNativeDateModule, MatRippleModule, MatOption } from '@angular/material/core';
-import { MatPaginatorModule } from '@angular/material/paginator';
-import { MatProgressBarModule } from '@angular/material/progress-bar';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatRadioModule } from '@angular/material/radio';
-import { MatSelectModule } from '@angular/material/select';
-import { MatSidenavModule } from '@angular/material/sidenav';
-import { MatSliderModule } from '@angular/material/slider';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatSortModule } from '@angular/material/sort';
-import { MatTableModule } from '@angular/material/table';
-import { MatTabsModule } from '@angular/material/tabs';
-import { MatToolbarModule } from '@angular/material/toolbar';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { MatTreeModule } from '@angular/material/tree';
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { UserdataComponent, EditUser } from './userdata/userdata.component';
import { ChangepasswordComponent } from './changepassword/changepassword.component';
@@ -49,8 +15,11 @@ import { IsnoPipe } from '../pipes/boolean.pipe';
import { ConfirmpswDirective } from './changepassword/equal-validator.directive';
import { TimePipe } from '../pipes/time.pipe';
import { PaginatorModule } from './paginator/paginator.module';
+import { TabbarComponent } from './tabbar/tabbar.component';
+
+import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
@NgModule({
- declarations: [UserdataComponent, ChangepasswordComponent, IsnoPipe, ConfirmpswDirective, TimePipe, EditUser],
+ declarations: [TabbarComponent,UserdataComponent, ChangepasswordComponent, IsnoPipe, ConfirmpswDirective, TimePipe, EditUser],
imports: [
CommonModule,
@@ -60,47 +29,15 @@ import { PaginatorModule } from './paginator/paginator.module';
CdkTableModule,
CdkTreeModule,
DragDropModule,
- MatAutocompleteModule,
- MatBadgeModule,
- MatBottomSheetModule,
- MatButtonModule,
- MatButtonToggleModule,
- MatCardModule,
- MatCheckboxModule,
- MatChipsModule,
- MatStepperModule,
- MatDatepickerModule,
- MatDialogModule,
- MatDividerModule,
- MatExpansionModule,
- MatGridListModule,
- MatIconModule,
- MatInputModule,
- MatListModule,
- MatMenuModule,
- MatNativeDateModule,
- MatPaginatorModule,
- MatProgressBarModule,
- MatProgressSpinnerModule,
- MatRadioModule,
- MatRippleModule,
- MatSelectModule,
- MatSidenavModule,
- MatSliderModule,
- MatSlideToggleModule,
- MatSnackBarModule,
- MatSortModule,
- MatTableModule,
- MatTabsModule,
- MatToolbarModule,
- MatTooltipModule,
- MatTreeModule,
PortalModule,
ScrollingModule,
ReactiveFormsModule,
FormsModule,
- PaginatorModule
- ]
+ PaginatorModule,
+ NzDropDownModule
+ ],
+
+ exports:[TabbarComponent]
})
export class UiModule { }
diff --git a/src/app/ui/userdata/edituserdata.component.html b/src/app/ui/userdata/edituserdata.component.html
index fae3b3f..a4c60af 100644
--- a/src/app/ui/userdata/edituserdata.component.html
+++ b/src/app/ui/userdata/edituserdata.component.html
@@ -1,4 +1,4 @@
-
修改资料
+
\ No newline at end of file
diff --git a/src/app/ui/userdata/userdata.component.html b/src/app/ui/userdata/userdata.component.html
index 44d8336..4d8aeff 100644
--- a/src/app/ui/userdata/userdata.component.html
+++ b/src/app/ui/userdata/userdata.component.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index ab35cc7..007f456 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,4 +1,4 @@
-@import "./app/theme.scss";
+@import "~ng-zorro-antd/ng-zorro-antd.min.css";
html,
body {
width: 100%;
@@ -74,44 +74,9 @@ li {
app-root {
height: 100%;
}
-
h1 {
font-size: 16px;
}
-.mat-expansion-panel-body {
- padding: 0px !important;
-}
-.mat-expansion-indicator::after {
- color: black;
-}
-.example-sidenav .mat-drawer-inner-container {
- overflow: hidden;
-}
-table th.mat-header-cell:last-of-type,
-table td.mat-cell:last-of-type,
-table td.mat-footer-cell:last-of-type {
- padding-right: 0px;
-}
-.mat-tab-body {
- height: 100%;
- overflow-y: auto;
-}
-.mat-drawer-backdrop.mat-drawer-shown {
- background-color: #fff;
-}
-.mat-content {
- //可展开面板垂直居中
- align-items: center;
-}
-
-//x轴滚动条隐藏
-.example-sidenav-content {
- overflow-x: hidden;
- overflow-y: auto;
-}
-.mat-tab-body-wrapper {
- overflow: auto !important;
-}
//滚动条样式
::-webkit-scrollbar {
width: 5px;