拉取代码

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

@@ -41,6 +41,12 @@
 									<nz-input-number [(ngModel)]="validity" [nzMin]="0" [nzMax]="99999" [nzStep]="1"></nz-input-number>&nbsp;&nbsp;分钟 
 								</div>
 								
+								<!-- 验证码干扰线数量 -->
+								<div class="display_flex align-items_center mb8" *ngIf="verificationCode[0].checked">
+									<nz-form-label class="label">验证码干扰线数量</nz-form-label>
+									<nz-input-number [(ngModel)]="verificationCodeNoiseLines" [nzMin]="1" [nzMax]="50" [nzStep]="1"></nz-input-number>
+								</div>
+								
                 <!-- 是否限制账户错误登录次数 -->
                 <div class="display_flex align-items_center mb8">
                   <nz-form-label class="label">是否限制账户错误登录次数</nz-form-label>

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

@@ -32,6 +32,7 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 	validity:any; //验证码有效期
   isErrorTime:any = [{ label:'是否开启', value: 0 }];//是否限制账户错误登录次数
   errorTime:any;//支持错误次数
+	verificationCodeNoiseLines:any;//验证码干扰线数量
   astrictIp:any = [{ label:'是否开启', value: 1 }];//终点科室支持核对
   drugsEndCheckScanIds:any = [];//是否限制单点登录ip
   rangeIp:any;//单点登录范围内IP
@@ -100,6 +101,10 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 				this.msg.error('验证码有效期不能为空')
 				return 
 			}
+			if(!this.verificationCodeNoiseLines){
+				this.msg.error('验证码干扰线数量不能为空')
+				return 
+			}
 		}
 		
 		if(this.isErrorTime[0].checked){
@@ -108,7 +113,7 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 				return 
 			}
 		}
-	
+		
 		// if(this.astrictIp[0].checked){
 		// 	let isEmpty = this.ipData.filter(i=>i.rangeIp=='')
 		// 	if(isEmpty.length>0){
@@ -131,6 +136,8 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 			  item.configValue = this.digit;
 			}else if (item.configKey === "verificationCodeDuration") {
 		    item.configValue = this.validity;
+		  }else if (item.configKey === "verificationCodeNoiseLines") {
+		    item.configValue = this.verificationCodeNoiseLines;
 		  }else if (item.configKey === "limitIncorrectLogin") {
 		    let value = null
 		    if(this.isErrorTime[0].checked){
@@ -209,6 +216,9 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 								case "verificationCodeDuration":
 									this.validity = c[1]
 									break;
+								case "verificationCodeNoiseLines":
+									this.verificationCodeNoiseLines = c[1]
+									break;
 								case "limitIncorrectLogin":
 									if(c[1]=='1'){
 										this.isErrorTime[0].checked = true

src/app/views/fuwutai/fuwutai.component.html

@@ -1,5 +1,5 @@
 <div class="fuwutai">
-  <div class="top" id="top" *ngIf="hurseInfoHiding != 1">
+  <div class="top" id="top" *ngIf="hurseInfoHiding != 1 && hsmsData.hsmsSwitch==1">
     <!-- 头部Tab -->
     <div class="tabBox">
       <div class="tab" #tabs>

src/app/views/fuwutai/fuwutai.component.ts

@@ -3680,7 +3680,6 @@ export class FuwutaiComponent implements OnInit {
           hosId: this.incidentModel.hosId,
         },
       };
-      console.log(postData);
       // return;
       this.isLoading = true;
       this.mainService
@@ -3718,12 +3717,15 @@ export class FuwutaiComponent implements OnInit {
 							orders.push(this.malPriorityDTO.orders)
 							id.push(this.malPriorityDTO.id)
 						}
-						let minNumber = Math.min(...orders)
-						let index = orders.indexOf(minNumber)
-						console.log('最小值的orders', minNumber)
-						setTimeout(_=>{
-							this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
-						})
+						if(orders.length>0){
+							let minNumber = Math.min(...orders)
+							let index = orders.indexOf(minNumber)
+							console.log('最小值的orders', orders, minNumber)
+							setTimeout(_=>{
+								this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
+							})
+						}
+
             // 根据院区和故障现象带出责任部门，优先级，维修人/组
             this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
             // this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
@@ -6685,7 +6687,6 @@ export class FuwutaiComponent implements OnInit {
     this.editOrder = cloneDeep(data);
     let incidentModel = cloneDeep(data);
     let incidentMsg:any = {};
-		
     // incidentModel.department && (this.applicationDeptList = [cloneDeep(incidentModel.department)]);
     incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
     incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
@@ -6705,6 +6706,7 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.category && (incidentModel.category = incidentModel.category.id);
     this.incidentModel = incidentModel;
     this.incidentMsg = incidentMsg;
+		// this.incidentModel.department && this.changeApply(this.incidentModel.department.id);
     this.incidentModel.category && this.changeApplyCategory(this.incidentModel.category, true);
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)

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

@@ -2426,7 +2426,7 @@
             </nz-select>
           </nz-form-control>
         
-          <nz-form-label nzFor="contactsInformation">故障现象</nz-form-label>
+    <!--      <nz-form-label nzFor="contactsInformation">故障现象</nz-form-label>
           <nz-form-control style="display: inline-block;">
             <nz-select style="width:185px;" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="category" (ngModelChange)="changeApplyCategory($event)">
             	<ng-container *ngFor="let option of applicationCategoryList">
@@ -2436,7 +2436,7 @@
             		<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
             	</nz-option>
             </nz-select>
-          </nz-form-control>
+          </nz-form-control> -->
         </nz-form-item>
 				
 				<nz-form-item>

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

@@ -1635,20 +1635,20 @@ export class HushijiandanComponent implements OnInit {
       contacts: [this.loginUser.name, [Validators.required]],
       contactsInformation: [this.loginUser.phone, [Validators.required]],
 			assetId: [null, []],
-			category: [null, []],
+			// category: [null, []],
     });
 		if(this.cmdbRepair){
 			this.validateBxForm.addControl(
 				'assetId',
 				new FormControl(null, [])
 			);
-			this.validateBxForm.addControl(
-				'category',
-				new FormControl(null, [])
-			);
+			// this.validateBxForm.addControl(
+			// 	'category',
+			// 	new FormControl(null, [])
+			// );
 		}else{
 			this.validateBxForm.removeControl('assetId');
-			this.validateBxForm.removeControl('category');
+			// this.validateBxForm.removeControl('category');
 		}
     this.getDeptById(this.currentDept.id);
   }
@@ -1829,12 +1829,12 @@ export class HushijiandanComponent implements OnInit {
               acceptUser: this.loginUser,
               deleteFlag: 0,
 							assetId: this.validateBxForm.value.assetId || undefined,
-							category: this.validateBxForm.value.category ? { id: this.validateBxForm.value.category } : undefined,
+							// category: this.validateBxForm.value.category ? { id: this.validateBxForm.value.category } : undefined,
             },
           };
-          if (this.coopBx.category) {
-            postData.incident.category = this.coopBx.categoryDTO;
-          }
+          // if (this.coopBx.category) {
+          //   postData.incident.category = this.coopBx.categoryDTO;
+          // }
           this.mainService.flowPost("incident/task/request", postData).subscribe((res) => {
             this.btnLoading = false;
             this.cancenlLoading = false;

src/app/views/main/main.component.ts

@@ -4002,7 +4002,7 @@ export class MainComponent implements OnInit, OnDestroy {
 		  idx: 0,
 		  sum: 20,
 		  asset: {
-		    hosId: this.hospitalModel!=1 ? this.incidentModel.hosId : this.currentHospital.id,
+		    downHosId: this.hospitalModel!=1 ? this.incidentModel.hosId : this.currentHospital.id,
 		    name: name
 		  },
 		};