seimin 2 months ago
parent
commit
de4079c9ad
3 changed files with 182 additions and 173 deletions
  1. 3 2
      src/app/views/main/main.component.html
  2. 178 171
      src/app/views/main/main.component.ts
  3. 1 0
      src/assets/js/http.ts

+ 3 - 2
src/app/views/main/main.component.html

@@ -37,13 +37,14 @@
37 37
           <i class="icon_transport transport-tongji-2 green" *ngIf="newStatisticsRole" (click)="toNewStatistics()" nz-tooltip nzTooltipTitle="统计"></i>
38 38
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
39 39
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
40
-          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole || sampling || communicationBook || realtimeBroadcastRole || inspectClosedLoopViewRole">
40
+          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || largeScreenRole3 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole || sampling || communicationBook || realtimeBroadcastRole || inspectClosedLoopViewRole">
41 41
             <i class="icon_transport transport-gengduoda-copy" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false"></i>
42 42
             <div class="dropdown-content ct" [hidden]="!showDropdown1" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false">
43 43
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</div>
44 44
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy2()">药房端2</div>
45 45
               <div class="dropdownItem" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</div>
46 46
               <div class="dropdownItem" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">大屏端2</div>
47
+              <div class="dropdownItem" *ngIf="largeScreenRole3" (click)="toBigScreen('largeScreen3')">大屏端3</div>
47 48
               <div class="dropdownItem" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')">业务视图</div>
48 49
               <div class="dropdownItem" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</div>
49 50
               <div class="dropdownItem" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</div>
@@ -503,7 +504,7 @@
503 504
 						</div>
504 505
 					</overlay-scrollbars>
505 506
 				</div>
506
-			
507
+
507 508
 				<!-- 近期维修 start -->
508 509
 				<div class="cots_body weifenpai" *ngIf="currentRTab == 2" [ngClass]="{ top185: hurseInfoHiding != 1 }">
509 510
 					<overlay-scrollbars #osComponentRef16 [ngStyle]="{ height: '100%' }">

File diff suppressed because it is too large
+ 178 - 171
src/app/views/main/main.component.ts


+ 1 - 0
src/assets/js/http.ts

@@ -10,6 +10,7 @@ const baseUrl: baseUrlType = {
10 10
   specimenViewHost: `${protocolName}//${domainName}:${port}/specimenView`, //业务视图地址
11 11
   bigScreenHost: `${protocolName}//${domainName}:${port}/largeScreen`, //大屏地址地址
12 12
   bigScreenHost2: `${protocolName}//${domainName}:${port}/largeScreen2`, //大屏地址2地址
13
+  bigScreenHost3: `${protocolName}//${domainName}:${port}/largeScreen3`, //大屏地址3地址
13 14
   homeWs: `${wsName}://${domainName}:${port}/webSocket/index`, //websocket首页地址
14 15
   mainWs: `${wsName}://${domainName}:${port}/webSocket/message/manage`, //websocket管理端地址
15 16
   nurseWs: `${wsName}://${domainName}:${port}/webSocket/message/nurse`, //websocket护士端地址