暂存

src/app/services/tool.service.ts

@@ -97,11 +97,9 @@ export class ToolService {
     return JSON.parse(localStorage.getItem("user")).user.group || [];
   }
   // 根据route查询菜单-新版统计专用
-  getMenuAutoType(route) {
+  getMenuAutoType() {
     let menu: any = JSON.parse(localStorage.getItem("menu")) || []; //菜单
-    let link = route.parent.parent.parent.snapshot.routeConfig.path; //当前路由
-    console.log(link, route);
-    return menu.filter( v => v.type == link);
+    return menu.filter( v => v.type == 'newStatistics');
   }
   //获取当前菜单的权限
   initCoopBtns(route) {

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DateBusinessStatisticsComponent } from './date-business-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: DateBusinessStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DateBusinessStatisticsRoutingModule { }

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.html

@@ -0,0 +1,90 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <div class="searchDataItem">
+      <span class="label">建单时间</span>：
+      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
+      </nz-range-picker>
+    </div>
+    <div class="searchDataItem">
+      <span class="label">报修科室</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
+        <ng-container *ngFor="let option of repairDeptList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
+  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.startDate }}</td>
+      <td>{{ data.sum }}</td>
+      <td>{{ data.avgResponseTime }}</td>
+      <td>{{ data.avgResolvedTime }}</td>
+      <td>{{ data.resolvedOverNum }}</td>
+      <td>{{ data.overTimeNum }}</td>
+      <td>{{ data.consumablePrice }}</td>
+      <td>{{ data.workHourPrice }}</td>
+      <td>{{ data.totalPrice }}</td>
+      <td>{{ data.negativeNum }}</td>
+      <td>{{ data.favorableRate }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.startDate }}</td>
+        <td style="width: 9%">{{ data.sum }}</td>
+        <td style="width: 9%">{{ data.avgResponseTime }}</td>
+        <td style="width: 9%">{{ data.avgResolvedTime }}</td>
+        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%">{{ data.overTimeNum }}</td>
+        <td style="width: 9%">{{ data.consumablePrice }}</td>
+        <td style="width: 9%">{{ data.workHourPrice }}</td>
+        <td style="width: 9%">{{ data.totalPrice }}</td>
+        <td style="width: 9%">{{ data.negativeNum }}</td>
+        <td style="width: 9%">{{ data.favorableRate }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.less

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 16px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 224px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.ts

@@ -0,0 +1,287 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
+import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: "app-date-business-statistics",
+  templateUrl: "./date-business-statistics.component.html",
+  styleUrls: ["./date-business-statistics.component.less"],
+})
+export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  repairDeptId;//报修科室id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
+    return flag ? 21 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
+    this.repairDeptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.search();
+  }
+
+  // 科室搜索
+  changeRepairDeptInp(e) {
+    this.searchTimer(this.getRepairDeptList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeRepairDept(flag){
+    flag && this.getRepairDeptList();
+  }
+
+  // 获取报修科室列表
+  repairDeptList:any[] = [];
+  getRepairDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.repairDeptList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
+    config: {groupAndUser: true, category123: true, source: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.module.ts

@@ -0,0 +1,23 @@
+import { DateBusinessStatisticsComponent } from './date-business-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DateBusinessStatisticsRoutingModule } from './date-business-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { VirtualScrollerModule } from 'ngx-virtual-scroller';
+import { SearchMoreModule } from '../../components/search-more/search-more.module';
+
+
+@NgModule({
+  declarations: [
+    DateBusinessStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DateBusinessStatisticsRoutingModule,
+    ShareModule,
+    VirtualScrollerModule,
+    SearchMoreModule,
+  ]
+})
+export class DateBusinessStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts

@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DistributionInspectionStatisticsComponent } from './distribution-inspection-statistics.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DistributionInspectionStatisticsComponent,
+    children: [
+      {
+        // 日期业务统计
+        path: 'dateBusinessStatistics',
+        loadChildren: () => import('./date-business-statistics/date-business-statistics.module').then(m => m.DateBusinessStatisticsModule),
+        data: {
+          reuse: true,
+          title: '日期业务统计'
+        }
+      },
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DistributionInspectionStatisticsRoutingModule { }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics.component.html

@@ -0,0 +1,10 @@
+<!-- content -->
+<div class="content">
+  <virtual-scroller #osComponentRef1 [items]="secondMenuList" class="secondMenu">
+    <div class="secondMenuItem ellipsis-oneline" [ngClass]="{ active: activeSecondMenuLink == data.link }" [title]="data.title" *ngFor="let data of osComponentRef1.viewPortItems" (click)="clickSecondMenu(data)">{{data.title}}</div>
+  </virtual-scroller>
+  <div class="main">
+    <app-custom-tabs (selectTabEmit)="selectTabEmit($event)"></app-custom-tabs>
+    <router-outlet></router-outlet>
+  </div>
+</div>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics.component.less

@@ -0,0 +1,68 @@
+@import "../../../../../src/theme.less";
+
+:host{
+  background-color: #F0F2F5;
+  width: 100%;
+  height: 100vh;
+  font-size: 14px;
+  display: flex;
+  flex-direction: column;
+  ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+    height: 36px!important;
+    line-height: 34px!important;
+    padding: 0 12px!important;
+  }
+  ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
+    height: 36px!important;
+  }
+  ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+    background: #E9EAEC;
+  }
+  ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
+    background: #fff;
+  }
+
+  .content{
+    margin-top: 8px;
+    display: flex;
+    flex: 1;
+    min-height: 0;
+		overflow-x: hidden;
+    height: 100%;
+    .secondMenu{
+      width: 175px;
+      height: 100%;
+      background-color: #fff;
+      margin-right: 8px;
+      flex-shrink: 0;
+      .secondMenuItem{
+        height: 44px;
+        line-height: 44px;
+        padding: 0 36px;
+        border-bottom: 1px solid #E9E9E9;
+        cursor: pointer;
+        &.active{
+          background-color: #E9F7E9;
+          border-color: #E9F7E9;
+          position: relative;
+          &::after{
+            content: '';
+            position: absolute;
+            right: 0;
+            top: 0;
+            width: 5px;
+            height: 100%;
+            background-color: @primary-color;
+          }
+        }
+      }
+    }
+    .main{
+      flex: 1;
+      height: calc(100% - 36px);
+      background-color: #fff;
+      position: relative;
+      top: 36px;
+    }
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics.component.ts

@@ -0,0 +1,55 @@
+import { ActivatedRoute, Router } from '@angular/router';
+import { Component, OnInit } from "@angular/core";
+import { ToolService } from 'src/app/services/tool.service';
+import { TabService } from '../services/tab.service';
+@Component({
+  selector: "app-distribution-inspection-statistics",
+  templateUrl: "./distribution-inspection-statistics.component.html",
+  styleUrls: ["./distribution-inspection-statistics.component.less"],
+})
+export class DistributionInspectionStatisticsComponent implements OnInit {
+  constructor(
+    public tool: ToolService,
+    public route: ActivatedRoute,
+    public router: Router,
+    public tabService: TabService,
+  ) {}
+
+  menuList: any[] = [];
+  secondMenuList:any[] = [];
+
+  ngOnInit() {
+    this.getMenuList();
+    console.log('this.menuList:', this.menuList)
+  }
+
+  initSecondMenu(){
+    this.secondMenuList = this.menuList.find(v => v.link == this.route.parent.routeConfig.path).childrens || [];
+    console.log(this.tabService.tabs)
+    let activeTab = this.tabService.tabs.find(v => v.active);
+    if(this.secondMenuList.length){
+      if(activeTab.path === `/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.secondMenuList[0].link}`){
+        this.clickSecondMenu(this.secondMenuList[0]);
+      }else{
+        this.activeSecondMenuLink = activeTab.path.split('/').reverse()[0];
+      }
+    }
+  }
+
+  getMenuList(){
+    this.menuList = this.tool.getMenuAutoType();
+    this.initSecondMenu();
+  }
+
+  // 点击二级菜单
+  activeSecondMenuLink:string;
+  clickSecondMenu(data){
+    this.activeSecondMenuLink = data.link;
+    this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
+  }
+
+  // 回显二级菜单
+  selectTabEmit(link){
+    this.activeSecondMenuLink = link;
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics.module.ts

@@ -0,0 +1,23 @@
+import { CustomTabsModule } from './../components/custom-tabs/custom-tabs.module';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DistributionInspectionStatisticsRoutingModule } from './distribution-inspection-statistics-routing.module';
+import { DistributionInspectionStatisticsComponent } from './distribution-inspection-statistics.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { VirtualScrollerModule } from 'ngx-virtual-scroller';
+
+
+@NgModule({
+  declarations: [
+    DistributionInspectionStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DistributionInspectionStatisticsRoutingModule,
+    ShareModule,
+    VirtualScrollerModule,
+    CustomTabsModule,
+  ],
+})
+export class DistributionInspectionStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.ts

@@ -61,10 +61,10 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts

@@ -61,10 +61,10 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts

@@ -61,10 +61,10 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts

@@ -72,10 +72,10 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts

@@ -71,10 +71,10 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts

@@ -71,10 +71,10 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -63,10 +63,10 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -63,10 +63,10 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -63,10 +63,10 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.ts

@@ -71,10 +71,10 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.ts

@@ -61,10 +61,10 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -71,10 +71,10 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics.component.html

@@ -1,14 +1,3 @@
-<!-- header -->
-<div class="header">
-  <span class="title" *ngFor="let data of menuList" [ngClass]="{ active: activeMenuId == data.id }" (click)="clickMenu(data)">{{data.title}}</span>
-  <div class="hospital" (click)="queryRangeClick()">
-    <ng-container *ngIf="queryType == 1">查询范围:全院查询</ng-container>
-    <ng-container *ngIf="queryType == 2">查询范围:{{hospital.hosName}}</ng-container>
-    <ng-container *ngIf="queryType == 3">查询范围:{{hospital.hosName}}{{duty.hosName}}</ng-container>
-    <ng-container *ngIf="queryType == 4">查询范围:垂直-{{hospital.hosName}}{{duty.hosName}}</ng-container>
-    <i class="icon_transport transport-jiantou_zuoyouqiehuan"></i>
-  </div>
-</div>
 <!-- content -->
 <div class="content">
   <virtual-scroller #osComponentRef1 [items]="secondMenuList" class="secondMenu">
@@ -19,6 +8,3 @@
     <router-outlet></router-outlet>
   </div>
 </div>
-
-<!-- 查询范围 -->
-<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics.component.less

@@ -21,41 +21,6 @@
   ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
     background: #fff;
   }
-  .header{
-    height: 48px;
-    background-color: #fff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-    .title{
-      margin-right: 16px;
-      cursor: pointer;
-      &:last-of-type{
-        margin-right: 0;
-      }
-      &.active{
-        color: @primary-color;
-      }
-    }
-    .hospital{
-      position: absolute;
-      right: 24px;
-      top: 50%;
-      transform: translateY(-50%);
-      color: #666666;
-      font-size: 16px;
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      .icon_transport{
-        color: #666666;
-        font-size: 24px;
-        position: relative;
-        top: 2px;
-      }
-    }
-  }
 
   .content{
     margin-top: 8px;

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics.component.ts

@@ -1,5 +1,5 @@
 import { ActivatedRoute, Router } from '@angular/router';
-import { Component, OnInit, OnDestroy } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { ToolService } from 'src/app/services/tool.service';
 import { TabService } from '../services/tab.service';
 @Component({
@@ -7,7 +7,7 @@ import { TabService } from '../services/tab.service';
   templateUrl: "./maintenance-statistics.component.html",
   styleUrls: ["./maintenance-statistics.component.less"],
 })
-export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
+export class MaintenanceStatisticsComponent implements OnInit {
   constructor(
     public tool: ToolService,
     public route: ActivatedRoute,
@@ -20,29 +20,13 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.getMenuList();
-    this.initHospitalAndDuty(this.tool.getCurrentHospital());
     console.log('this.menuList:', this.menuList)
   }
 
-  ngOnDestroy(){
-    // this.sessionRemove();
-    this.tabService.deleteAllRouteSnapshot();
-  }
-
-  getMenuList(){
-    this.menuList = this.tool.getMenuAutoType(this.route);
-    this.menuList.length && this.clickMenu(this.menuList[0]);
-  }
-
-  // 点击一级菜单
-  activeMenuId:number;
-  clickMenu(data){
-    this.activeMenuId = data.id;
-    this.secondMenuList = this.menuList.find(v => v.id == this.activeMenuId).childrens || [];
-    // this.tabService.deleteAllRouteSnapshot();
+  initSecondMenu(){
+    this.secondMenuList = this.menuList.find(v => v.link == this.route.parent.routeConfig.path).childrens || [];
     console.log(this.tabService.tabs)
     let activeTab = this.tabService.tabs.find(v => v.active);
-    // return;
     if(this.secondMenuList.length){
       if(activeTab.path === `/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.secondMenuList[0].link}`){
         this.clickSecondMenu(this.secondMenuList[0]);
@@ -52,6 +36,11 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
     }
   }
 
+  getMenuList(){
+    this.menuList = this.tool.getMenuAutoType();
+    this.initSecondMenu();
+  }
+
   // 点击二级菜单
   activeSecondMenuLink:string;
   clickSecondMenu(data){
@@ -63,92 +52,4 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
   selectTabEmit(link){
     this.activeSecondMenuLink = link;
   }
-
-  // 全院查询-1|院区查询-2|责任部门查询-3|部门垂直查询-4
-  hospital;
-  duty;
-  queryType;//查询范围
-  // 初始化院区、部门显示
-  initHospitalAndDuty(hospitalOrDuty){
-    let sessionData = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    console.log(sessionData);
-    if(sessionData){
-      this.hospital = sessionData.hospital;
-      this.duty = sessionData.duty;
-      this.queryType = sessionData.queryType;
-      return;
-    }
-    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;
-    }
-    console.log('this.hospital:', this.hospital)
-    console.log('this.duty:', this.duty)
-
-    // 查询范围单选框
-    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;
-    }
-
-    this.sessionSave();
-  }
-
-  // 缓存数据
-  sessionSave(){
-    sessionStorage.setItem('maintenanceStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty}));
-  }
-
-  // 清除缓存数据
-  sessionRemove(){
-    sessionStorage.removeItem('maintenanceStatistics');
-  }
-
-  // 查询范围
-  queryRangeFlag = false;
-  queryRangeClick(){
-    this.queryRangeFlag = true;
-  }
-  submitQueryRange({queryType, hospital, duty}) {
-    console.log('queryType:', queryType)
-    console.log('hospital:', hospital)
-    console.log('duty:', duty)
-    this.queryType = queryType;
-    this.hospital = hospital;
-    this.duty = duty;
-    this.queryRangeFlag = false;
-
-    this.sessionSave();
-    // this.tabService.deleteRouteSnapshot(`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`);
-    // this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
-
-    this.router.navigateByUrl('/redirect', {
-      skipLocationChange: true
-    }).then(() => {
-      this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
-    });
-  }
-  cancelQueryRange() {
-    this.queryRangeFlag = false;
-  }
 }

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics.module.ts

@@ -1,5 +1,4 @@
 import { CustomTabsModule } from './../components/custom-tabs/custom-tabs.module';
-import { QueryRangeModule } from './../components/query-range/query-range.module';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
@@ -18,7 +17,6 @@ import { VirtualScrollerModule } from 'ngx-virtual-scroller';
     MaintenanceStatisticsRoutingModule,
     ShareModule,
     VirtualScrollerModule,
-    QueryRangeModule,
     CustomTabsModule,
   ],
 })

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.component.ts

@@ -331,10 +331,10 @@ export class SynthesizeStatisticsComponent implements OnInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -71,10 +71,10 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.component.ts

@@ -71,10 +71,10 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.ts

@@ -71,10 +71,10 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
-    let queryType:any = maintenanceStatistics.queryType;
-    let hosId:any = maintenanceStatistics.hospitalId;
-    let dutyId:any = maintenanceStatistics.dutyId;
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;

src/app/views/new-statistics/new-statistics-routing.module.ts

@@ -13,6 +13,11 @@ const routes: Routes = [
         path: 'maintenanceStatistics',
         loadChildren: () => import('./maintenance-statistics/maintenance-statistics.module').then(m => m.MaintenanceStatisticsModule),
       },
+      {
+        // 配送陪检统计
+        path: 'distributionInspectionStatistics',
+        loadChildren: () => import('./distribution-inspection-statistics/distribution-inspection-statistics.module').then(m => m.DistributionInspectionStatisticsModule),
+      },
     ]
   }
 ];

src/app/views/new-statistics/new-statistics.component.html

@@ -1 +1,14 @@
+<div class="header">
+  <span class="title" *ngFor="let data of menuList" [ngClass]="{ active: activeMenuId == data.id }" (click)="clickMenu(data)">{{data.title}}</span>
+  <div class="hospital" (click)="queryRangeClick()">
+    <ng-container *ngIf="queryType == 1">查询范围:全院查询</ng-container>
+    <ng-container *ngIf="queryType == 2">查询范围:{{hospital.hosName}}</ng-container>
+    <ng-container *ngIf="queryType == 3">查询范围:{{hospital.hosName}}{{duty.hosName}}</ng-container>
+    <ng-container *ngIf="queryType == 4">查询范围:垂直-{{hospital.hosName}}{{duty.hosName}}</ng-container>
+    <i class="icon_transport transport-jiantou_zuoyouqiehuan"></i>
+  </div>
+</div>
 <router-outlet></router-outlet>
+
+<!-- 查询范围 -->
+<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>

src/app/views/new-statistics/new-statistics.component.less

@@ -3,4 +3,39 @@
 :host{
   width: 100%;
   height: 100vh;
+  .header{
+    height: 48px;
+    background-color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    .title{
+      margin-right: 16px;
+      cursor: pointer;
+      &:last-of-type{
+        margin-right: 0;
+      }
+      &.active{
+        color: @primary-color;
+      }
+    }
+    .hospital{
+      position: absolute;
+      right: 24px;
+      top: 50%;
+      transform: translateY(-50%);
+      color: #666666;
+      font-size: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        color: #666666;
+        font-size: 24px;
+        position: relative;
+        top: 2px;
+      }
+    }
+  }
 }

src/app/views/new-statistics/new-statistics.component.ts

@@ -1,10 +1,127 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, OnDestroy } from "@angular/core";
+import { ToolService } from 'src/app/services/tool.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { TabService } from './services/tab.service';
+import { SimpleReuseStrategy } from 'src/app/SimpleReuseStrategy';
 @Component({
   selector: "app-new-statistics",
   templateUrl: "./new-statistics.component.html",
   styleUrls: ["./new-statistics.component.less"],
 })
-export class NewStatisticsComponent implements OnInit {
-  constructor() {}
-  ngOnInit() {}
+export class NewStatisticsComponent implements OnInit, OnDestroy {
+  constructor(
+    public tool: ToolService,
+    public route: ActivatedRoute,
+    public router: Router,
+    public tabService: TabService,
+  ) {}
+
+  menuList: any[] = [];
+  ngOnInit() {
+    this.getMenuList();
+    this.initHospitalAndDuty(this.tool.getCurrentHospital());
+    console.log('this.menuList:', this.menuList)
+  }
+
+  ngOnDestroy(){
+    this.tabService.deleteAllRouteSnapshot();
+  }
+
+  getMenuList(){
+    this.menuList = this.tool.getMenuAutoType();
+    this.menuList.length && this.clickMenu(this.menuList[0]);
+  }
+
+  // 点击一级菜单
+  activeMenuId:number;
+  clickMenu(data){
+    this.activeMenuId = data.id;
+    console.log(`/newStatistics/${data.link}/${data.childrens[0].link}`);
+    console.log(SimpleReuseStrategy.handlers)
+    this.router.navigate([`/newStatistics/${data.link}/${data.childrens[0].link}`], { replaceUrl: true });
+  }
+
+  // 全院查询-1|院区查询-2|责任部门查询-3|部门垂直查询-4
+  hospital;
+  duty;
+  queryType;//查询范围
+  // 初始化院区、部门显示
+  initHospitalAndDuty(hospitalOrDuty){
+    let sessionData = JSON.parse(sessionStorage.getItem('newStatistics'));
+    console.log(sessionData);
+    if(sessionData){
+      this.hospital = sessionData.hospital;
+      this.duty = sessionData.duty;
+      this.queryType = sessionData.queryType;
+      return;
+    }
+    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;
+    }
+    console.log('this.hospital:', this.hospital)
+    console.log('this.duty:', this.duty)
+
+    // 查询范围单选框
+    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;
+    }
+
+    this.sessionSave();
+  }
+
+  // 缓存数据
+  sessionSave(){
+    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty}));
+  }
+
+  // 查询范围
+  queryRangeFlag = false;
+  queryRangeClick(){
+    this.queryRangeFlag = true;
+  }
+  submitQueryRange({queryType, hospital, duty}) {
+    console.log('queryType:', queryType)
+    console.log('hospital:', hospital)
+    console.log('duty:', duty)
+    this.queryType = queryType;
+    this.hospital = hospital;
+    this.duty = duty;
+    this.queryRangeFlag = false;
+
+    this.sessionSave();
+
+    let url = location.href.split('/#')[1];
+    console.log(url);
+
+    this.router.navigateByUrl('/redirect', {
+      skipLocationChange: true
+    }).then(() => {
+      this.router.navigate([url], { replaceUrl: true });
+    });
+  }
+  cancelQueryRange() {
+    this.queryRangeFlag = false;
+  }
 }

src/app/views/new-statistics/new-statistics.module.ts

@@ -4,6 +4,7 @@ import { CommonModule } from '@angular/common';
 import { NewStatisticsRoutingModule } from './new-statistics-routing.module';
 import { NewStatisticsComponent } from './new-statistics.component';
 import { ShareModule } from 'src/app/share/share.module';
+import { QueryRangeModule } from './components/query-range/query-range.module';
 
 
 @NgModule({
@@ -14,6 +15,7 @@ import { ShareModule } from 'src/app/share/share.module';
     CommonModule,
     NewStatisticsRoutingModule,
     ShareModule,
+    QueryRangeModule,
   ],
 })
 export class NewStatisticsModule { }

src/app/views/new-statistics/services/tab.service.ts

@@ -23,7 +23,7 @@ export class TabService {
         if(event.urlAfterRedirects.startsWith('/newStatistics/')){
           this.updateTabs(event.urlAfterRedirects);
         }else if(event.urlAfterRedirects !== '/'){
-          sessionStorage.removeItem('maintenanceStatistics')
+          sessionStorage.removeItem('newStatistics')
         }
       });
   }