diff --git a/src/app/pages/change-password/change-password.component.html b/src/app/pages/change-password/change-password.component.html index 941bb6c..d267f05 100644 --- a/src/app/pages/change-password/change-password.component.html +++ b/src/app/pages/change-password/change-password.component.html @@ -3,7 +3,7 @@ - + diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 2b1a6ed..2cd7b54 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -1,132 +1,133 @@
- -
-
- -
-
-
  • - 首页 -
    • -
  • - 数字油站 -
    • -
  • - 今日预警 -
    • -
  • - 预警记录 -
    • -
    -
    -
  • - 数字油站 -
    • -
  • - 今日预警 -
    • -
  • - 预警记录 -
    • -
    - +
    +
    + +
    +
    +
  • + 首页 +
    • +
  • + 数字油站 +
    • +
  • + 今日预警 +
    • +
  • + 预警记录 +
    • +
    +
    +
  • + 数字油站 +
    • +
  • + 今日预警 +
    • +
  • + 预警记录 +
    • +
    - -
    - - - - {{time}} - + +
    + + - | + + {{time}} + - {{surname}} - - - - -
      -
    • 基本信息
      • -
    • 器材信息
      • -
    • 修改密码
      • -
    • 系统管理
      • -
    • 退出系统
      • -
    -     - | - -
    + | + {{surname}} + + + + +
      +
    • 基本信息
      • +
    • 器材信息
      • +
    • 修改密码
      • +
    • 系统管理
      • +
    • 退出系统
      • +
    +     + | +
    -
    - -
    + +
    +
    + +
    -
    -
    - -
    -
    - 您有一条新的预警提醒! - {{item.notification.data.properties.ViolationName}} -
    +
    +
    + +
    +
    + 您有一条新的预警提醒! + {{item.notification.data.properties.ViolationName}} +
    +
    +
    +
    + 查看
    -
    -
    - 查看 -
    -
    - 忽略 -
    +
    + 忽略
    +
    - - - 修改初始密码 - + + + 修改初始密码 + - -
    - - - - - - - - - - - - - - - - - - - - - -
    -     + +
    + + + + + + + + + + + + + + + + + + + + + +
    +     - - - -     \ No newline at end of file + + + +     diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 5ffa7cc..02141b2 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -94,10 +94,10 @@ export class HomeComponent implements OnInit { } - if(sessionStorage.getItem('isDefaultPassword') == 'true'){ + if (sessionStorage.getItem('isDefaultPassword') == 'true' || sessionStorage.getItem('isPasswordExpired') == 'true') { this.changePasswordPopup() } - + } //初次登陆修改密码弹窗 @@ -113,6 +113,8 @@ export class HomeComponent implements OnInit { } 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 = { diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 0c116c0..a8685d7 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -114,6 +114,7 @@ export class LoginComponent implements OnInit { 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() diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts index f954c94..d4a2b56 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts @@ -662,6 +662,28 @@ export class OilUnloadingProcessListComponent implements OnInit { }); } look(item) { + + // console.log(item) + let arr = [] + let arr1 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '车辆进场' }); + let arr2 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '设置卸油隔离区' }); + let arr3 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油连接静电接地' }); + let arr4 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油设置消防器材' }); + let arr5 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '连接卸油管' }); + let arr6 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油中无人监卸' }); + let arr7 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '拆除卸油管' }); + let arr8 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '车辆离场' || item.nodeName == '车辆离厂' || item.nodeName == '车辆出厂' }); + // console.log(1, arr1) + // console.log(2, arr2) + // console.log(3, arr3) + // console.log(4, arr4) + // console.log(5, arr5) + // console.log(6, arr6) + // console.log(7, arr7) + // console.log(8, arr8) + arr = [arr1, arr2, arr3, arr4, arr5, arr6, arr7, arr8] + console.log('卸油流程', arr) + const modal = this.modal.create({ nzContent: OilUnloadingProcessComponent, nzViewContainerRef: this.viewContainerRef, @@ -674,7 +696,7 @@ export class OilUnloadingProcessListComponent implements OnInit { 'background': '#000D21', }, nzComponentParams: { - data: item + data: arr }, nzFooter: null, nzOnOk: async () => { diff --git a/src/app/pages/oil-unloading-process/oil-unloading-process.component.html b/src/app/pages/oil-unloading-process/oil-unloading-process.component.html index 14dc51f..4954387 100644 --- a/src/app/pages/oil-unloading-process/oil-unloading-process.component.html +++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.html @@ -14,28 +14,28 @@
    - {{data.oilUnloadingNodes[0].violateTime - ? (data.oilUnloadingNodes[0].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[0].violateTime + ? (data[0].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    油罐车进场
    - {{data.oilUnloadingNodes[3].violateTime - ? (data.oilUnloadingNodes[3].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[1].violateTime + ? (data[1].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    设置隔离区域 @@ -55,28 +55,28 @@
    -->
    - {{data.oilUnloadingNodes[6].violateTime - ? (data.oilUnloadingNodes[6].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[2].violateTime + ? (data[2].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    连接静电接地
    - {{data.oilUnloadingNodes[5].violateTime - ? (data.oilUnloadingNodes[5].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[3].violateTime + ? (data[3].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    放置消防器材 @@ -141,45 +141,45 @@ 开始卸油
    -->
    - {{data.oilUnloadingNodes[8].violateTime ? - (data.oilUnloadingNodes[8].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[4].violateTime ? + (data[4].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    连接卸油管
    - {{data.oilUnloadingNodes[10].violateTime ? - (data.oilUnloadingNodes[10].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[5].violateTime ? + (data[5].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    全程监卸
    - {{data.oilUnloadingNodes[11].violateTime ? - (data.oilUnloadingNodes[11].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[6].violateTime ? + (data[6].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    拆除卸油管 @@ -187,15 +187,15 @@
    {{data.oilUnloadingNodes[13].violateTime ? - (data.oilUnloadingNodes[13].violateTime | date:"MM-dd HH:mm:ss") : '/'}} -
    - {{data[7].violateTime ? + (data[7].violateTime | date:"MM-dd HH:mm:ss") : '/'}} +
    + -
    油罐车离场 diff --git a/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts b/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts index d82ac15..57b3fb9 100644 --- a/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts +++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts @@ -11,7 +11,7 @@ export class OilUnloadingProcessComponent implements OnInit { constructor(private message: NzMessageService) { } ngOnInit(): void { - console.log(this.data) + // console.log(this.data) } lookImg(url) { if (url) { @@ -32,8 +32,10 @@ export class OilUnloadingProcessComponent implements OnInit { }); node.click(); }, 0); - }else{ + } else { this.message.create('warning', `该节点没有图片`); } } + + }