暂提

src/app/views/hushijiandan/hushijiandan.component.html

@@ -177,26 +177,26 @@
         <div
           class="app-header borderB display_flex justify-content_space-between align-items_center"
         >
-          <div
-            class="nurseTitle display_flex justify-content_space-between align-items_center"
-          >
+          <div class="nurseTitle display_flex justify-content_space-between align-items_center">
             <div class="todayNumWrap">护士端<span class="todayNum">当日建单数：{{ todayNum }}</span></div>
             <div class="updateTipsForNurses red">{{ updateTipsForNurses }}</div>
             <div class="queuingInformation" *ngIf="!updateTipsForNurses && inspectAndPatientTransportConfig.queuingInformation == 1">等待陪检：<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中：<span class="red">{{queuingInformationList[1]}}</span></div>
             <div class="nurseCode" (click)="showNurseCode()">
-              <i class="nurseCodeIcon icon_transport transport-erweima"></i
-              >二维码
+              <i class="nurseCodeIcon icon_transport transport-erweima"></i>二维码
             </div>
           </div>
-          <div class="userInfo">
-            <div class="wel">欢迎您<strong>{{tool.getCurrentUserInfo().name}}</strong>：</div>
-            <div class="user">
-              <img src="../../assets/images/icon_keshi.png" alt="" />
-              <span *ngIf="deptDisplay" [title]="deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}</span>
-            </div>
-            <div class="userInfo-wrap">
-              <div class="logOut" (click)="changeKsNow()">切换科室</div>
-              <div class="logOut" (click)="logOut()">退出</div>
+          <div class="right">
+            <div class="userInfo dropdown">
+              <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+                <img src="../../assets/images/icon_keshi.png" alt="">
+                <span><ng-container *ngIf="loginUser.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}-</ng-container>{{loginUser.name}}</span>
+                <i class="icon_transport transport-xiala1 ml8"></i>
+              </div>
+              <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+                <div class="dropdownItem" (click)="changeKsNow()">切换科室</div>
+                <div class="dropdownItem" (click)="showUpPwd()">修改密码</div>
+                <div class="dropdownItem" (click)="logOut()">退出</div>
+              </div>
             </div>
           </div>
         </div>
@@ -3511,4 +3511,41 @@
 </div>
 <div class="mask-style" *ngIf="isSpinning">
 	<nz-spin nzSimple class="spin-style"></nz-spin>
-</div>
+</div>
+
+<!-- 修改密码 -->
+<nz-modal [(nzVisible)]="isPwdVisible" nzTitle="修改密码" (nzOnCancel)="pwdHandleCancel()" (nzOnOk)="pwdHandleOk()" [nzOkLoading]="pwdIsOkLoading" (nzAfterOpen)="pwdAfterOpen()">
+  <div>
+    <label>
+      原始密码:
+      <nz-input-group [nzSuffix]="suffixTemplate">
+        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="原始密码" [(ngModel)]="upModalData.pwdOld" />
+      </nz-input-group>
+      <ng-template #suffixTemplate>
+        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
+      </ng-template>
+    </label>
+    <label>新密码:
+      <div style="display: flex;">
+        <nz-input-group [nzSuffix]="suffixTemplate">
+          <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="新密码" [(ngModel)]="upModalData.newPwd" (ngModelChange)="blurNewPwd()" />
+        </nz-input-group>
+        <ng-template #suffixTemplate>
+          <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
+        </ng-template>
+        <div class="red" style="display: flex;justify-content: center;align-items: center;padding-left: 5px;" *ngIf="enoughRegFlag">弱</div>
+        <div style="display: flex;justify-content: center;align-items: center;padding-left: 5px;" *ngIf="mediumRegFlag">中</div>
+        <div class="green" style="display: flex;justify-content: center;align-items: center;padding-left: 5px;" *ngIf="strongRegFlag">强</div>
+      </div>
+    </label>
+    <div class="red">强密码需包含大小写字母、数字、特殊字符，长度至少9个字符</div>
+    <label>确认新密码:
+      <nz-input-group [nzSuffix]="suffixTemplate">
+        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="确认新密码" [(ngModel)]="upModalData.newPwd2" />
+      </nz-input-group>
+      <ng-template #suffixTemplate>
+        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
+      </ng-template>
+    </label>
+  </div>
+</nz-modal>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -1184,50 +1184,73 @@
           }
         }
 
-        .userInfo {
-          width: 336px;
+        .right {
           height: 100%;
-          float: right;
-          padding: 8px;
-          box-sizing: border-box;
-          font-size: 14px;
-          border-left: 1px solid @hs_border_color;
-
-          .wel {
-            line-height: 15px;
-          }
+          flex-shrink: 0;
+          display: flex;
+          align-items: center;
 
-          .user {
-            font-size: 20px;
-            height: 36px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            line-height: normal;
+          .msg {
+            float: left;
+            width: 50px;
+            height: 100%;
+            border-left: 1px solid #e5e9ed;
 
-            img {
+            .msgBtn {
+              width: 100%;
               height: 100%;
-              margin-right: 8px;
+
+              i {
+                font-size: 30px;
+              }
             }
+          }
 
-            span {
+          .userInfo {
+            height: 100%;
+            float: right;
+            padding: 0 24px;
+            box-sizing: border-box;
+            font-size: 14px;
+            border-left: 1px solid #e5e9ed;
+
+            .wel {
+              line-height: 15px;
               white-space: nowrap;
               overflow: hidden;//文本超出隐藏
               text-overflow: ellipsis;//文本超出省略号替代
             }
-          }
 
-          .userInfo-wrap {
-            display: flex;
-            justify-content: flex-end;
+            .user {
+              overflow: hidden;
+              height: 48px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              font-size: 16px;
+              cursor: pointer;
+
+              img {
+                width: 32px;
+                height: 32px;
+                margin-right: 8px;
+              }
+
+              span, .transport-xiala1 {
+                height: 48px;
+                line-height: 48px;
+              }
+            }
 
             .logOut {
-              display: inline-block;
               text-align: right;
               color: @primary-color;
               line-height: 20px;
-              cursor: pointer;
-              margin-right: 8px;
+
+              span {
+                cursor: pointer;
+                padding: 10px;
+              }
             }
           }
         }
@@ -1656,7 +1679,7 @@
             border-bottom: 1px solid @hs_border_color;
             padding: 8px;
             position: relative;
-            z-index: 9;
+            // z-index: 9;
             background: #fff;
 
             & > span {
@@ -2430,3 +2453,40 @@
 .spin-style{
 	z-index:9999;
 }
+
+// 下拉列表
+.dropdown{
+  position: relative;
+  height: 48px;
+  line-height: 48px;
+  .dropdown-content {
+    position: absolute;
+    top: 48px;
+    background-color: #fff;
+    width: 156px;
+    box-shadow: 0px 2px 4px 1px #D9D9D9;
+    z-index: 999999;
+    border-radius: 4px;
+    border: 1px solid rgba(0,0,0,0.15);
+    color: rgba(0,0,0,0.65);
+    &.ct{
+      left: 50%;
+      transform: translateX(-50%);
+    }
+    &.r8{
+      right: 8px;
+    }
+  }
+
+  .dropdown-content .dropdownItem {
+    height: 40px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+  }
+
+  .dropdown-content .dropdownItem:hover {
+    background-color: #e9f7e9;
+  }
+}

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -149,6 +149,8 @@ export class HushijiandanComponent implements OnInit {
       },
     };
   }
+  // 下拉
+  showDropdown:boolean = false;
   // 关闭倒计时
   closeTime = 3;
   closeTimeFlag;
@@ -329,8 +331,8 @@ export class HushijiandanComponent implements OnInit {
 						this.pathologyModal = true
 						return
 					}
-					if(data.list[0].status && 
-					(data.list[0].status.value==1 || data.list[0].status.value==2 || 
+					if(data.list[0].status &&
+					(data.list[0].status.value==1 || data.list[0].status.value==2 ||
 					data.list[0].status.value==3 || data.list[0].status.value==4)){
 						this.pathologyModal = true
 					}else{
@@ -380,8 +382,8 @@ export class HushijiandanComponent implements OnInit {
 					this.pathologyModal = true
 					return
 				}
-				if(data.list[0].status && 
-				(data.list[0].status.value==1 || data.list[0].status.value==2 || 
+				if(data.list[0].status &&
+				(data.list[0].status.value==1 || data.list[0].status.value==2 ||
 					data.list[0].status.value==3 || data.list[0].status.value==4)){
 					this.pathologyModal = true
 				}else{
@@ -404,7 +406,7 @@ export class HushijiandanComponent implements OnInit {
 			}
 		});
 	}
-	
+
 	// 申请单号点击
 	itemClick(item){
 		this.detailId = item.id
@@ -414,7 +416,7 @@ export class HushijiandanComponent implements OnInit {
 				this.pathologyModal = true
 				return
 			}
-			if(item.status && (item.status.value==1 || item.status.value==2 || 
+			if(item.status && (item.status.value==1 || item.status.value==2 ||
 				item.status.value==3 || item.status.value==4)){
 				this.pathologyModal = true
 			}else{
@@ -422,11 +424,11 @@ export class HushijiandanComponent implements OnInit {
 			}
 		},200)
 	}
-	
+
 	hideModal(){
 		this.multiDialog = false
 	}
-	
+
 	pathologyDetailCancel(){
 		this.pathologyDetailModal = false
 	}
@@ -4575,7 +4577,7 @@ export class HushijiandanComponent implements OnInit {
     this.isShowNurseCode = true;
 		this.getConfig()
   }
-	
+
 	// 获取配置
 	iskeySwitch:any = false;
 	getConfig() {
@@ -4616,7 +4618,7 @@ export class HushijiandanComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
 	// 获取动态密钥
 	numberKey:any;
 	getSecretKey(){
@@ -4636,7 +4638,7 @@ export class HushijiandanComponent implements OnInit {
       }
     });
 	}
-	
+
   // 右侧菜单
   showLastItems: boolean = false;
   // 下拉
@@ -4701,4 +4703,79 @@ export class HushijiandanComponent implements OnInit {
   printCode(item){
     console.log(item)
   }
+
+  // 修改密码
+  passwordVisible = false;
+  password?: string;
+
+  isPwdVisible = false;
+  pwdIsOkLoading = false;
+  upModalData = {
+    userid: "",
+    pwdOld: "",
+    newPwd: "",
+    newPwd2: "",
+  };
+  upPwd(): void {
+    if(this.upModalData.pwdOld.trim() === ''){
+      this.message.error('请填写原始密码！', {
+        nzDuration: 5000,
+      });
+      return;
+    }
+    if(!this.strongRegFlag){
+      this.message.error('新密码不符合要求！', {
+        nzDuration: 5000,
+      });
+      return;
+    }
+    if(this.upModalData.newPwd !== this.upModalData.newPwd2){
+      this.message.error('新密码与确认新密码不一致！', {
+        nzDuration: 5000,
+      });
+      return;
+    }
+
+    this.pwdIsOkLoading = true;
+    let userid = JSON.parse(localStorage.getItem("user")).user.id;
+    this.upModalData.userid = userid;
+    this.mainService.upPwd(this.upModalData).subscribe((data) => {
+      if (data.status == 200) {
+        this.isPwdVisible = false;
+        this.pwdIsOkLoading = false;
+        this.message.success("修改成功！", {
+          nzDuration: 5000,
+        });
+      } else {
+        this.pwdIsOkLoading = false;
+        this.message.error(data.error, {
+          nzDuration: 5000,
+        });
+      }
+    });
+  }
+  showUpPwd(): void {
+    this.isPwdVisible = true;
+  }
+
+  pwdHandleOk(): void {
+    this.upPwd();
+  }
+
+  pwdHandleCancel(): void {
+    this.isPwdVisible = false;
+  }
+
+  // 新密码失去焦点
+  enoughRegFlag = true; //弱
+  mediumRegFlag = false; //中
+  strongRegFlag = false; //强
+  blurNewPwd(){
+    let enoughReg = /^.{0,6}$/;//密码强度-弱
+    let strongReg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\!\@\#\$\%\^\&\*]).{9,}$/;//密码强度-强
+    this.enoughRegFlag = enoughReg.test(this.upModalData.newPwd);
+    this.strongRegFlag = strongReg.test(this.upModalData.newPwd);
+    this.mediumRegFlag = !this.enoughRegFlag && !this.strongRegFlag;
+    console.log(this.enoughRegFlag,this.mediumRegFlag,this.strongRegFlag);
+  }
 }