+
-
@@ -62,16 +63,75 @@
-
-
-
-
-
+
+
+
+
+ 事件编号
+
+
+ 事件级别
+
+
+ 事件类型
+
+
+ 区域
+
+
+
+
+ 加油站
+
+
+ 地点
+
+
+ 违规时间
+
+
+ 操作
+
+
+
+
+
+ {{item.id}}
+
+
+ {{item.level}}
+
+
+ {{item.type}}
+
+
+ 山东淄博
+
+
+ 自营
+
+
+ {{item.name}}
+
+
+ {{item.site}}
+
+
+ {{item.time}}
+
+
+ 查看
+
+
+ 16条/页,共100条
-
-
-
diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss
index e6c42ad..f476283 100644
--- a/src/app/pages/login/login.component.scss
+++ b/src/app/pages/login/login.component.scss
@@ -1,105 +1,58 @@
.login {
width: 100%;
height: 100%;
- background: url('../../../assets/images/caiji.jpg');
- background-size:100% 100%;
-}
-.loginBox {
- width: 100%;
- height: 100%;
- background-color: #000;
- background: rgba(0,0,0,0.5);/*盒子背景透明*/
- display: flex;
- /*!*flex-direction: column;*!可写可不写*/
- justify-content: center;
- align-items: center;
+ background: url('../../../assets/images/bgImg.jpg');
+ background-size: 100% 100%;
+ position: relative;
}
.card {
- width: 500px;
- height: 355px;
- border-radius: 10px;
- padding-top: 25px;
- background-color: hsla(0,0%,100%,.8);
- text-align: center;
- box-shadow:0px 0px 10px 5px #333;
-}
-.cardheader{
- margin-bottom: 10px;
- font-size: 26px;
- font-weight: 500;
-}
-
-.input {
- margin: 15px auto;
- position: relative;
-}
-.mat-form-field {
- width: 300px;
-}
-.position {
- margin-top: 5px;
position: absolute;
- top: 15px;
- left: 75px;
-}
-
-.alert-danger {
- text-align-last: left;
- margin-left: 100px;
- font-size: 14px;
- color: red;
-}
-.register {
- text-align: left;
- a {
- font-size: 14px;
- color: #0066FF;
+ top: 20%;
+ right: 12%;
+ background-color: rgba(0, 13, 33, 0.24);
+ border-radius: 16px;
+ width: 456px;
+ height: 548px;
+ box-sizing: border-box;
+ padding: 79px 48px 42px 48px;
+ color: rgba(255, 255, 255, 1);
+}
+
+.cardheader {
+ font-size: 28px;
+ margin-bottom: 66px;
+ color: rgba(255, 255, 255, 1);
+}
+
+.hint {
+ text-align: right;
+ margin-bottom: 40px;
+ .forget{
+ cursor: pointer;
+ color: #2399FF;
}
}
-.loginbtn {
- margin-top: 25px;
- height: 30px;
- line-height: 30px;
- width: 280px;
- background-color:#039be5;
- border-radius: 15px;
- color: #fff;
-}
-//二维码
-.forget:hover {
- .contactUs {
- opacity: 1;
- z-index: 1;
- transition: opacity 1.5s;
- }
-}
-.contactUs {
- opacity: 0;
- z-index: -999;
- position: fixed;
- top: 55%;
- left: 28%;
- width: 150px;
- border-radius: 5px;;
- img {
- width: 150px;
- height: 150px;}
+button {
+ width: 100%;
+ height: 42px;
+ font-size: 16px;
+ border-radius: 4px;
}
-.login-form {
- max-width: 300px;
+p {
+ text-align: center;
}
-.login-form-margin {
- margin-bottom: 16px;
+.role {
+ color: #2399FF;
+ margin-top: 38px;
+ font-size: 15px;
}
-.login-form-forgot {
- float: right;
+.company {
+ color: #666262;
+ margin-top: 25px;
+ font-size: 14px;
}
-
-.login-form-button {
- width: 100%;
-}
\ No newline at end of file
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 0c89426..d05f00f 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -1,12 +1,11 @@
import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core';
import { HttpClient } from '@angular/common/http'
-import { Data } from '../../interface'
import { Router, ActivatedRoute } from '@angular/router'
import { CacheTokenService } from '../../service/cache-token.service'//引入服务
import { CookieService } from 'ngx-cookie-service';//cookie插件
-import { MatSnackBar } from '@angular/material/snack-bar';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { NzMessageService } from 'ng-zorro-antd/message';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
@@ -17,14 +16,12 @@ export class LoginComponent implements OnInit {
validateForm!: FormGroup;
- constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService,
- public snackBar: MatSnackBar, private cookieService: CookieService,private fb: FormBuilder) { }
+ constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, private cookieService: CookieService, private fb: FormBuilder, private message: NzMessageService) { }
- ngOnInit() {
+ ngOnInit() {
this.validateForm = this.fb.group({
userName: [null, [Validators.required]],
password: [null, [Validators.required]],
- remember: [true]
});
}
@@ -36,30 +33,48 @@ export class LoginComponent implements OnInit {
this.router.navigate(['/register'])
}
-
submitForm(): void {
for (const i in this.validateForm.controls) {
this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity();
}
- // console.log(this.validateForm)
+ if (!this.validateForm.valid) {
+ this.message.create('error', `请输入账号密码`);
+ return
+ }
+ if (!this.selectedRole) {
+ this.message.create('error', `请选择登录角色`);
+ return
+ }
this.http.post('/api/TokenAuth/Authenticate', {
userNameOrEmailAddress: this.validateForm.value.userName,
password: this.validateForm.value.password
}).subscribe(
(data: any) => {
- console.log('登陆成功',data)
- // sessionStorage.setItem("isDefaultPassword", data.isDefaultPassword);
+ this.message.create('success', `登陆成功`);
sessionStorage.setItem("token", data.result.accessToken);
-
this.cookieService.set("token", data.result.accessToken, null, '/');
this.cookieService.set("refreshToken", data.result.encryptedAccessToken, null, '/');
this.router.navigate(['/home/plan'])
//调用服务中的function刷新token
// this.token.startUp()
},
- (err) => { this.errmsg = err.error.details }
+ (err) => {
+ this.message.create('error', err.error.error.details);
+ }
)
}
+
+ roleList = [
+ '管理员', '职工'
+ ]
+
+ selectedRole: string
+ selecteRole(role) {
+ this.selectedRole = role
+ }
+ forget() {
+ this.message.create('warning', `请联系管理员`);
+ }
}
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 28167ce..cf748a3 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -25,7 +25,9 @@ import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
import { NzIconModule } from 'ng-zorro-antd/icon';
import { NzGridModule } from 'ng-zorro-antd/grid';
import { NzModalModule } from 'ng-zorro-antd/modal';
-
+import { NzPaginationModule } from 'ng-zorro-antd/pagination';
+import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
+import { NzMessageModule } from 'ng-zorro-antd/message';
@NgModule({
declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,],
imports: [
@@ -49,7 +51,10 @@ import { NzModalModule } from 'ng-zorro-antd/modal';
NzDatePickerModule,
NzIconModule,
NzGridModule,
- NzModalModule
+ NzModalModule,
+ NzPaginationModule,
+ NzDropDownModule,
+ NzMessageModule
]
})
export class PagesModule { }
diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts
index e8c8d1a..3e53af2 100644
--- a/src/app/pages/register/register.component.ts
+++ b/src/app/pages/register/register.component.ts
@@ -1,8 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http';
-import { Router, ActivatedRoute } from '@angular/router';
-import { MatSnackBar } from '@angular/material/snack-bar';
-
+import { Router } from '@angular/router';
+import { NzMessageService } from 'ng-zorro-antd/message';
@Component({
selector: 'app-register',
templateUrl: './register.component.html',
@@ -10,7 +9,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
})
export class RegisterComponent implements OnInit {
- constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public snackBar: MatSnackBar) { }
+ constructor(private http: HttpClient, private router: Router, private message: NzMessageService) { }
ngOnInit() { }
errmsg: any; //错误信息
@@ -24,9 +23,7 @@ export class RegisterComponent implements OnInit {
phone: String(e.phone),
usci: e.usci
}).subscribe(data => {
- this.snackBar.open('注册成功,请登录!', '确定', {
- duration: 3000
- });
+ this.message.create('success', `注册成功,请登录!`);
this.router.navigate(['/login'])
}, (err) => {
this.errmsg = err
diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html
index 927cbf8..7dc47a4 100644
--- a/src/app/pages/today-warning/today-warning.component.html
+++ b/src/app/pages/today-warning/today-warning.component.html
@@ -1,6 +1,6 @@
- XXXXXXXXXX
-
\ No newline at end of file
+
- 当日违规事件列表
+
+
+
+
+
+
+ 编号:
+
+
+ 违规行为:
+
+
+ 地点
+
+
+ 违规时间
+
+
+ 操作
+
+
Ⅰ级违法事件
diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss
index fa8ba71..129b79b 100644
--- a/src/app/pages/today-warning/today-warning.component.scss
+++ b/src/app/pages/today-warning/today-warning.component.scss
@@ -14,6 +14,7 @@
font-family: titlefont;
font-size: 26px;
color: #D0EAFF;
+ margin: 15px 0;
}
.search {
@@ -42,24 +43,11 @@
}
nz-date-picker {
-
background-color: #002552;
width: 145%;
}
}
-
- .submit {
- background-color: #013064;
- border: 1px solid #4c8ac8;
- color: #86bff3;
- }
-
- .reset {
- background-color: #010d26;
- border: 1px solid #4c8ac8;
- color: #86bff3;
- }
}
.warningnumber {
diff --git a/src/app/ui/changepassword/changepassword.component.ts b/src/app/ui/changepassword/changepassword.component.ts
index f583329..07ae9c5 100644
--- a/src/app/ui/changepassword/changepassword.component.ts
+++ b/src/app/ui/changepassword/changepassword.component.ts
@@ -1,8 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http'
import { MatDialogRef } from '@angular/material/dialog';
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
-
+import { NzMessageService } from 'ng-zorro-antd/message';
@Component({
@@ -12,31 +11,27 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
})
export class ChangepasswordComponent implements OnInit {
-
- constructor(private http:HttpClient,public snackBar: MatSnackBar,
- public dialogRef: MatDialogRef) { }
+
+ constructor(private http: HttpClient,
+ public dialogRef: MatDialogRef, private message: NzMessageService) { }
ngOnInit() {
}
- errmsg :string = ''
+ errmsg: string = ''
- onSubmit(e){
+ onSubmit(e) {
this.http.put(
- '/api/CompanyAccount/Password',
+ '/api/CompanyAccount/Password',
{
newPassword: e.newPassword,
password: e.password
}
- ).subscribe(data=> {
+ ).subscribe(data => {
this.dialogRef.close(data);
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('密码修改成功','确定',config);
- },(err) =>
- {this.errmsg = err}
+ this.message.create('success', `密码修改成功`);
+ }, (err) => { this.errmsg = err }
)
- }
+ }
diff --git a/src/app/ui/tabbar/tabbar.component.ts b/src/app/ui/tabbar/tabbar.component.ts
index 0e0866c..d47210c 100644
--- a/src/app/ui/tabbar/tabbar.component.ts
+++ b/src/app/ui/tabbar/tabbar.component.ts
@@ -4,9 +4,8 @@ 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';
-
+import { NzMessageService } from 'ng-zorro-antd/message';
@Component({
@@ -16,17 +15,17 @@ import { CookieService } from 'ngx-cookie-service';
})
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) { }
+ constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, public dialog: MatDialog,
+ private cookieService: CookieService, private message: NzMessageService) { }
ngOnInit() {
- setInterval(()=>{
+ setInterval(() => {
this.getTime()
- },1000);
+ }, 1000);
}
//获得时间
- time:string
+ time: string
getTime() {
let myDate = new Date();
let y = myDate.getFullYear();
@@ -53,20 +52,18 @@ export class TabbarComponent implements OnInit {
//退出系统
signOut() {
- let out = confirm("您确定要退出吗")
- if (out) {
- 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'])
- }
+ this.message.create('success', `退出成功`);
+ 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' });
+ let dialogRef = this.dialog.open(ChangepasswordComponent, { width: '348.000051px' });
dialogRef.afterClosed().subscribe();
}
diff --git a/src/app/ui/title/title.component.html b/src/app/ui/title/title.component.html
index 62f2cd2..56b04d6 100644
--- a/src/app/ui/title/title.component.html
+++ b/src/app/ui/title/title.component.html
@@ -2,7 +2,7 @@
\ No newline at end of file
diff --git a/src/app/ui/title/title.component.ts b/src/app/ui/title/title.component.ts
index 4a46919..6acbff7 100644
--- a/src/app/ui/title/title.component.ts
+++ b/src/app/ui/title/title.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
@Component({
selector: 'app-title',
@@ -7,6 +7,8 @@ import { Component, OnInit } from '@angular/core';
})
export class TitleComponent implements OnInit {
+ @Input() name: string
+
constructor() { }
ngOnInit(): void {
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index ed55c4d..fca93cb 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -19,6 +19,7 @@ import { TabbarComponent } from './tabbar/tabbar.component';
import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
import { TitleComponent } from './title/title.component';
+import { NzMessageModule } from 'ng-zorro-antd/message';
@NgModule({
declarations: [TabbarComponent,UserdataComponent, ChangepasswordComponent, IsnoPipe, ConfirmpswDirective, TimePipe, EditUser, TitleComponent],
@@ -35,7 +36,8 @@ import { TitleComponent } from './title/title.component';
ReactiveFormsModule,
FormsModule,
PaginatorModule,
- NzDropDownModule
+ NzDropDownModule,
+ NzMessageModule
],
exports:[TabbarComponent,TitleComponent]
diff --git a/src/assets/images/bgImg.jpg b/src/assets/images/bgImg.jpg
new file mode 100644
index 0000000..7bcfb48
Binary files /dev/null and b/src/assets/images/bgImg.jpg differ
diff --git a/src/styles.scss b/src/styles.scss
index 82a670a..92c1a83 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -112,3 +112,5 @@ h1 {
::-webkit-scrollbar-track {
background-color: #061d3c;
}
+
+
diff --git a/src/theme.less b/src/theme.less
index 35e8815..8a2309a 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -14,19 +14,140 @@
border-radius: 0px;
}
+//select picker 小剪头
+.ant-select-arrow,
+.ant-picker-separator {
+ color: #478bcf;
+}
+
//日期选择器
@input-placeholder-color: #8aacce;
.ant-picker-suffix {
color: #8aacce;
-
}
.ant-picker-input>input {
color: #fff;
}
+
//弹窗遮罩层
.ant-modal-mask {
background: rgba(0, 0, 0, 0.05);
}
+
+//分页器
+.ant-pagination-total-text,
+.ant-pagination-options-quick-jumper {
+ color: white
+}
+
+.ant-pagination-item a,
+.ant-pagination-prev .ant-pagination-item-link,
+.ant-pagination-next .ant-pagination-item-link,
+.ant-pagination-options-quick-jumper input {
+ color: white;
+ background: #0e2f4e;
+}
+
+.ant-pagination-item-active a {
+ background: #107495;
+}
+
+.submit {
+ background-color: #013064;
+ border: 1px solid #4c8ac8;
+ color: #86bff3;
+}
+
+.reset {
+ background-color: #010d26;
+ border: 1px solid #4c8ac8;
+ color: #86bff3;
+}
+
+//接收报警弹出框
+.ant-notification {
+ width: 500px;
+}
+
+.receiptOfNotification {
+ height: 160px;
+ background-color: rgba(1, 13, 27, 0.9);
+ box-shadow: 0 0 36px 3px #8f1622 inset;
+ display: flex;
+ flex-direction: column;
+ padding: 5px;
+
+ .topbox {
+ position: relative;
+ flex: 1;
+ display: flex;
+
+ img {
+ max-width: 64px;
+ max-height: 64px;
+ }
+
+ .text {
+ display: flex;
+ flex-direction: column;
+ color: white;
+ justify-content: center;
+ }
+ }
+
+ .btnbox {
+ height: 30px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 12px 0;
+
+ button {
+ margin: 0 5px;
+ }
+ }
+
+ button {
+ width: 64px;
+ height: 30px;
+ line-height: 30px;
+ background-color: rgba(1, 13, 27, 0.9);
+ color: white;
+ border: 0px;
+ }
+
+ .look {
+ box-shadow: 0 0 12px #8f1622 inset;
+ }
+
+ .lose {
+ box-shadow: 0 0 12px #8f8b8b inset;
+ }
+}
+
+.ant-notification-close-icon {
+ color: white;
+}
+
+.ant-notification-notice-close {
+ top: 4px;
+ right: 6px;
+}
+
+
+//登录页input
+#login {
+ nz-input-group,input {
+ color: white;
+ background: #143c61;
+ }
+ input:-webkit-autofill {
+ -webkit-box-shadow: 0 0 0 1000px #143c61 inset !important;
+ -webkit-text-fill-color: #fff !important;
+ -webkit-border-radius:0px;
+ -webkit-font-size: 16px!important;
+ }
+}
- 违规类型统计
+ {{name}}