解决冲突

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.html

@@ -107,6 +107,15 @@
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+          <nz-form-label style="line-height:40px;" [nzSpan]="6" nzRequired nzFor="extra8">是否初始化</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择是否初始化!">
+            <nz-radio-group formControlName="extra8">
+              <label nz-radio nzValue="1">是</label>
+              <label nz-radio nzValue="0">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
         <nz-form-item>
           <nz-form-label [nzSpan]="6" nzRequired nzFor="extra6">项目标识</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请输入项目标识!">

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.ts

@@ -65,6 +65,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
     this.validateForm.controls.extra4.setValue(data.extra4DTO ? data.extra4DTO.id : null);
     this.validateForm.controls.extra5.setValue(data.extra5DTO ? data.extra5DTO.id : null);
     this.validateForm.controls.extra7.setValue(data.deptList ? data.deptList.map(v => v.id) : []);
+    this.validateForm.controls.extra8.setValue(data.extra8 || '0');
 
     data.extra4DTO && (this.deptList = [data.extra4DTO]);
     data.deptList && (this.deptsList = data.deptList);
@@ -112,7 +113,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
           extra4: this.validateForm.value.extra4,
           extra5: this.validateForm.value.extra5,
           extra7: this.validateForm.value.extra7.toString(),
-          extra8: '1',
+          extra8: this.validateForm.value.extra8,
         // }
       };
     } else {
@@ -127,6 +128,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
           extra4: this.validateForm.value.extra4,
           extra5: this.validateForm.value.extra5,
           extra7: this.validateForm.value.extra7.toString(),
+          extra8: this.validateForm.value.extra8,
         // }
       };
     }
@@ -159,6 +161,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       extra4: [null],
       extra5: [null, [Validators.required]],
       extra7: [[]],
+      extra8: [null, [Validators.required]],
     });
   }
 

src/app/type/types.ts

@@ -15,8 +15,8 @@ export interface baseUrlType {
   host: string; //接口地址
   specimenViewHost: string; //业务视图地址
   bigScreenHost: string; //大屏地址地址
-  bigScreenHost2: string; //大屏地址2地址
-  bigScreenHost3: string; //大屏地址3地址
+  bigScreenHost2: string; //运送陪检大屏地址
+  bigScreenHost3: string; //运维大屏地址
   homeWs: string; //websocket首页地址
   mainWs: string; //websocket管理端地址
   nurseWs: string; //websocket护士端地址

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

@@ -48,8 +48,8 @@
               <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="largeScreenRole2" (click)="toBigScreen('largeScreen2')">大屏端2</div>
-              <div class="dropdownItem" *ngIf="largeScreenRole3" (click)="toBigScreen('largeScreen3')">大屏端3</div>
+              <div class="dropdownItem" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">运送陪检大屏</div>
+              <div class="dropdownItem" *ngIf="largeScreenRole3" (click)="queryRangeClick()">运维大屏</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>
@@ -626,6 +626,9 @@
 	</div>
 </div>
 
+<!-- 查询范围 -->
+<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [hiddenParent]="true" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
+
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal
   *ngIf="promptModalShow"
@@ -635,5 +638,4 @@
   [info]="promptInfo"
   [back]="back"
   (closeModel)="closeModel($event)"
->
-
+></app-prompt-modal>

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

@@ -46,8 +46,8 @@ export class MainComponent implements OnInit, OnDestroy {
   nurseRole: boolean = false; //护士端权限
   pharmacyRole: boolean = false; //药房端权限
   largeScreenRole: boolean = false; //大屏端权限
-  largeScreenRole2: boolean = false; //大屏端2权限
-  largeScreenRole3: boolean = false; //大屏端3权限
+  largeScreenRole2: boolean = false; //运送陪检大屏权限
+  largeScreenRole3: boolean = false; //运维大屏权限
   specimenViewRole: boolean = false; //业务视图权限
   specimenViewRole2: boolean = false; //标本视图权限
 	specimenRoomView: boolean = false; //标本间权限
@@ -84,6 +84,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	eventData:any
   ngOnInit() {
 		this.getEvent();
+		this.initHospitalAndDuty(this.tool.getCurrentHospital());
     this.highlightMenuByUrl();
     this.routerEventsListener = this.router.events
       .pipe(filter((event) => event instanceof NavigationEnd))
@@ -333,11 +334,11 @@ export class MainComponent implements OnInit, OnDestroy {
       }
       if (e.link == "largeScreen2") {
         this.largeScreenRole2 = true;
-        console.log("大屏端2权限");
+        console.log("运送陪检大屏权限");
       }
 			if (e.link == "largeScreen3") {
         this.largeScreenRole3 = true;
-        console.log("大屏端3权限");
+        console.log("运维大屏权限");
       }
       if (e.link == "specimenView") {
         this.specimenViewRole = true;
@@ -4086,7 +4087,7 @@ export class MainComponent implements OnInit, OnDestroy {
     } else if (this.screenType === "largeScreen2") {
       window.open(http.bigScreenHost2 + "/#/" + id);
     } else if (this.screenType === "largeScreen3") {
-      window.open(http.bigScreenHost3 + "/#/" + id);
+      window.open(`${http.bigScreenHost3}/#/${this.queryType}?hosId=${this.hospital ? this.hospital.id : ''}&dutyId=${this.duty ? this.duty.id : ''}`);
     } else if (this.screenType === "specimenView") {
       window.open(http.specimenViewHost + "/#/" + id);
     }
@@ -4139,7 +4140,7 @@ export class MainComponent implements OnInit, OnDestroy {
   showDropdown:boolean = false;
   showDropdown1:boolean = false;
 	showFastDropdown:boolean = false;
-	
+
   // 选择院区
   selectHospital(){
     this.hosFlag1 = true
@@ -4341,5 +4342,71 @@ export class MainComponent implements OnInit, OnDestroy {
     if (!flag) {
       this.hosFlag1 = false;
     }
+  }
+
+	// 查询范围
+  queryRangeFlag = false;
+  queryRangeClick(){
+    this.queryRangeFlag = true;
+  }
+  submitQueryRange({queryType, hospital, duty, parent}) {
+    console.log('queryType:', queryType)
+    console.log('hospital:', hospital)
+    console.log('duty:', duty)
+    console.log('parent:', parent)
+    this.queryType = queryType;
+    this.hospital = hospital;
+    this.duty = duty;
+		this.parent = parent;
+    this.queryRangeFlag = false;
+
+    this.toBigScreen('largeScreen3');
+  }
+  cancelQueryRange() {
+    this.queryRangeFlag = false;
+  }
+
+	// 全院查询-1|院区查询-2|责任部门查询-3|部门垂直查询-4
+  hospital;
+  duty;
+  queryType;//查询范围
+	parent:any = 0;
+  // 初始化院区、部门显示
+  initHospitalAndDuty(hospitalOrDuty){
+    let type = 'hospital';//默认是院区
+    if(hospitalOrDuty.type){
+      // 当前是责任部门
+      type = 'duty';
+    }
+
+    if(type === 'duty'){
+      // 当前的所属责任部门
+      this.hospital = hospitalOrDuty.parent;
+      this.duty = hospitalOrDuty;
+    }else{
+      // 当前的所属院区
+      this.hospital = hospitalOrDuty;
+      this.duty = undefined;
+    }
+
+    // 查询范围单选框
+    if(this.hospital){
+      if(this.duty){
+        if(this.duty.parentDeptId){
+          this.queryType = 3;
+        }else{
+          this.queryType = 4;
+        }
+      }else{
+        this.queryType = 2;
+      }
+    }else{
+      this.queryType = 1;
+    }
+
+		console.log('this.hospital:', this.hospital)
+    console.log('this.duty:', this.duty)
+    console.log('this.queryType:', this.queryType)
+    console.log('this.parent:', this.parent)
   }
 }

src/app/views/main/main.module.ts

@@ -6,6 +6,7 @@ import { MainComponent } from './main.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { SelectMenuComponent } from 'src/app/components/select-menu/select-menu.component';
 import { IncidentDicrectOrderModule } from 'src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module';
+import { QueryRangeModule } from '../new-statistics/components/query-range/query-range.module';
 
 @NgModule({
   declarations: [
@@ -16,7 +17,8 @@ import { IncidentDicrectOrderModule } from 'src/app/components/incidentManagemen
     CommonModule,
     MainRoutingModule,
     ShareModule,
-		IncidentDicrectOrderModule
+		IncidentDicrectOrderModule,
+    QueryRangeModule,
   ]
 })
 export class MainModule { }

src/app/views/new-statistics/components/query-range/query-range.component.html

@@ -42,7 +42,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-				<nz-form-item class="mb0">
+				<nz-form-item class="mb0" [ngStyle]="{ visibility: !hiddenParent ? 'visible' : 'hidden'}" style="visibility: hidden;">
 				  <nz-form-label [nzSpan]="7" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
 				  <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示父级科室!">
 				    <nz-radio-group formControlName="parent">

src/app/views/new-statistics/components/query-range/query-range.component.ts

@@ -16,6 +16,7 @@ export class QueryRangeComponent implements OnInit {
   @Input() hospital: any;
   @Input() duty: any;
 	@Input() parent: any;
+	@Input() hiddenParent: any = false;
   validateForm: FormGroup;//表单
   constructor(
     private fb: FormBuilder,

src/assets/js/http.ts

@@ -9,8 +9,8 @@ const baseUrl: baseUrlType = {
   host: `${protocolName}//${domainName}:${port}/service`, //接口地址
   specimenViewHost: `${protocolName}//${domainName}:${port}/specimenView`, //业务视图地址
   bigScreenHost: `${protocolName}//${domainName}:${port}/largeScreen`, //大屏地址地址
-  bigScreenHost2: `${protocolName}//${domainName}:${port}/largeScreen2`, //大屏地址2地址
-  bigScreenHost3: `${protocolName}//${domainName}:${port}/largeScreen3`, //大屏地址3地址
+  bigScreenHost2: `${protocolName}//${domainName}:${port}/largeScreen2`, //运送陪检大屏地址
+  bigScreenHost3: `${protocolName}//${domainName}:${port}/largeScreen3`, //运维大屏地址
   homeWs: `${wsName}://${domainName}:${port}/webSocket/index`, //websocket首页地址
   mainWs: `${wsName}://${domainName}:${port}/webSocket/message/manage`, //websocket管理端地址
   nurseWs: `${wsName}://${domainName}:${port}/webSocket/message/nurse`, //websocket护士端地址