shaojiahao
/
Sinopec-Anxin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[新增]密码规则提示

dev
邵佳豪 3 years ago
parent
5a43d0fb9d
commit
1773c96046
4 changed files with 72 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/app/pages/change-password/change-password.component.ts
  2. 35
      src/app/pages/login/login.component.ts
  3. 16
      src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
  4. 16
      src/app/pages/warning-statistics-list/warning-statistics-list.component.html

29
src/app/pages/change-password/change-password.component.ts
Unescape View File

@ -1,7 +1,8 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { NzSafeAny } from 'ng-zorro-antd/core/types';
@Component({ @Component({
selector: 'app-change-password', selector: 'app-change-password',
templateUrl: './change-password.component.html', templateUrl: './change-password.component.html',
@ -12,11 +13,33 @@ export class ChangePasswordComponent implements OnInit {
constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { } constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
validateForm!: FormGroup; validateForm!: FormGroup;
ngOnInit(): void { ngOnInit(): void {
const { password } = MyValidators;
this.validateForm = this.fb.group({ this.validateForm = this.fb.group({
oldpassword: [null, [Validators.required]], oldpassword: [null, [Validators.required]],
newpassword: [null, [Validators.required]], newpassword: [null, [Validators.required, password]],
affirmpassword: [null, [Validators.required]] affirmpassword: [null, [Validators.required, password]]
}); });
} }
} }
export type MyErrorsOptions = { 'zh-cn': string; en: string } & Record<string, NzSafeAny>;
export type MyValidationErrors = Record<string, MyErrorsOptions>;
export class MyValidators extends Validators {
static password(control: AbstractControl): MyValidationErrors | null {
const value = control.value;
if (isEmptyInputValue(value)) {
return null;
}
return isPassword(value) ? null : { mobile: { 'zh-cn': `长度 12 位以上，包含①大写字母、②小写字母、③数字、④特殊字符四种中的三种组合`, en: `Password phone number is not valid` } };
}
}
function isEmptyInputValue(value: NzSafeAny): boolean {
return value == null || value.length === 0;
}
function isPassword(value: string): boolean {
return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{12,99}$/.test(value);
}

35
src/app/pages/login/login.component.ts
Unescape View File

@ -3,10 +3,11 @@ import { HttpClient } from '@angular/common/http'
import { Router, ActivatedRoute } from '@angular/router' import { Router, ActivatedRoute } from '@angular/router'
import { CacheTokenService } from '../../service/cache-token.service'//引入服务 import { CacheTokenService } from '../../service/cache-token.service'//引入服务
import { CookieService } from 'ngx-cookie-service';//cookie插件 import { CookieService } from 'ngx-cookie-service';//cookie插件
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
import { NzNotificationService } from 'ng-zorro-antd/notification'; import { NzNotificationService } from 'ng-zorro-antd/notification';
import { NzSafeAny } from 'ng-zorro-antd/core/types';
declare var abp: any declare var abp: any
@Component({ @Component({
@ -18,15 +19,18 @@ declare var abp: any
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
validateForm!: FormGroup; validateForm!: FormGroup;
constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, private cookieService: CookieService, private fb: FormBuilder, private message: NzMessageService, private notificationService: NzNotificationService) { } constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, private cookieService: CookieService, private fb: FormBuilder, private message: NzMessageService, private notificationService: NzNotificationService) {
const { password } = MyValidators;
ngOnInit() {
this.validateForm = this.fb.group({ this.validateForm = this.fb.group({
userName: [null, [Validators.required]], userName: [null, [Validators.required]],
password: [null, [Validators.required]], password: [null, [Validators.required, password]],
remember: [null], remember: [null],
autologin: [null], autologin: [null],
}); });
}
ngOnInit() {
//如果本地储存了账号密码信息，那就回显在输入框 //如果本地储存了账号密码信息，那就回显在输入框
let account = localStorage.getItem('account') let account = localStorage.getItem('account')
let password = localStorage.getItem('password') let password = localStorage.getItem('password')
@ -157,3 +161,24 @@ export class LoginComponent implements OnInit {
this.message.create('warning', `请联系管理员`); this.message.create('warning', `请联系管理员`);
} }
} }
export type MyErrorsOptions = { 'zh-cn': string; en: string } & Record<string, NzSafeAny>;
export type MyValidationErrors = Record<string, MyErrorsOptions>;
export class MyValidators extends Validators {
static password(control: AbstractControl): MyValidationErrors | null {
const value = control.value;
if (isEmptyInputValue(value)) {
return null;
}
return isPassword(value) ? null : { mobile: { 'zh-cn': `长度 12 位以上，包含①大写字母、②小写字母、③数字、④特殊字符四种中的三种组合`, en: `Password phone number is not valid` } };
}
}
function isEmptyInputValue(value: NzSafeAny): boolean {
return value == null || value.length === 0;
}
function isPassword(value: string): boolean {
return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{12,99}$/.test(value);
}

16
src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
Unescape View File

@ -103,13 +103,13 @@
<div nz-col nzSpan="1"> <div nz-col nzSpan="1">
<span style="margin-left: 15px;">序号</span> <span style="margin-left: 15px;">序号</span>
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="3">
<span>油站名称</span> <span>油站名称</span>
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2">
公司名称 公司名称
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="4">
区域 区域
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">
@ -124,9 +124,9 @@
<div nz-col nzSpan="3" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> <div nz-col nzSpan="3" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
操作中准备预警节点数量 操作中准备预警节点数量
</div> </div>
<div nz-col nzSpan="3" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> <!-- <div nz-col nzSpan="3" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
全流程准备预警节点数量 全流程准备预警节点数量
</div> </div> -->
<div nz-col nzSpan="1"> <div nz-col nzSpan="1">
状态 状态
</div> </div>
@ -139,13 +139,13 @@
<div nz-col nzSpan="1"> <div nz-col nzSpan="1">
<span style="margin-left: 15px;">{{key + 1}}</span> <span style="margin-left: 15px;">{{key + 1}}</span>
</div> </div>
<div nz-col nzSpan="2" [title]="item.gasStation.stationName"> <div nz-col nzSpan="3" [title]="item.gasStation.stationName">
<span>{{item.gasStation.stationName}}</span> <span>{{item.gasStation.stationName}}</span>
</div> </div>
<div nz-col nzSpan="2" [title]="item.gasStation.companyName"> <div nz-col nzSpan="2" [title]="item.gasStation.companyName">
{{item.gasStation.companyName}} {{item.gasStation.companyName}}
</div> </div>
<div nz-col nzSpan="2" [title]="item.gasStation.locationName"> <div nz-col nzSpan="4" [title]="item.gasStation.locationName">
{{item.gasStation.locationName}} {{item.gasStation.locationName}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">
@ -160,9 +160,9 @@
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">
{{item.proccessingCount}} {{item.proccessingCount}}
</div> </div>
<div nz-col nzSpan="3"> <!-- <div nz-col nzSpan="3">
{{item.allProccessCount}} {{item.allProccessCount}}
</div> </div> -->
<div nz-col nzSpan="1"> <div nz-col nzSpan="1">
<ng-container <ng-container
*ngIf="item.proccessBeforeCount == 0 && item.proccessingCount == 0 && item.allProccessCount == 0; else elseTemplate"> *ngIf="item.proccessBeforeCount == 0 && item.proccessingCount == 0 && item.allProccessCount == 0; else elseTemplate">

16
src/app/pages/warning-statistics-list/warning-statistics-list.component.html
Unescape View File

@ -104,16 +104,16 @@
overflow:hidden; overflow:hidden;
text-overflow:ellipsis;">序号</span> text-overflow:ellipsis;">序号</span>
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="2">
预警类别 预警类别
</div> </div>
<div nz-col nzSpan="4"> <div nz-col nzSpan="3">
预警内容 预警内容
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">
公司名称 公司名称
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="5">
区域名称 区域名称
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">
@ -134,7 +134,7 @@
<div nz-col nzSpan="1"> <div nz-col nzSpan="1">
<span style="margin-left: 20px;">{{key+1}}</span> <span style="margin-left: 20px;">{{key+1}}</span>
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="2">
<ng-container *ngIf="item.numberOfTimes; else elseTemplate"> <ng-container *ngIf="item.numberOfTimes; else elseTemplate">
<span *ngIf="item.numberOfTimes == 1">办理提醒</span> <span *ngIf="item.numberOfTimes == 1">办理提醒</span>
<span *ngIf="item.numberOfTimes == 2">临期提醒</span> <span *ngIf="item.numberOfTimes == 2">临期提醒</span>
@ -144,7 +144,7 @@
逾期报警 逾期报警
</ng-template> </ng-template>
</div> </div>
<div nz-col nzSpan="4"> <div nz-col nzSpan="3">
<ng-container *ngIf="item.numberOfTimes; else elseTemplate2"> <ng-container *ngIf="item.numberOfTimes; else elseTemplate2">
<span *ngIf="item.numberOfTimes == 1">{{item.desc}}办理提醒</span> <span *ngIf="item.numberOfTimes == 1">{{item.desc}}办理提醒</span>
<span *ngIf="item.numberOfTimes == 2">{{item.desc}}临期提醒</span> <span *ngIf="item.numberOfTimes == 2">{{item.desc}}临期提醒</span>
@ -154,13 +154,13 @@
消防设备逾期报警 消防设备逾期报警
</ng-template> </ng-template>
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3" [title]="item.gasStation.companyName">
{{item.gasStation.companyName ? item.gasStation.companyName : '/'}} {{item.gasStation.companyName ? item.gasStation.companyName : '/'}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="5" [title]="item.gasStation.locationName">
{{item.gasStation.locationName ? item.gasStation.locationName : '/'}} {{item.gasStation.locationName ? item.gasStation.locationName : '/'}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3" [title]="item.gasStation.stationName">
{{item.gasStation.stationName ? item.gasStation.stationName : '/'}} {{item.gasStation.stationName ? item.gasStation.stationName : '/'}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">

Write Preview
Loading…
Cancel
Save