Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/views/main/main.component.html

@@ -47,9 +47,9 @@
             <div class="dropdown-content ct" [hidden]="!showDropdown1" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false">
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</div>
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy2()">药房端2</div>
-              <div class="dropdownItem" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</div>
+              <div class="dropdownItem" *ngIf="largeScreenRole" (click)="queryRangeClick('largeScreen')">综合大屏</div>
               <div class="dropdownItem" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">运送陪检大屏</div>
-              <div class="dropdownItem" *ngIf="largeScreenRole3" (click)="queryRangeClick()">运维大屏</div>
+              <div class="dropdownItem" *ngIf="largeScreenRole3" (click)="queryRangeClick('largeScreen3')">运维大屏</div>
               <div class="dropdownItem" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')">业务视图</div>
               <div class="dropdownItem" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</div>
               <div class="dropdownItem" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</div>

src/app/views/main/main.component.less

@@ -178,7 +178,7 @@ nz-sider {
 
   .title {
     color: @primary-color;
-    font-size: 16px;
+    font-size: 15px;
   }
 }
 
@@ -837,7 +837,7 @@ nz-header.ant-layout-header {
       }
     }
   }
-	
+
 	.required{
 	  position: relative;
 	  padding-left: 12px;
@@ -853,7 +853,7 @@ nz-header.ant-layout-header {
 	    transform: translateY(-50%);
 	  }
 	}
-	
+
 	/* 未分派 */
 	.weifenpai .list {
 	  // height: 100px;
@@ -862,7 +862,7 @@ nz-header.ant-layout-header {
 	  // overflow: hidden;
 	  display: flex;
 	}
-	
+
 	// 转出院记录
 	.patientLog .list {
 	  height: auto !important;
@@ -871,7 +871,7 @@ nz-header.ant-layout-header {
 	    text-align: center !important;
 	  }
 	}
-	
+
 	/* 左边 */
 	.left_cots {
 	  // height: 100px;
@@ -882,7 +882,7 @@ nz-header.ant-layout-header {
 	  cursor: pointer;
 	  position: relative;
 	}
-	
+
 	/* 急标 */
 	.left_cots .ji {
 	  position: absolute;
@@ -890,14 +890,14 @@ nz-header.ant-layout-header {
 	  top: -3px;
 	  width: 30px;
 	}
-	
+
 	/* 右边 */
 	.right_bots {
 	  width: 20%;
 	  border-left: 1px #e1e5e8 solid;
 	  padding: 8px 0;
 	}
-	
+
 	/* 上按钮 */
 	.right_bots .top_bot {
 	  width: 70%;
@@ -909,7 +909,7 @@ nz-header.ant-layout-header {
 	  height: 27px;
 	  margin-bottom: 8px;
 	}
-	
+
 	.slider {
 	  position: absolute;
 	  // top: 98px;
@@ -917,11 +917,11 @@ nz-header.ant-layout-header {
 	  right: 0;
 	  width: 100%;
 	  height: 2px;
-	
+
 	  &.sgreen {
 	    background: rgb(86, 186, 182);
 	  }
-	
+
 	  &.syellow {
 	    background: rgb(245, 166, 35);
 	  }
@@ -929,7 +929,7 @@ nz-header.ant-layout-header {
 	    background: #d81e06;
 	  }
 	}
-	
+
 	/* 中按钮 */
 	.right_bots .mid_bot {
 	  width: 70%;
@@ -940,7 +940,7 @@ nz-header.ant-layout-header {
 	  cursor: pointer;
 	  height: 27px;
 	}
-	
+
 	/* 下按钮 */
 	.right_bots .btm_bot {
 	  width: 70%;
@@ -951,7 +951,7 @@ nz-header.ant-layout-header {
 	  cursor: pointer;
 	  height: 27px;
 	}
-	
+
 	/* 工单 */
 	.weifenpai .left_cots .gongdan {
 	  height: 24px;
@@ -959,7 +959,7 @@ nz-header.ant-layout-header {
 	  line-height: 24px;
 	  text-align: center;
 	}
-	
+
 	.weifenpai .left_cots .gongdan .left {
 	  float: left;
 	  color: #333;
@@ -971,25 +971,25 @@ nz-header.ant-layout-header {
 	  text-overflow: ellipsis !important;
 	  white-space: nowrap !important;
 	}
-	
+
 	.weifenpai .left_cots .gongdan .right {
 	  float: right;
 	  color: #666666;
-	
+
 	  &.colorRed {
 	    color: red;
 	  }
 	}
-	
+
 	.weifenpai .left_cots .gongdan .right span:nth-child(1) {
 	  float: right;
 	  font-size: 12px;
-	
+
 	  &.colorRed {
 	    color: red;
 	  }
 	}
-	
+
 	.weifenpai .left_cots .gongdan .right span:nth-child(2) {
 	  float: right;
 	  border-radius: 50%;
@@ -999,7 +999,7 @@ nz-header.ant-layout-header {
 	  margin-top: 7px;
 	  margin-right: 8px;
 	}
-	
+
 	/* 地点 */
 	.weifenpai .didian {
 	  height: 24px;
@@ -1007,7 +1007,7 @@ nz-header.ant-layout-header {
 	  margin: 4px 0;
 	  display: flex;
 	}
-	
+
 	.weifenpai .didian .left {
 	  float: left;
 	  color: #666666;
@@ -1023,7 +1023,7 @@ nz-header.ant-layout-header {
 	    word-break: break-all;
 	  }
 	}
-	
+
 	.weifenpai .didian .right {
 	  float: right;
 	  flex: 1;
@@ -1032,47 +1032,47 @@ nz-header.ant-layout-header {
 	  text-overflow: ellipsis;//文本超出省略号替代
 	  text-align: right;
 	}
-	
+
 	.weifenpai .didian .right i {
 	  font-size: 12px;
 	  color: @primary-color;
 	}
-	
+
 	.weifenpai .didian .right span {
 	  font-size: 12px;
 	}
-	
+
 	/* 时间 */
 	.weifenpai .shijian {
 	  height: 24px;
 	  line-height: 24px;
 	  margin: 4px 0;
 	}
-	
+
 	.weifenpai .shijian .left {
 	  float: left;
 	}
-	
+
 	.weifenpai .shijian .right {
 	  float: right;
 	  font-size: 12px;
 	  color: #999999;
 	}
-	
+
 	.weifenpai .shijian .left i {
 	  color: @primary-color;
 	  font-size: 14px;
-	
+
 	  &.colorRed {
 	    color: red;
 	  }
 	}
-	
+
 	.weifenpai .shijian .left span {
 	  font-size: 12px;
 	  color: #666666;
 	}
-	
+
 	/* 待到达 */
 	.daidaoda .list {
 	  // height: 100px;
@@ -1081,7 +1081,7 @@ nz-header.ant-layout-header {
 	  position: relative;
 	  display: flex;
 	}
-	
+
 	/* 左边 */
 	.daidaoda .left_cots {
 	  // height: 100px;
@@ -1092,7 +1092,7 @@ nz-header.ant-layout-header {
 	  cursor: pointer;
 	  position: relative;
 	}
-	
+
 	/* 急标 */
 	.daidaoda .left_cots .ji {
 	  position: absolute;
@@ -1100,7 +1100,7 @@ nz-header.ant-layout-header {
 	  top: -3px;
 	  width: 30px;
 	}
-	
+
 	/* 急标 */
 	.daidaoda .list .ji {
 	  position: absolute;
@@ -1108,7 +1108,7 @@ nz-header.ant-layout-header {
 	  top: -3px;
 	  width: 30px;
 	}
-	
+
 	/* 工单 */
 	.daidaoda .gongdan {
 	  height: 24px;
@@ -1116,22 +1116,22 @@ nz-header.ant-layout-header {
 	  line-height: 24px;
 	  text-align: center;
 	}
-	
+
 	.daidaoda .gongdan .left {
 	  float: left;
 	  color: #333;
 	  font-size: 14px;
 	}
-	
+
 	.daidaoda .gongdan .right {
 	  float: right;
 	  color: #666666;
-	
+
 	  &.colorRed {
 	    color: red;
 	  }
 	}
-	
+
 	.cots_body .loading {
 	  width: 100%;
 	  height: 100%;
@@ -1143,7 +1143,7 @@ nz-header.ant-layout-header {
 	  // justify-content: center;
 	  // align-items: center;
 	}
-	
+
 	/* 暂无数据 */
 	.cots_body .no_data {
 	  width: 100%;
@@ -1160,12 +1160,12 @@ nz-header.ant-layout-header {
 	  justify-content: center;
 	  align-items: center;
 	}
-	
+
 	.toLastTime {
 	  margin-left: auto;
 	  color: #999999;
 	  font-size: 12px;
-	
+
 	  &.colorRed {
 	    color: red;
 	  }
@@ -1176,7 +1176,7 @@ nz-header.ant-layout-header {
 	    cursor: pointer;
 	  }
 	}
-	
+
 	.toLastTime .time {
 	  font-size: 12px;
 	  color: @primary-color;
@@ -1187,13 +1187,13 @@ nz-header.ant-layout-header {
 	  right: 10px;
 	  color: #999999;
 	  font-size: 12px;
-	
+
 	  &.colorRed {
 	    color: red;
 	  }
 	}
-	
+
 	.toLastTime1 .time {
 	  font-size: 12px;
 	  color: @primary-color;
-	}
+	}

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

@@ -45,7 +45,7 @@ export class MainComponent implements OnInit, OnDestroy {
   deskRole: boolean = false; //调度台权限
   nurseRole: boolean = false; //护士端权限
   pharmacyRole: boolean = false; //药房端权限
-  largeScreenRole: boolean = false; //大屏端权限
+  largeScreenRole: boolean = false; //综合大屏权限
   largeScreenRole2: boolean = false; //运送陪检大屏权限
   largeScreenRole3: boolean = false; //运维大屏权限
   specimenViewRole: boolean = false; //业务视图权限
@@ -80,7 +80,7 @@ export class MainComponent implements OnInit, OnDestroy {
 		private http: HttpClient,
 		// private eventSubscription: Subscription
   ) {}
-	
+
 	eventData:any
   ngOnInit() {
 		this.getEvent();
@@ -96,7 +96,7 @@ export class MainComponent implements OnInit, OnDestroy {
     this.initMenu();
     this.getWebsocket();
   }
-	
+
 	getEvent(){
 		// 全局监听
 		let that = this;
@@ -108,14 +108,14 @@ export class MainComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
   // 离开管理端
   ngOnDestroy() {
     //取消路由监听
     this.routerEventsListener.unsubscribe();
     // 断掉连接
     this.webs.closeWs(true);
-		
+
 		// if (this.eventSubscription) {
 			// this.eventSubscription.unsubscribe();
 		// }
@@ -330,7 +330,7 @@ export class MainComponent implements OnInit, OnDestroy {
       }
       if (e.link == "largeScreen") {
         this.largeScreenRole = true;
-        console.log("大屏端权限");
+        console.log("综合大屏权限");
       }
       if (e.link == "largeScreen2") {
         this.largeScreenRole2 = true;
@@ -776,7 +776,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	      this.applyDept = null;
 	      this.countRemarkIndex = -1;
 	      this.incidentModel.department = isInit ? this.incidentModel.department : null;
-				
+
 	      //正常初始化
 	      this.getAutoWorkTypes(false, isInit);
 				this.newOrderShowOpen = true
@@ -1831,7 +1831,7 @@ export class MainComponent implements OnInit, OnDestroy {
 								id: this.userInfo.user.id,
 							})
 							this.incidentModel.requester = this.userInfo.user.id;
-							this.incidentModel.description = 
+							this.incidentModel.description =
 							'告警id：' + this.eventData.data.alarmId + ';' +
 							'告警来源：' + this.eventData.data.alarmSource + ';' +
 							'\n' +
@@ -1844,7 +1844,7 @@ export class MainComponent implements OnInit, OnDestroy {
 							'\n' +
 							'告警描述：' + this.eventData.data.alarmDescription + ';' +
 							'\n' +
-							'告警内容：' + this.eventData.data.alarmContent 
+							'告警内容：' + this.eventData.data.alarmContent
 						}
 	          this.applicationDeptList = data.list;
 	          let ids = this.applicationDeptList.map(v => v.id);
@@ -4103,7 +4103,7 @@ export class MainComponent implements OnInit, OnDestroy {
   }
   submitFormHand(id) {
     if (this.screenType === "largeScreen") {
-      window.open(http.bigScreenHost + "/#/" + id);
+      window.open(`${http.bigScreenHost}/#/${this.queryType}?hosId=${this.hospital ? this.hospital.id : ''}&dutyId=${this.duty ? this.duty.id : ''}`);
     } else if (this.screenType === "largeScreen2") {
       window.open(http.bigScreenHost2 + "/#/" + id);
     } else if (this.screenType === "largeScreen3") {
@@ -4366,7 +4366,8 @@ export class MainComponent implements OnInit, OnDestroy {
 
 	// 查询范围
   queryRangeFlag = false;
-  queryRangeClick(){
+  queryRangeClick(type){
+    this.screenType = type;
     this.queryRangeFlag = true;
   }
   submitQueryRange({queryType, hospital, duty, parent}) {
@@ -4380,7 +4381,7 @@ export class MainComponent implements OnInit, OnDestroy {
 		this.parent = parent;
     this.queryRangeFlag = false;
 
-    this.toBigScreen('largeScreen3');
+    this.toBigScreen(this.screenType);
   }
   cancelQueryRange() {
     this.queryRangeFlag = false;