系统安全开发

src/app/components/configurationCenter/configuration-system-security/configuration-system-security.component.html

@@ -55,20 +55,20 @@
 								</div>
 
 								<!-- 是否限制单点登录ip -->
-								<div class="display_flex align-items_center mb8">
+						<!-- 		<div class="display_flex align-items_center mb8">
 								  <nz-form-label class="label">是否限制单点登录ip</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="astrictIp"></nz-checkbox-group>
-								</div>
+								</div> -->
 
                 <!-- 单点登录范围内IP -->
-                <div class="display_flex flex-wrap_wrap align-items_baseline mb8" *ngIf="astrictIp[0].checked">
+               <!-- <div class="display_flex flex-wrap_wrap align-items_baseline mb8" *ngIf="astrictIp[0].checked">
                   <nz-form-label class="label">单点登录范围内IP</nz-form-label>
 									<div *ngFor="let i of ipData let index = index;" class="ip-list" [ngClass]="{'margin-list':index!=0}">
 										<input class="width-300" type="text" nz-input [(ngModel)]="i.rangeIp"/> 
 										<i class="add-class" (click)="addIp()" nz-icon nzType="plus" nzTheme="outline"></i>
 										<i class="add-class" (click)="delIp(i, index)" nz-icon nzType="minus" nzTheme="outline"></i>
 									</div>
-								</div>
+								</div> -->
               </div>
               <div class="bottom">
                 <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

src/app/components/configurationCenter/configuration-system-security/configuration-system-security.component.ts

@@ -109,13 +109,13 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 			}
 		}
 	
-		if(this.astrictIp[0].checked){
-			let isEmpty = this.ipData.filter(i=>i.rangeIp=='')
-			if(isEmpty.length>0){
-				this.msg.error('ip不能为空')
-				return 
-			}
-		}
+		// if(this.astrictIp[0].checked){
+		// 	let isEmpty = this.ipData.filter(i=>i.rangeIp=='')
+		// 	if(isEmpty.length>0){
+		// 		this.msg.error('ip不能为空')
+		// 		return 
+		// 	}
+		// }
 		
 		let filterData = this.initConfig;
 		filterData.forEach((item) => {
@@ -142,20 +142,20 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 		  }else if (item.configKey === "incorrectNum") {
 				item.configValue = this.errorTime;
 		  }else if (item.configKey === "limitSingleLoginIp") {
-				let value = null
-				if(this.astrictIp[0].checked){
-					value = '1'
-				}else{
-					value = '0'
-				}
-				item.configValue = value;
+				// let value = null
+				// if(this.astrictIp[0].checked){
+				// 	value = '1'
+				// }else{
+				// 	value = '0'
+				// }
+				// item.configValue = value;
 		  }else if (item.configKey === "ipWhiteList") {
-				let str = JSON.parse(JSON.stringify(this.ipData))
-				let data = str.map(i=>{
-					return i.rangeIp
-				})
-				console.log(4444, data)
-				item.configValue = data.join(';');
+				// let str = JSON.parse(JSON.stringify(this.ipData))
+				// let data = str.map(i=>{
+				// 	return i.rangeIp
+				// })
+				// console.log(4444, data)
+				// item.configValue = data.join(';');
 		  }
 		});
 		const postData = filterData;
@@ -220,20 +220,20 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 									this.errorTime = c[1]
 									break;	
 								case "limitSingleLoginIp":
-									if(c[1]=='1'){
-										this.astrictIp[0].checked = true
-									}else{
-										this.astrictIp[0].checked = false
-									}
+									// if(c[1]=='1'){
+									// 	this.astrictIp[0].checked = true
+									// }else{
+									// 	this.astrictIp[0].checked = false
+									// }
 									break;
 								case "ipWhiteList":
-									let data = c[1].split(';')
-									this.ipData = []
-									for(let i=0; i<data.length; i++){
-										this.ipData.push({
-											rangeIp: data[i]
-										}) 
-									}
+									// let data = c[1].split(';')
+									// this.ipData = []
+									// for(let i=0; i<data.length; i++){
+									// 	this.ipData.push({
+									// 		rangeIp: data[i]
+									// 	}) 
+									// }
 									break;
 							}
 						});

src/app/views/login/login.component.ts

@@ -82,19 +82,19 @@ export class LoginComponent implements OnInit {
       (data) => {
         this.loading = false;
         this.msg.remove(loadingId);
-				if(data.status==200){
-					this.apiLogin(data.userId, data.pwd, "", "", true);
-				}else{
+				if(data.status==500){
 					this.msg.error(data.remarks, {
-					  nzDuration: 1000,
+					  nzDuration: 2000,
 					});
+				}else{
+					this.apiLogin(data.userId, data.pwd, "", "", true);
 				}
       },
       (err) => {
         this.loading = false;
         this.msg.remove(loadingId);
         this.msg.error("登录失败", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
         this.router.navigateByUrl("/login");
       }
@@ -271,17 +271,20 @@ export class LoginComponent implements OnInit {
 				this.errorTip = null;
       } else if(data.status == 501){
 				this.msg.error('验证码错误', {
-				  nzDuration: 1000,
+				  nzDuration: 2000,
 				});
 				this.errorTip = null;
       } else if(data.status == 506){
 				this.errorTip = data.tips
+				this.msg.error(data.remarks, {
+				  nzDuration: 2000,
+				});
 				this.resetCode()
       }else {
 				this.errorTip = null;
 				this.resetCode()
 				this.msg.error(data.remarks, {
-				  nzDuration: 1000,
+				  nzDuration: 2000,
 				});
 			}
     });
@@ -332,7 +335,7 @@ export class LoginComponent implements OnInit {
 		localStorage.setItem("specimenBatchNo",'')
 		if(this.paramsData.toPage1 && (this.paramsData.cardNO1 || this.paramsData.pathologyFormCode1)){
 			this.msg.success("登录成功！", {
-			  nzDuration: 1000,
+			  nzDuration: 2000,
 			});
 			successLoginMsg = false;
 			localStorage.setItem("user", JSON.stringify(data.user));
@@ -354,7 +357,7 @@ export class LoginComponent implements OnInit {
       // 护士角色跳护士端
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -366,7 +369,7 @@ export class LoginComponent implements OnInit {
       // 调度台
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -377,7 +380,7 @@ export class LoginComponent implements OnInit {
       // 标本间端
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -388,7 +391,7 @@ export class LoginComponent implements OnInit {
       // 门诊病理采样端
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -399,7 +402,7 @@ export class LoginComponent implements OnInit {
       // 病理交接本
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -410,7 +413,7 @@ export class LoginComponent implements OnInit {
       // 病理科端
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -421,7 +424,7 @@ export class LoginComponent implements OnInit {
       // web报修
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -432,7 +435,7 @@ export class LoginComponent implements OnInit {
       // 药房端2
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;
@@ -443,12 +446,12 @@ export class LoginComponent implements OnInit {
     // 有菜单可以进入系统主页面
     if (!canLogin) {
       this.msg.success("暂无权限进入系统！", {
-        nzDuration: 1000,
+        nzDuration: 2000,
       });
     } else {
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
-          nzDuration: 1000,
+          nzDuration: 2000,
         });
       }
       successLoginMsg = false;