拉取代码

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.html

@@ -121,7 +121,7 @@
 						
 						<div class="mar-10" *ngIf="item.value2 == 'alarm' && item.key=='itsmAlarmDefaultCategory' && alarmAutoSwitch">
 							<span>{{ item.desc }}：</span>
-							<nz-select class="w220px" nzShowSearch nzAllowClear [nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value" (nzOnSearch)="changeCommonInp('category', $event)">
+							<nz-select class="w350px" nzShowSearch nzAllowClear [nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value" (nzOnSearch)="changeCommonInp('category', $event)">
 							  <ng-container *ngFor="let option of malfunctionData">
 							    <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
 							  </ng-container>
@@ -133,7 +133,7 @@
 						
 						<div class="mar-10" *ngIf="item.value2 == 'alarm' && item.key=='itsmAlarmUrgentRange' && alarmAutoSwitch">
 							<span>{{ item.desc }}：</span>
-							<nz-select class="w220px" nzShowSearch nzAllowClear nzMode="multiple"
+							<nz-select class="w350px" nzShowSearch nzAllowClear nzMode="multiple"
 								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
 							  <ng-container *ngFor="let option of alarmData">
 							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.less

@@ -8,6 +8,9 @@
 	.w220px{
 		width: 220px;
 	}
+	.w350px{
+		width: 350px;
+	}
 	.w100px{
 			width: 100px !important;
 		}

src/app/views/emergency-info/emergency-info.component.html

@@ -93,7 +93,7 @@
             <td>{{ data.alarmId || '-' }}</td>
             <td>{{ data.alarmSource || '-' }}</td>
             <td>{{ data.alarmContent || '-' }}</td>
-            <td>{{ data.alarmStatus?.name }}</td>
+            <td [ngClass]="{'red': data.alarmStatus?.value == 1, 'yellow ': data.alarmStatus?.value == 2, 'green ': data.alarmStatus?.value == 4}">{{ data.alarmStatus?.name }}</td>
 						<td>{{ data.alarmIp || '-' }}</td>
 						<td>{{ data.alarmUrgency?.name }}</td>
 						<td>{{ data.alarmActiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
@@ -101,7 +101,7 @@
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.view" (click)="look(data)">查看</span>
-                <span *ngIf="coopBtns.send && (data.alarmStatus.value == 1 || data.alarmStatus.value == 3)" (click)="send(data)">消息发送</span>
+                <span *ngIf="coopBtns.send && data.alarmStatus.value == 1" (click)="send(data)">消息发送</span>
 								<span *ngIf="coopBtns.add && (data.alarmStatus.value == 1 || data.alarmStatus.value == 3)" (click)="addOrder(data)">建单</span>
               </div>
             </td>

src/app/views/emergency-info/emergency-info.component.less

@@ -6,6 +6,19 @@
 	cursor: pointer;
 	text-decoration: underline;
 }
+
+.red{
+	color: red !important;
+}
+
+.yellow{
+	color: #ffaa00 !important;
+}
+
+.green{
+	color: #49b586 !important;
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/emergency-info/emergency-info.component.ts

@@ -276,6 +276,7 @@ export class EmergencyInfoComponent implements OnInit {
         this.btnLoading = false;
         this.hideModal();
         this.initForm();
+				this.operateType = 'no'
         if (data.status == 200) {
           this.showPromptModal(this.add ? "新增" : "编辑", true, "");
         } else {
@@ -295,6 +296,7 @@ export class EmergencyInfoComponent implements OnInit {
         this.btnLoading = false;
         this.hideModal();
         this.initForm();
+				this.operateType = 'no'
         if (data.status == 200) {
           this.showPromptModal(this.add ? "新增" : "编辑", true, "");
         } else {
@@ -340,6 +342,7 @@ export class EmergencyInfoComponent implements OnInit {
 	  .subscribe((data) => {
 	    this.btnLoading = false;
 	    this.hideOptModal();
+			this.operateType = 'no'
 	    if (data.status == 200) {
 	      this.showPromptModal("操作", true, "");
 	    } else {
@@ -366,6 +369,7 @@ export class EmergencyInfoComponent implements OnInit {
 	}
 	
 	// 确定发送消息
+	operateType:any;
 	confirmSend(){
 		let data = {
 			alarm:{
@@ -380,6 +384,7 @@ export class EmergencyInfoComponent implements OnInit {
 		    this.btnLoading = false;
 				this.sendModal = false;
 		    if (data.status == 200) {
+					this.operateType = 'send'
 		      this.showPromptModal("操作", true, "");
 		    } else {
 		      this.showPromptModal("操作", false, data.msg);
@@ -496,7 +501,11 @@ export class EmergencyInfoComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    this.getList(true);
+		if(this.operateType = 'send'){
+			this.getList();
+		}else{
+			this.getList(true);
+		}
   }
 
   // 边输边搜节流阀

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

@@ -3601,7 +3601,8 @@ export class FuwutaiComponent implements OnInit {
       idx: 0,
       sum: 20,
       user: {
-        hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
+				statisticalHosId: this.isRelatedDepartment ? undefined :  this.incidentModel.hosId,
+        // hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
         dept: this.isRelatedDepartment ? { id: this.incidentModel.department } : undefined,
         name: keyWord,
 				// phone: this.incidentModel.incomingPhone || undefined

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

@@ -1261,7 +1261,8 @@ export class MainComponent implements OnInit, OnDestroy {
 	    idx: 0,
 	    sum: 20,
 	    user: {
-	      hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
+				statisticalHosId: this.isRelatedDepartment ? undefined :  this.incidentModel.hosId,
+	      // hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
 	      dept: this.isRelatedDepartment ? { id: this.incidentModel.department } : undefined,
 	      name: keyWord,
 	      // simpleQuery: true,

src/app/views/work-log/work-log.component.ts

@@ -92,6 +92,7 @@ export class WorkLogComponent implements OnInit {
 	
 	// 获取操作人
 	operationUser:any;
+	allWorker:any = [];
 	getAllWorker(e?, those?) {
 	  let that = those || this;
 	  let postData = {