规格
+存放地点
购入日期
+生产日期
生产日期
+下次维保日期
有效期至
@@ -45,4 +45,4 @@
-
+
\ No newline at end of file
diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.ts b/src/app/pages/equipment-info/addequipment/addequipment.component.ts
index 3a8fafa..b76f1db 100644
--- a/src/app/pages/equipment-info/addequipment/addequipment.component.ts
+++ b/src/app/pages/equipment-info/addequipment/addequipment.component.ts
@@ -15,10 +15,10 @@ export class AddequipmentComponent implements OnInit {
ngOnInit(): void {
this.validateForm = this.fb.group({
name: [null, [Validators.required]],
- specification: [null, [Validators.required]],
- buytime: [null, [Validators.required]],
- prodtime: [null, [Validators.required]],
- validitytime: [null, [Validators.required]]
+ storageLocation: [null, [Validators.required]],
+ productionDate: [null, [Validators.required]],
+ maintenanceDate: [null, [Validators.required]],
+ validityEndTime: [null, [Validators.required]]
});
}
diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.html b/src/app/pages/equipment-info/editequipment/editequipment.component.html
index 253b2d8..4031d50 100644
--- a/src/app/pages/equipment-info/editequipment/editequipment.component.html
+++ b/src/app/pages/equipment-info/editequipment/editequipment.component.html
@@ -14,30 +14,34 @@
- 规格
+存放地点
购入日期
+生产日期
生产日期
+下次维保日期
有效期至
@@ -45,4 +49,4 @@
-
+
\ No newline at end of file
diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.ts b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
index 3ddba8e..cbc9381 100644
--- a/src/app/pages/equipment-info/editequipment/editequipment.component.ts
+++ b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
@@ -19,10 +19,10 @@ export class EditequipmentComponent implements OnInit {
ngOnInit(): void {
this.validateForm = this.fb.group({
name: [null, [Validators.required]],
- specification: [null, [Validators.required]],
- buytime: [null, [Validators.required]],
- prodtime: [null, [Validators.required]],
- validitytime: [null, [Validators.required]]
+ storageLocation: [null, [Validators.required]],
+ productionDate: [null, [Validators.required]],
+ maintenanceDate: [null, [Validators.required]],
+ validityEndTime: [null, [Validators.required]]
});
this.data2 = JSON.parse(JSON.stringify(this.data))
}
diff --git a/src/app/pages/equipment-info/equipment-info.component.html b/src/app/pages/equipment-info/equipment-info.component.html
index 4d88e13..9d7fb1c 100644
--- a/src/app/pages/equipment-info/equipment-info.component.html
+++ b/src/app/pages/equipment-info/equipment-info.component.html
@@ -29,13 +29,13 @@
消防器材
- 规格
+ 存放地点
- 购入日期
+ 生产日期
- 生产日期
+ 下次维保日期
有效期至
@@ -50,13 +50,13 @@
{{item.name}}
- {{item.specification}}
+ {{item.storageLocation}}
- {{item.purchaseDate | date:"yyyy-MM-dd"}}
+ {{item.productionDate | date:"yyyy-MM-dd"}}
- {{item.productionDate | date:"yyyy-MM-dd"}}
+ {{item.maintenanceDate | date:"yyyy-MM-dd"}}
{{item.validityEndTime | date:"yyyy-MM-dd"}}
diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts
index 530fb25..f3ac262 100644
--- a/src/app/pages/equipment-info/equipment-info.component.ts
+++ b/src/app/pages/equipment-info/equipment-info.component.ts
@@ -73,10 +73,10 @@ export class EquipmentInfoComponent implements OnInit {
await new Promise(resolve => {
let body = {
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id
}
this.http.post('/api/services/app/FireEquipment/Create', body).subscribe(data => {
@@ -118,10 +118,10 @@ export class EquipmentInfoComponent implements OnInit {
let body = {
id: item.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: item.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe(data => {
diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts
index 3366345..6a86b41 100644
--- a/src/app/pages/home-page/home-page.component.ts
+++ b/src/app/pages/home-page/home-page.component.ts
@@ -698,10 +698,10 @@ export class HomePageComponent implements OnInit {
isScrapped: true,
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD')
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD')
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
let body = {
@@ -723,10 +723,10 @@ export class HomePageComponent implements OnInit {
let body = {
id: copydata.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index 32b4e32..2cd7b54 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -1,92 +1,133 @@
-
-
-
-
- 
-
-
-
-
- 首页
-
-
- 数字油站
-
-
- 今日预警
-
-
- 预警记录
-
-
-
-
- 数字油站
-
-
- 今日预警
-
-
- 预警记录
-
-
-
+
+
+
+
+
+
+
+
+ 首页
+
+
+ 数字油站
+
+
+ 今日预警
+
+
+ 预警记录
+
+
+
+
+ 数字油站
+
+
+ 今日预警
+
+
+ 预警记录
+
+
-
-
- 
- 
- 
-
-
+
+
+
- ;
+export type MyValidationErrors = Record;
+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);
+}
+
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.html b/src/app/pages/oil-station-info/oil-station-info.component.html
index 8180c8e..4fef0be 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.html
+++ b/src/app/pages/oil-station-info/oil-station-info.component.html
@@ -304,7 +304,90 @@
{{item.name}}
+
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.scss b/src/app/pages/oil-station-info/oil-station-info.component.scss
index 3c22a4e..bd41ce5 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.scss
+++ b/src/app/pages/oil-station-info/oil-station-info.component.scss
@@ -89,91 +89,92 @@
}
.imgtable {
-
- tr,
- td {
- height: 200px;
- }
+ width: 100%;
+ text-align: center;
+ border-collapse: collapse;
.imgbox {
+ width: 100%;
+ height: 100%;
position: relative;
- .deleteTr{
- position: absolute;
- right: 5px;
- top: 5px;
- cursor: pointer;
- }
- .uploadDivbox {
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- padding: 0 16px;
- display: flex;
- align-items: center;
- position: relative;
- }
-
- .uploadDiv {
- margin-left: 16px;
- width: 120px;
- height: 80px;
- // border: 1px solid red;
- display: flex;
- align-items: center;
- justify-content: center;
- position: relative;
-
- .fileinput {
- width: 114px;
- height: 32px;
- position: absolute;
- z-index: 100;
- opacity: 0;
- top: 23px;
- cursor: pointer;
- }
-
- button {
- z-index: 99;
- width: 114px;
- height: 32px;
- background: rgba(0, 129, 255, 0.3);
- border: 1px solid #36A2FF;
- opacity: 1;
- border-radius: 0px;
- color: #91CCFF;
- }
- }
+ display: flex;
+ flex-direction: column;
.timeDiv {
- position: absolute;
- right: 10px;
- top: 50%;
- transform: translateY(-50%);
+ width: 100%;
display: flex;
flex-direction: column;
- align-items: flex-start;
- justify-content: space-around;
.timeDivflex {
width: 100%;
+ height: 34px;
display: flex;
+ align-items: center;
+ margin: 5px 0;
nz-form-item {
- width: 45%;
+ width: 20%;
margin-right: 15px;
}
}
- .timeDivflex2 {
+ }
+
+
+ .uploadDivbox {
+ width: 100%;
+ height: 80px;
+ display: flex;
+ align-items: center;
+ position: relative;
+ margin: 5px 0;
+
+ .uploadDiv {
+ width: 120px;
+ height: 80px;
+ display: flex;
align-items: center;
- nz-form-item {
- width: 30%;
- margin-right: 9px;
+ justify-content: center;
+ position: relative;
+
+ .fileinput {
+ width: 114px;
+ height: 32px;
+ position: absolute;
+ z-index: 100;
+ opacity: 0;
+ top: 23px;
+ cursor: pointer;
+ }
+
+ button {
+ z-index: 99;
+ width: 114px;
+ height: 32px;
+ background: rgba(0, 129, 255, 0.3);
+ border: 1px solid #36A2FF;
+ opacity: 1;
+ border-radius: 0px;
+ color: #91CCFF;
}
}
}
+ .itemname {
+ width: 120px;
+ text-align: right;
+ box-sizing: border-box;
+ padding-right: 12px;
+ }
+
+ .deleteTr {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ cursor: pointer;
+ }
+
+
}
}
}
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.ts b/src/app/pages/oil-station-info/oil-station-info.component.ts
index 052e721..21e6a8a 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.ts
+++ b/src/app/pages/oil-station-info/oil-station-info.component.ts
@@ -94,10 +94,19 @@ export class OilStationInfoComponent implements OnInit {
}
if (this.httpBody.licenses.length == 0) {
this.httpBody.licenses = [
- { name: '营业执照', code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 1, hasAnnualInspection: true },
- { name: '危险化学品', code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 3, hasAnnualInspection: false },
- { name: '成品油零售', code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 2, hasAnnualInspection: true }
+ { name: '营业执照', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 1, hasAnnualInspection: true },
+ { name: '危险化学品', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 3, hasAnnualInspection: false },
+ { name: '成品油零售', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 2, hasAnnualInspection: true }
]
+ } else {
+ console.log('走这里了',this.httpBody.licenses)
+ this.httpBody.licenses.forEach(item => {
+ if (item.endTime == '9999-01-01T00:00:00') {
+ item.isPerpetual = true
+ } else {
+ item.isPerpetual = false
+ }
+ })
}
this.httpBody.stationType ? this.httpBody.stationType = String(this.httpBody.stationType) : null
setTimeout(() => {
@@ -179,6 +188,13 @@ export class OilStationInfoComponent implements OnInit {
licenses: [
]
}
+
+ perpetualChange(item, $event) {
+ if ($event) {
+ item.endTime = '9999-01-01'
+ }
+ }
+
onChange($event) {
}
@@ -204,7 +220,7 @@ export class OilStationInfoComponent implements OnInit {
}
addTr() {
this.httpBody.licenses.push(
- { name: this.addName, code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: -1, hasAnnualInspection: false },
+ { name: this.addName, code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: -1, hasAnnualInspection: false },
)
}
deleteTrConfirm(key) {
@@ -247,10 +263,15 @@ export class OilStationInfoComponent implements OnInit {
body.stationType
body.govUnitDetail = JSON.stringify(this.httpBody.govUnitDetail)
console.log(body)
+
+ body.licenses.forEach(item => {
+ delete item.isPerpetual
+ })
+
this.http.put('/api/services/app/GasStation/Update', body).subscribe((data: any) => {
this.isLoadingSave = false
this.message.create('success', '保存成功！');
- this.httpBody.licenses = data.result.licenses
+ // this.httpBody.licenses = data.result.licenses
}, err => {
this.isLoadingSave = false
this.message.create('error', '保存失败！');
diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
index fd460bf..244bb6a 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
@@ -103,13 +103,13 @@
- 
-
-
-
- 您有一条新的预警提醒!
- {{item.notification.data.properties.ViolationName}}
-
+
+
+
+ 修改初始密码
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index 35c0af2..f985388 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -3,18 +3,19 @@ import { Router, NavigationEnd } from '@angular/router';
import { filter } from 'rxjs/operators';
import { NavChangeService } from '../../service/navChange.service';
import { CacheTokenService } from '../../service/cache-token.service' //引入服务
-import { CookieService } from 'ngx-cookie-service';
+
import { NzMessageService } from 'ng-zorro-antd/message';
import { SignalRAspNetCoreHelper } from '../../../shared/helpers/SignalRAspNetCoreHelper';
import { NzNotificationService } from 'ng-zorro-antd/notification';
import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component';
import { NzModalService } from 'ng-zorro-antd/modal';
import { HttpClient } from '@angular/common/http';
-import { ChangePasswordComponent } from '../change-password/change-password.component';
+import { ChangePasswordComponent, MyValidators } from '../change-password/change-password.component';
import { listRefreshService } from '../../service/listRefresh.service';
import { DisposeequipmentComponent } from '../warning-statistics-list/disposeequipment/disposeequipment.component';
declare var abp: any
import * as moment from 'moment';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
@@ -22,8 +23,16 @@ import * as moment from 'moment';
})
export class HomeComponent implements OnInit {
@ViewChild('warning', { static: false }) template?: TemplateRef<{}>;
+ passwordValidateForm!: FormGroup;
constructor(private listRefreshService: listRefreshService, private http: HttpClient, private router: Router, private navChangeService: NavChangeService, public token: CacheTokenService,
- private cookieService: CookieService, private message: NzMessageService, private notificationService: NzNotificationService, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
+ private message: NzMessageService, private notificationService: NzNotificationService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private fb: FormBuilder) {
+ const { password } = MyValidators;
+ this.passwordValidateForm = this.fb.group({
+ oldpassword: [null, [Validators.required]],
+ newpassword: [null, [Validators.required, password]],
+ affirmpassword: [null, [Validators.required, password]]
+ });
+ }
isGasStationNav: boolean
isGasStation: boolean
@@ -85,8 +94,49 @@ export class HomeComponent implements OnInit {
}
+ if ((sessionStorage.getItem('isDefaultPassword') == 'true' || sessionStorage.getItem('isPasswordExpired') == 'true') && JSON.parse(sessionStorage.getItem('userdata')).userName != 'admin') {
+ this.changePasswordPopup()
+ }
+
+ }
+
+ //初次登陆修改密码弹窗
+ isVisible = false
+ isConfirmLoading = false
+ changePasswordPopup() {
+ this.isVisible = true
+ }
+ handleOk(): void {
+ console.log(this.passwordValidateForm)
+ if (this.passwordValidateForm.invalid) {
+ this.message.create('warning', `输入格式不正确`);
+ } else {
+ if (this.passwordValidateForm.value.newpassword != this.passwordValidateForm.value.affirmpassword) {
+ this.message.create('warning', '两次密码输入不一致！');
+ } else if (this.passwordValidateForm.value.newpassword == this.passwordValidateForm.value.oldpassword) {
+ this.message.create('warning', '旧密码和新密码不能相同！');
+ } else {
+ this.isConfirmLoading = true;
+ let body = {
+ currentPassword: this.passwordValidateForm.value.oldpassword,
+ newPassword: this.passwordValidateForm.value.newpassword
+ }
+ this.http.post('/api/services/app/User/ChangePassword', body).subscribe(data => {
+ this.message.create('success', '修改成功！');
+ this.isConfirmLoading = false;
+ this.isVisible = false;
+ //清除sessionStorage
+ sessionStorage.removeItem('isDefaultPassword')
+ }, err => {
+ this.message.create('warning', err.error.error.message);
+ this.isConfirmLoading = false;
+ })
+ }
+ }
}
+
+
reloadPage = (userNotification) => {
console.log('abp.notifications.received收到通知', userNotification);
if (this.router.url.indexOf('todaywarning') != -1) {
@@ -111,7 +161,6 @@ export class HomeComponent implements OnInit {
}
this.messageId.push(obj)
}
- isVisible = false
modalData
look(item) {
@@ -151,10 +200,10 @@ export class HomeComponent implements OnInit {
isScrapped: true,
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD')
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD')
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
let body = {
@@ -183,10 +232,10 @@ export class HomeComponent implements OnInit {
let body = {
id: copydata.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
@@ -305,11 +354,7 @@ export class HomeComponent implements OnInit {
this.message.create('success', `退出成功`);
this.token.delete()
sessionStorage.clear()
- // window.localStorage.clear()
-
localStorage.removeItem("isautologin")
- this.cookieService.set("token", '', new Date(new Date().getTime() + 1), '/');
- this.cookieService.set("refreshToken", '', new Date(new Date().getTime() + 1), '/');
this.router.navigate(['/login'])
}
diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html
index 8fea242..c14a77a 100644
--- a/src/app/pages/login/login.component.html
+++ b/src/app/pages/login/login.component.html
@@ -2,7 +2,7 @@
-
-
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 6aaddf3..a8685d7 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -2,11 +2,11 @@ import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http'
import { Router, ActivatedRoute } from '@angular/router'
import { CacheTokenService } from '../../service/cache-token.service'//引入服务
-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 { Base64 } from 'js-base64';
import { NzNotificationService } from 'ng-zorro-antd/notification';
+import { NzSafeAny } from 'ng-zorro-antd/core/types';
declare var abp: any
@Component({
@@ -18,15 +18,24 @@ declare var abp: any
export class LoginComponent implements OnInit {
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) { }
-
- ngOnInit() {
+ passwordValidateForm!: FormGroup;
+ constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, private fb: FormBuilder, private message: NzMessageService, private notificationService: NzNotificationService) {
+ const { password } = MyValidators;
this.validateForm = this.fb.group({
userName: [null, [Validators.required]],
- password: [null, [Validators.required]],
+ password: [null, [Validators.required, password]],
remember: [null],
autologin: [null],
});
+ this.passwordValidateForm = this.fb.group({
+ oldpassword: [null, [Validators.required]],
+ newpassword: [null, [Validators.required, password]],
+ affirmpassword: [null, [Validators.required, password]]
+ });
+ }
+
+ ngOnInit() {
+
//如果本地储存了账号密码信息，那就回显在输入框
let account = localStorage.getItem('account')
let password = localStorage.getItem('password')
@@ -47,14 +56,11 @@ export class LoginComponent implements OnInit {
errmsg: string = ''; //错误信息
-
-
//跳转注册页面
toRegister() {
this.router.navigate(['/register'])
}
-
//记住密码
rememberInfo() {
// 判断用户是否勾选记住密码，如果勾选，在本地储存中储存登录信息
@@ -70,9 +76,6 @@ export class LoginComponent implements OnInit {
}
}
-
-
-
remember: any//记住密码
autologin: any//自动登录
isLoading = false;
@@ -104,13 +107,14 @@ export class LoginComponent implements OnInit {
}).subscribe(
(data: any) => {
sessionStorage.setItem("token", data.result.accessToken);
- this.cookieService.set("token", data.result.accessToken, null, '/');
- this.cookieService.set("refreshToken", data.result.encryptedAccessToken, null, '/');
sessionStorage.setItem("encryptedAccessToken", data.result.encryptedAccessToken);
- console.log('token', data)
+ console.log('token', data.result)
this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => {
+ console.log('GetCurrentLoginInformations', data.result)
sessionStorage.setItem('userdata', JSON.stringify(data.result.user))
sessionStorage.setItem('userdataOfgasstation', JSON.stringify(data.result.user))
+ sessionStorage.setItem('isDefaultPassword', JSON.stringify(data.result.user.isDefaultPassword))
+ sessionStorage.setItem('isPasswordExpired', JSON.stringify(data.result.user.isPasswordExpired))
this.isLoading = false;
//记住密码
this.rememberInfo()
@@ -125,10 +129,12 @@ export class LoginComponent implements OnInit {
sessionStorage.setItem("isGasStation", 'true');
this.router.navigate(['/todaywarning/petrolStation'])
this.message.create('success', `登录成功`);
+
} else {
sessionStorage.setItem("isGasStation", 'false');
this.router.navigate(['/homepage'])
this.message.create('success', `登录成功`);
+
}
}
}, err => {
@@ -145,15 +151,31 @@ export class LoginComponent implements OnInit {
)
}
- roleList = [
- '管理员', '职工'
- ]
-
- selectedRole: string
- selecteRole(role) {
- this.selectedRole = role
- }
forget() {
this.message.create('warning', `请联系管理员`);
}
+
+
+
+}
+export type MyErrorsOptions = { 'zh-cn': string; en: string } & Record
+
-
-
+
- 查看
-
-
- 忽略
-
+
+ 您有一条新的预警提醒!
+ {{item.notification.data.properties.ViolationName}}
-
\ No newline at end of file
+
+
+
+
+
+
+ 查看
+
+
+ 忽略
+
+ 欢迎登录
加油站智能安全管理系统
- +
+
+
+
+
+
+
+
+
+
+
+ 证件编号:*
+
+
+
+
+
+
+
+
+
+
+
+
+ 证照有效期:*
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证照提醒时间:*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证照年检时间:*
+
+
+
+
![]()
-
-
+ 证照图片:
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
序号
-
+
油站名称
公司名称
-
+
区域
@@ -124,9 +124,9 @@
-
+