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

src/app/app-routing.module.ts

@@ -26,6 +26,8 @@ import { PageConfigGuard } from './guard/PageConfig.guard';
 import { NurseConfigGuard } from './guard/nurseConfig.guard';
 //系统配置查看权限
 import { SystemConfigGuard } from './guard/SystemConfig.guard';
+// 故障实时播报权限
+import { RealtimeBroadcastGuard } from './guard/realtimeBroadcast.guard';
 const routes: Routes = [
   // 默认
   {
@@ -172,6 +174,12 @@ const routes: Routes = [
 	  path: 'repositoryManageAdd/:id',
 	  loadChildren: () => import('./views/repository-manage-add/repository-manage-add.module').then(m => m.RepositoryManageAddModule),
 	},
+  // 故障实时播报
+  {
+    path: 'realtimeBroadcast',
+    loadChildren: () => import('./views/realtime-broadcast/realtime-broadcast.module').then(m => m.RealtimeBroadcastModule),
+    canActivate: [RealtimeBroadcastGuard]
+  },
   // 管理端首页
   {
     path: '**',

src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -136,7 +136,6 @@ export class ConfigurationCategoryComponent implements OnInit {
     }
     let postData = {
       user: {
-        hospital: { id: this.validateConfigForm.value.dutyId },
         name: keyword,
         simpleQuery: true,
         groupdata: { id: this.validateConfigForm.value.groupId },

src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component.ts

@@ -165,7 +165,6 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			sum: 9999,
 			user: {
 				// name:name,
-				hospital: { id: this.hosId || "" },
 				groupdata:{id:groupId || ""},
         roleCodes: 'first-line support',
         engineer: 1,

src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -558,7 +558,6 @@ export class IncidentCreateComponent implements OnInit {
       sum: 20,
       user: {
         name:keyWord,
-				hospital: this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
 				groupdata: this.incidentModel.group ? { id: this.incidentModel.group } : undefined,
         roleCodes: 'first-line support',
         engineer: 1,

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.html

@@ -1,33 +1,126 @@
 <div class="modal display_flex align-items_center">
   <div class="modalBody">
     <div class="title">待回访<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
-    <overlay-scrollbars #osComponentRef1 class="content">
-      <nz-spin nzSimple [nzSpinning]="loading" class="mt8 text_align_center"></nz-spin>
-      <ng-container *ngIf="!loading">
-        <div class="items" *ngFor="let item of visitList">
-          <div class="row">
-            <div class="col"><span [ngClass]="priorityColor(item.priorityId)">{{item.priorityDTO?.name}}</span> {{item.incidentsign}}</div>
-            <div class="col">{{item.hosName}} <ng-container *ngIf="item.repairIncidentType.value === 'public'">{{ item.repairIncidentType.name }}</ng-container><ng-container *ngIf="item.repairIncidentType.value === 'dept'">{{ item.department?.dept }}</ng-container></div>
-          </div>
-          <div class="row">
-            <div class="col">故障描述：{{item.description}}</div>
-          </div>
-          <div class="row">
-            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName + '层' : '' }}{{ item.houseNumber }} <span [innerHTML]="item.overtimeRemark"></span></div>
-          </div>
-          <div class="row">
-            <div class="col">申请时间：{{ item.startDate | date: 'yyyy-MM-dd HH:mm'}}</div>
-            <div class="col">处理人：{{computedHandlerUser(item)}}</div>
-            <div class="col btns">
-              <input type="button" class="mid_bot mr8" value="回访" (click)="visit(item)" />
-              <input type="button" class="btm_bot" value="查看" (click)="openItsmDetails(item)" />
+    <div class="content">
+      <div class="tabs">
+        <div class="tab" [ngClass]="{'active': queryTask == item.key}" (click)="changeTab(item.key)" *ngFor="let item of tabs">{{item.value}}<span [ngClass]="{ red: item.isRed && item.num > 0}">({{item.num}})</span></div>
+      </div>
+      <div class="list-template w100" style="padding: 16px;">
+        <div class="list-template__content">
+          <div class="list-template__top" nz-row style="padding: 0;">
+            <div nz-col nzXl='20' class="list-template__searchBox">
+              <div class="list-template__searchItem" *ngIf="coopBtns.strideLook && queryTask!='todo' && queryTask!='doing' && queryTask!='storage'">
+                <span class="label">维修科室</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+                   (ngModelChange)="deptChange($event)" nzAllowClear nzPlaceHolder="请选择维修科室" [(ngModel)]="searchDTO.maintainDepartment">
+                  <ng-container *ngFor="let option of maintainDept">
+                    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+                  </ng-container>
+                </nz-select>
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">登记时间</span>：
+                <nz-range-picker style="width: 373px;" nzShowTime [(ngModel)]="searchDTO.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">事件单号</span>：
+                <input nz-input class="formItem" placeholder="请输入事件单号" [(ngModel)]="searchDTO.incidentsign" />
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">报修科室</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+                  (nzOnSearch)="changeInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="searchDTO.department">
+                  <ng-container *ngFor="let option of alldepart">
+                    <nz-option *ngIf="!isLoading" [nzLabel]="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 class="list-template__searchItem">
+                <span class="label">状态</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+                  nzPlaceHolder="请选择状态" [(ngModel)]="searchDTO.statusId">
+                  <nz-option [nzLabel]="data.name" [nzValue]="data.id" *ngFor="let data of gdStates"></nz-option>
+                </nz-select>
+              </div>
+            </div>
+            <div nz-col nzXl='4' class="list-template__btns">
+              <button nz-button class="btn default ml8 mt0" (click)='search()'>搜索</button>
+              <button nz-button class="btn default ml8 mt0" (click)='reset()'>重置</button>
             </div>
           </div>
         </div>
-      </ng-container>
-    </overlay-scrollbars>
+      </div>
+      <div class="tableWrap">
+        <nz-table class="hospitalTable" [nzData]="listOfData" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading1">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="5%">序号</th>
+              <th nzWidth="27%">故障信息</th>
+              <th nzWidth="14%">详细地址</th>
+              <th nzWidth="12%">联系信息</th>
+              <th nzWidth="12%">受理人|处理人/组</th>
+              <th nzWidth="10%">延期记录</th>
+              <th nzWidth="8%">状态</th>
+              <th nzWidth="12%">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of listOfData;let index=index;" (click)="detail($event,data)">
+              <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+              <td class="text_align_left">
+                <span [ngClass]="priorityColor(data.priorityId)">{{ data.priorityDTO?.name }}</span>
+                {{ data.incidentsign }} {{ data.acceptDate | date: 'yyyy-MM-dd HH:mm' }}<br>{{ data.description }}
+                <i class="icon_transport transport-a-11111 ml8" *ngIf="data.reqAttachment"></i>
+                <i class="icon_transport transport-luyin ml8" *ngIf="data.reqRecord"></i>
+              </td>
+              <td class="text_align_left">
+                {{ data.hosName || '无' }}<br>
+                <ng-container *ngIf="data.repairIncidentType.value === 'public'">
+                  {{ data.repairIncidentType.name }}<br>
+                </ng-container>
+                <ng-container *ngIf="data.repairIncidentType.value === 'dept'">
+                  {{ data.department?.dept || '无' }}<br>
+                </ng-container>
+                {{ data.place ? data.place.building.buildingName : '' }}{{ data.place ? data.place.floorName + '层' : '' }}{{ data.houseNumber }}
+              </td>
+              <td class="text_align_left">
+                {{ data.requester?.name || '无' }}<br>
+                联电：{{ data.contactsInformation || '无' }}<br>
+                来电：{{ data.incomingPhone || '无' }}
+                <i class="icon_transport transport-luyin ml8" *ngIf="data.callID"></i>
+              </td>
+              <td>
+                {{ data.acceptUser?.name || '无' }}<br>
+                {{ transferSynergetic(data) }}<br>
+                <ng-container *ngIf="(data.state.value === 'pending' || data.state.value === 'reassign') && data.overdueResponseDate"><span [ngStyle]="{ color: data.acceptColourInfo ? data.acceptColourInfo.value : '' }">{{ data.overdueResponseDate | date: 'MM-dd HH:mm' }}</span>前接单</ng-container>
+                <ng-container *ngIf="data.state.value === 'handler' && data.overdueTime"><span [ngStyle]="{ color: data.handleColourInfo ? data.handleColourInfo.value : '' }">{{ data.overdueTime | date: 'MM-dd HH:mm' }}</span>前处理</ng-container>
+              </td>
+              <td [innerHTML]="data.overtimeRemark"></td>
+              <td>{{ data.state?.name }}</td>
+              <td>
+                <div class="coop">
+                  <span *ngIf="data.computedVisitFlag" (click)="visit($event,data)">回访</span>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </nz-table>
+        <div class="pagination">
+          <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+          <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength"
+            [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+            (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+          </nz-pagination>
+        </div>
+      </div>
+    </div>
   </div>
 </div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
 
 <!-- 详情 -->
 <app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.less

@@ -1,4 +1,56 @@
 @import "../../../../theme.less";
+.icon_transport{
+  color: @primary-color;;
+}
+.coop {
+  button{
+    color: #333;
+  }
+  span,button {
+    display: inline-block;
+    padding: 0 8px;
+    cursor: pointer;
+    position: relative;
+
+    &::after {
+      content: "|";
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+
+    &:hover,
+    &:active {
+      color: @primary-color;
+    }
+
+    &:nth-last-child(1) {
+      &::after {
+        content: "";
+      }
+    }
+  }
+}
+.tabs{
+  width: 100%;
+  height: 56px;
+  border-bottom: 1px solid #D9D9D9;
+  display: flex;
+  align-items: center;
+  .tab{
+    width: 148px;
+    display: flex;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    font-size: #333;
+    cursor: pointer;
+    &.active{
+      color: @primary-color;
+      border-bottom: 2px solid @primary-color;
+    }
+  }
+}
 .modal {
   position: fixed;
   left: 0;
@@ -7,17 +59,29 @@
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
   z-index: 999;
+  .tableWrap{
+    margin: 0 16px 16px!important;
+    background: #F9FAFB;
+    border-radius: 8px;
+    border: 1px solid #D9D9D9;
+    width: calc(100% - 32px);
+    min-height: 501px;
+    padding: 16px 16px 0;
+    ::ng-deep .ant-table-body{
+      margin: 0!important;
+    }
+  }
   .hospitalTable {
     width: 100%;
     td {
-      text-align: center !important;
+      text-align: center;
       position: relative;
       word-break: break-all;
     }
     .thead {
       background-image: linear-gradient(to right, @bg-start, @bg-end);
       th {
-        text-align: center !important;
+        text-align: center;
         color: #fff;
         background: transparent;
       }
@@ -37,34 +101,11 @@
     }
   }
 
-  .tab {
-    width: 100%;
-    height: 60px;
-    border-bottom: 1px solid #e5e9ed;
-    background-color: #fff;
-
-    .item {
-      text-align: center;
-      line-height: 60px;
-      height: 100%;
-      border-right: 1px solid #e5e9ed;
-
-      &:nth-last-child(1) {
-        border: none;
-      }
-
-      &.checked {
-        background: #f0f6ed;
-      }
-    }
-  }
-
   .modalBody {
-    width: 742px;
-    height: 707px;
+    width: 1315px;
     background: #fff;
     border-radius: 5px;
-    padding-bottom: 30px;
+    padding: 10px 20px;
     color: #333;
     &.modalBody-search {
       width: 480px;
@@ -73,73 +114,80 @@
 
     .title {
       width: 100%;
-      height: 40px;
-      line-height: 40px;
       text-align: center;
-      font-size: 16px;
+      font-size: 18px;
       position: relative;
 
       i {
         position: absolute;
         right: 0;
         top: 0;
-        font-size: 16px;
+        font-size: 20px;
         color: #666;
         cursor: pointer;
-        padding: 0 16px;
+        padding: 0 5px;
       }
     }
 
     .content {
-      height: calc(100% - 40px);
-      border-top: 1px solid #D9D9D9;
-      border-bottom: 1px solid #D9D9D9;
-      .items{
-        border-bottom: 1px solid #D9D9D9;
-        padding: 16px 48px;
-        font-size: 14px;
-        &:last-of-type{
-          border-bottom: none;
-        }
-        .row{
-          position: relative;
+      min-height: 117px;
+      // background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
           display: flex;
-          margin-top: 12px;
-          &:first-of-type{
-            margin-top: 0;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
           }
-          .col{
-            margin-right: 48px;
-            &:last-of-type{
-              margin-right: 0;
-            }
-            &.btns{
-              position: absolute;
-              bottom: 0;
-              right: 0;
-            }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
           }
         }
-        /* 中按钮 */
-        .mid_bot {
-          width: 65px;
-          border-radius: 4px;
-          color: white;
-          background-color: @primary-color;
-          border: 1px @primary-color solid;
-          cursor: pointer;
-          height: 27px;
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
         }
 
-        /* 下按钮 */
-        .btm_bot {
-          width: 65px;
-          border-radius: 4px;
-          color: #78797a;
-          background-color: #FFF;
-          border: 1px #e5e9ed solid;
-          cursor: pointer;
-          height: 27px;
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+          text-align: right;
         }
       }
     }
@@ -152,4 +200,44 @@
       }
     }
   }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
 }

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.ts

@@ -1,38 +1,165 @@
-import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
-import { ToolService } from 'src/app/services/tool.service';
-import { MainService } from 'src/app/services/main.service';
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { format, addDays, addHours } from 'date-fns';
+import { FormGroup, FormBuilder } from '@angular/forms';
 import cloneDeep from 'lodash-es/cloneDeep'
-import { format, addHours, addDays } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
 @Component({
   selector: 'app-incident-ser-visit',
   templateUrl: './incident-ser-visit.component.html',
   styleUrls: ['./incident-ser-visit.component.less']
 })
 export class IncidentSerVisitComponent implements OnInit {
-  @ViewChild("osComponentRef1", {
-    read: OverlayScrollbarsComponent,
-    static: false,
-  })
-  osComponentRef1: OverlayScrollbarsComponent;
-  // 切换科室，切换弹窗
-  loading = false;
-  visitList: any = [];// 列表
-  pageIndex: number = 1;//表格当前页码
-  pageSize: number = 10;//表格每页展示条数
-  total: number = 0;//表格总数据量
-
   @Input() itsmData:any;
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
-  constructor(private mainService: MainService, private tool: ToolService) { }
+  constructor(
+    public route: ActivatedRoute,
+    private mainService: MainService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  coopId: string; //表格中执行操作的id
+  hospital: string; //选中院区
+  alldepart: any = []; //当前院区所属科室
+  worker: number; //选择执行配送人员
+  gdState: number; //选择工单状态
+  gdStates: any; //工单状态列表
+  overdueStates: any; //逾期查询列表
+  pageIndex: number = 1; //页码
+  listLength: number = 0; //总条数
+  pageSize: number = 5; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  tabs:any[] = [
+    {key: 'all', value: '全部故障', num: 0, isRed: false},
+    {key: 'callback', value: '待我回访', num: 0, isRed: false},
+    {key: 'owns', value: '与我关联', num: 0, isRed: false},
+  ]
+
+  searchDTO: any = {};
+
+  searchTimerSubject = new Subject();
+  debounceSubject = new Subject(); //防抖
+	maintainDept:any = []; //维修科室
+	hosIds:any; //当前院区
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  // 选择tab
+  queryTask:string = 'callback';//默认待我回访
+  changeTab(key){
+    this.queryTask = key;
+		this.getDeparts();
+    this.loading1 = true;
+    this.debounceSubject.next(true);
+  }
 
   ngOnInit() {
-    this.getVisitList();
+		this.hosIds = this.tool.getCurrentHospital().id
+    console.log(this.itsmData)
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1], v[2]);
+    });
+    this.debounceSubject.pipe(debounceTime(500)).subscribe((v:boolean) => {
+      this.getList(v);
+    });
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    if(this.itsmData.allDuty == 1){
+      this.maintainDept = this.tool.getUserInfoPermission().dutyList || [];
+    }else{
+      this.maintainDept = this.itsmData.checkedHos || [];
+      // if(this.coopBtns.strideLook){
+      //   this.defaDept()
+      // }
+    }
+    this.getGdStates();
+    this.getHospitalType();
+    this.getOverdueStates();
+    this.loading1 = true;
+    this.debounceSubject.next(true);
   }
-  // 关闭弹窗
-  hideModal() {
-    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+
+  // 获取院区类型
+  hospitalTypes:any[] = [];
+  getHospitalType() {
+    this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {
+      this.hospitalTypes = result || [];
+    });
+  }
+
+  // 获取所有的责任部门
+  getMaintainDeptList(){
+    let type = this.hospitalTypes.find(v => v.value == 6);
+    let postData: any = {
+      idx: 0,
+      sum: 99999,
+      hospital: {
+        type: type || undefined,
+      },
+    };
+    this.mainService.getFetchDataList("data", "hospital", postData).subscribe(result => {
+      if(result.status == 200){
+        this.maintainDept = result.list || [];
+        // if(this.coopBtns.strideLook){
+        //   this.defaDept()
+        // }
+      }else{
+        this.maintainDept = [];
+      }
+    });
+  }
+
+	defaDept(){
+		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
+		if(itemDept){
+			this.searchDTO.maintainDepartment = itemDept.id
+		}
+		this.getDeparts();
+	}
+
+	// 选择维修科室
+	deptChange(e){
+		this.searchDTO.department = null;
+		this.getDeparts();
+	}
+
+  // 搜索
+  search() {
+    this.loading1 = true;
+    this.debounceSubject.next(true);
+  }
+  // 重置
+  reset() {
+    this.searchDTO = {};
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
+    this.loading1 = true;
+    this.debounceSubject.next(true);
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.searchDTO.dateRange = [dateStart,dateEnd];
+    }
   }
 
   // 优先级颜色
@@ -46,98 +173,233 @@ export class IncidentSerVisitComponent implements OnInit {
       return 'red';
     }
   }
-
-  // 处理人
-  computedHandlerUser(item){
-    if(item.state.value == 'pending' && item.currentLog){
-      return item.currentLog.workerName;
+  // 处理人+协同人
+  transferSynergetic(incidentData){
+    let str = incidentData.groupORHandlerUser || "";
+    if(incidentData.synergetic && incidentData.synergetic.length){
+        str += '，' + incidentData.synergetic.map(v => v.name).join('，');
     }
-    if(item.state.value != 'pending' && item.handlingPersonnelUser){
-      return item.handlingPersonnelUser.name;
-    }
-  }
-
-  // 查看ITSM工单详情
-  detailModalShow = false; //弹窗开关
-  coopData:any = {};
-  openItsmDetails(data) {
-    this.coopData = data;
-    this.detailModalShow = true;
-  }
-  // 关闭弹窗
-  closeDetailModelOrder(e) {
-    this.detailModalShow = JSON.parse(e).show;
-  }
-  // 弹窗确定
-  confirmDetailModelOrder(e){
-    console.log(e);
-    this.detailModalShow = false;
-  }
-
-  // 回访-弹窗
-  visitModalShow = false; //弹窗开关
-  visit(data) {
-    this.coopData = data;
-    this.visitModalShow = true;
-  }
-  // 关闭弹窗
-  closeVisitModelOrder(e) {
-    this.visitModalShow = JSON.parse(e).show;
-  }
-  // 弹窗确定
-  confirmVisitModelOrder(e){
-    console.log(e);
-    this.visitModalShow = false;
-    this.getList();
-  }
-
-  // 分页获取数据
-  getList(){
-    this.getVisitList();
+    return str;
   }
 
   // 延期记录
   transferHandlerLog = function (currentLog) {
     if(!currentLog){
-        return '';
+        return '无';
     }
     currentLog = cloneDeep(currentLog);
     if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
         if(currentLog.extra2==0.5){
           currentLog.extra2 = 4;
-          return currentLog.extra1DTO.name+" "+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日") + format(addHours(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
+          return currentLog.extra1DTO.name+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日")+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
         }else{
-          return currentLog.extra1DTO.name+" "+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
+          return currentLog.extra1DTO.name+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
         }
     }else{
-        return '';
+        return '无';
     }
   }
 
-  // 获取回访列表
-  getVisitList(){
-    this.loading = true;
+  // 是否显示回访按钮
+  computedVisit(data){
+    return this.coopBtns.visit && data.state.value == 'close' && data.deleteFlag !== 1;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(isInit = false) {
     let postData: any = {
-      idx: 0,
-      sum: 9999,
+      idx: isInit ? 0 : (this.pageIndex - 1),
+      sum: this.pageSize,
       incident: {
-        // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+        assignee: this.tool.getCurrentUserId(),
+        acceptDate: (this.searchDTO.dateRange && this.searchDTO.dateRange[0]) ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDateEnd: (this.searchDTO.dateRange && this.searchDTO.dateRange[1]) ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        incidentsign: this.searchDTO.incidentsign,
+        department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
+        statusId: this.searchDTO.statusId || undefined,
+        todoingUser: this.searchDTO.todoingUser ? { id: this.searchDTO.todoingUser } : undefined,
+        deleteFlag: 0,
         "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
         "urgentType": +this.itsmData.orderScopeRadio + 1,
-        "queryTask": "callback",
-        "assignee": this.tool.getCurrentUserId(),
-        "deleteFlag": 0,
       },
     };
 
+		if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
+			if(this.searchDTO.maintainDepartment){
+				let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
+				postData.incident.duty = itemDept;
+				delete postData.incident.dutyIds;
+			}
+		}
+
+    postData.incident.queryTask = this.queryTask;
+
+    if(this.queryTask === 'todo' || this.queryTask === 'owns'){
+      postData.incident.candidateGroups = this.tool.getCurrentGroupList().map(v => v.id).toString();
+    }else{
+      delete postData.incident.candidateGroups;
+    }
+
+    this.loading1 = true;
     this.mainService
       .getFetchDataList("simple/data", "incident", postData)
       .subscribe((result) => {
-        this.loading = false;
-        this.visitList = result.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
+        this.loading1 = false;
+        let list = result.list || [];
+        list.forEach((item) => {
+          item.endDeptsName = item.endDepts ? item.endDepts.map(v => v.dept).toString() : '';
+          item.computedVisitFlag = this.computedVisit(item);
+        });
+        this.listOfData = list;
+        this.listLength = result.totalNum;
       });
+
+    // 获取数量
+    this.getCount(postData.incident);
   }
+
+  // 调用接口-查数量
+  getCount = function (incident = {}){
+    let postData = {
+        incidentList: [],
+    }
+    this.tabs.forEach(v => {
+        postData.incidentList.push({...incident, ...{queryTask: v.key}});
+    })
+    postData.incidentList.forEach(incident => {
+        // 请求参数调整
+        if(!incident){
+            incident = {
+              "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+              "urgentType": +this.itsmData.orderScopeRadio + 1,
+            };
+        }
+
+				if(incident.queryTask!='todo' && incident.queryTask!='doing' && incident.queryTask!='storage'){
+					if(this.searchDTO.maintainDepartment){
+						let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
+						incident.duty = itemDept;
+						delete incident.dutyIds;
+					}
+				}
+
+        incident.assignee = this.tool.getCurrentUserId();
+
+        if(incident.queryTask === 'todo' || incident.queryTask === 'owns'){
+          incident.candidateGroups = this.tool.getCurrentGroupList().map(v => v.id).toString();
+        }else{
+          delete incident.candidateGroups;
+        }
+    })
+    this.mainService
+      .getCount(postData)
+      .subscribe((result) => {
+        let myData = result.data || {};
+        this.tabs.forEach(v => {
+            v.num = myData[v.key];
+        })
+      });
 }
 
+  // 获取所有科室
+  getDeparts(dept?) {
+    let data = {
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.searchDTO.maintainDepartment?this.searchDTO.maintainDepartment:this.tool.getCurrentHospital().id,
+        dept: dept,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.alldepart = data.list;
+        this.isLoading = false;
+      });
+  }
 
+  // 获取工单状态
+  getGdStates() {
+    this.mainService.getDictionary("list", "incident_status").subscribe((data) => {
+      this.gdStates = data || [];
+    });
+  }
 
+  // 获取逾期查询
+  getOverdueStates() {
+    this.mainService.getDictionary("list", "overdue_state").subscribe((data) => {
+      this.overdueStates = data || [];
+    });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.loading1 = true;
+    this.debounceSubject.next(false);
+  }
+
+  // 回访-弹窗
+  coopData: any = {}; //当前操作列
+  visitModalShow = false; //弹窗开关
+  visit(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.visitModalShow = true;
+  }
+  // 关闭弹窗
+  closeVisitModelOrder(e) {
+    this.visitModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmVisitModelOrder(e){
+    console.log(e);
+    this.visitModalShow = false;
+    this.getList(true);
+  }
+
+  // 详情-弹窗
+  detailModalShow = false; //弹窗开关
+  detail(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+    this.getList(true);
+  }
+
+  // 科室边输边搜节流阀
+  isLoading = false;
+  changeInp(e) {
+    this.searchTimer(this.getDeparts, e);
+  }
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e, type?) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e, type]);
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+}

src/app/components/incidentManagement/incident-substitutio-assign/incident-substitution-assign.component.ts

@@ -156,7 +156,6 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
     }
     let postData = {
       user: {
-        hospital: { id: this.validateForm.value.dutyId },
         name: keyword,
         simpleQuery: true,
         groupdata: { id: this.validateForm.value.groupId },

src/app/components/incidentManagement/incident-substitutio-redeploy/incident-substitution-redeploy.component.ts

@@ -91,7 +91,6 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
     }
     let postData = {
       user: {
-        hospital: { id: this.duty.id },
         name: keyword,
         simpleQuery: true,
         groupdata: { id: this.validateForm.value.groupId },

src/app/components/incidentManagement/incident-substitution/incident-substitution.component.ts

@@ -88,6 +88,20 @@ export class IncidentSubstitutionComponent implements OnInit {
         // 转派
         if(this.incidentData.state.value == 'handler' && this.incidentData.handlingPersonnelUser && this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId() && !this.coopBtns.assign && this.coopBtns.transfer){
           this.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
+        }else if(this.incidentData.state.value == 'pending'){
+          let inUser = this.incidentData.currentLog && this.incidentData.currentLog.workerId == this.tool.getCurrentUserId();
+          let inGroup = false;
+          let groupList = this.tool.getCurrentGroupList();
+          groupList.forEach(item => {
+              if(this.incidentData.currentLog){
+                  if (item.id == this.incidentData.currentLog.groupId) {
+                      inGroup = true;
+                  }
+              }
+          })
+          if((inUser || inGroup)){
+            this.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
+          }
         }
 
         // 指派

src/app/guard/realtimeBroadcast.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class RealtimeBroadcastGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'realtimeBroadcast');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/services/tool.service.ts

@@ -43,7 +43,7 @@ export class ToolService {
   }
 	// 获取权限中的信息
 	getUserInfoPermission() {
-	  return JSON.parse(localStorage.getItem("user")).infoPermission || [];
+	  return JSON.parse(localStorage.getItem("user")).infoPermission || {};
 	}
   // 获取权限中的分组
   getGroupList() {
@@ -289,6 +289,9 @@ export class ToolService {
 				case "strideLook":
 				  coopBtns.strideLook = true; //跨科查看
 				  break;
+				case "crossHospital":
+				  coopBtns.crossHospital = true; //跨部门选组
+				  break;
       }
     });
     console.log(coopBtns);

src/app/views/fuwutai/fuwutai.component.html

@@ -1136,7 +1136,7 @@
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDepts">终点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
-                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange(e)">
+                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">
                                 <ng-container *ngFor="let option of deptZyList.endDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>

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

@@ -3235,7 +3235,6 @@ export class FuwutaiComponent implements OnInit {
       sum: 20,
       user: {
         name:keyWord,
-				hospital: this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
 				groupdata: this.incidentModel.group ? { id: this.incidentModel.group } : undefined,
         roleCodes: 'first-line support',
         engineer: 1,

src/app/views/hospital-management/hospital-management.component.html

@@ -17,10 +17,11 @@
       >
         <thead>
           <tr class="thead">
-            <th nzWidth="20%">院区/部门名称</th>
-            <th nzWidth="20%">部门类型</th>
-            <th nzWidth="20%">父院区</th>
-            <th nzWidth="20%">院区编码</th>
+            <th nzWidth="16%">院区/部门名称</th>
+            <th nzWidth="16%">部门类型</th>
+            <th nzWidth="16%">父院区</th>
+            <th nzWidth="16%">父级部门</th>
+            <th nzWidth="16%">院区编码</th>
             <th nzWidth="20%">操作</th>
           </tr>
         </thead>
@@ -29,18 +30,13 @@
             <td>{{ data.hosName || '无' }}</td>
             <td>{{ data.type ? data.type.name : '无' }}</td>
             <td>{{ data.parent ? data.parent.hosName : '无' }}</td>
+            <td>{{ data.parentDeptDTO ? data.parentDeptDTO.hosName : '无' }}</td>
             <td>{{ data.hosNo || '无' }}</td>
             <td>
               <div class="coop">
-                <span
-                  *ngIf="currentUserAccount == 'dsadmin'"
-                  (click)="copy(data)"
-                  >复制</span
-                >
+                <span *ngIf="currentUserAccount == 'dsadmin'" (click)="copy(data)">复制</span>
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
-                <span *ngIf="coopBtns.del" (click)="showDelModal(data.id)"
-                  >删除</span
-                >
+                <span *ngIf="coopBtns.del" (click)="showDelModal(data.id)">删除</span>
               </div>
             </td>
           </tr>
@@ -61,16 +57,9 @@
   </div>
 
   <!-- 新增/编辑模态框 -->
-  <div
-    class="save align-items_center display_flex justify-content_flex-center add"
-    *ngIf="modal"
-  >
+  <div class="save align-items_center display_flex justify-content_flex-center add" *ngIf="modal">
     <div class="modalBody">
-      <div class="title">
-        {{ add ? "新增" : "编辑" }}<i
-          class="icon_transport transport-guanbi"
-          (click)="hideAddModal()"
-        ></i>
+      <div class="title">{{ add ? "新增" : "编辑" }}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i>
       </div>
       <div class="content">
         <form
@@ -80,14 +69,9 @@
           (ngSubmit)="submitForm()"
         >
           <nz-form-item>
-            <nz-form-label
-              [nzSm]="6"
-              [nzXs]="24"
-              nzFor="parentHospital"
-              >父院区</nz-form-label
-            >
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="parentHospital">父院区</nz-form-label>
             <nz-form-control nzErrorTip="请选择父院区!">
-              <nz-select formControlName="parentHospital" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父院区" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event)"
+              <nz-select formControlName="parentHospital" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父院区" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event, 'parent')"
               (nzOpenChange)="openHospitalSelect($event)" (ngModelChange)="changeHospitalSelect($event)">
                 <ng-container *ngFor="let option of parentHospitals">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
@@ -100,6 +84,21 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="parentDeptId">父级部门</nz-form-label>
+            <nz-form-control nzErrorTip="请选择父级部门!">
+              <nz-select formControlName="parentDeptId" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父级部门" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event, 'parentDept')"
+              (nzOpenChange)="openParentDeptSelect($event)">
+                <ng-container *ngFor="let option of parentDepts">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
             <nz-form-label
               [nzSm]="6"
               [nzXs]="24"

src/app/views/hospital-management/hospital-management.component.ts

@@ -26,18 +26,29 @@ export class HospitalManagementComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.searchParentHospitalSubject.pipe(debounceTime(500)).subscribe((v: any) => {
-      this.getAllParentHospital(v).subscribe((result) => {
-        this.isLoading = false;
-        if (result.status == 200) {
-          this.parentHospitals = result.list;
-        }
-      });
+    this.searchParentHospitalSubject.pipe(debounceTime(500)).subscribe(({e, type}) => {
+      if(type === 'parentDept'){
+        this.getAllParentHospital(e, type === 'parentDept').subscribe((result) => {
+          this.isLoading = false;
+          if (result.status == 200) {
+            this.parentDepts = result.list;
+          }
+        });
+      }else if(type === 'parent'){
+        this.getAllParentHospital(e, type === 'parentDept').subscribe((result) => {
+          this.isLoading = false;
+          if (result.status == 200) {
+            this.parentHospitals = result.list;
+          }
+        });
+      }
+
     });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getList();
     this.initForm();
     this.initFormCopy();
+    this.getHospitalType();
   }
 
   currentUserAccount: any = JSON.parse(localStorage.getItem("user")).user.account; //当前登录人账号
@@ -63,11 +74,12 @@ export class HospitalManagementComponent implements OnInit {
   coopBtns: any = {};
   //所有院区
   parentHospitals: any = [];
+  parentDepts: any = [];
   searchParentHospitalSubject = new Subject();
   //搜索父级院区
-  changeInp(e) {
+  changeInp(e, type) {
     this.isLoading = true;
-    this.searchParentHospitalSubject.next(e);
+    this.searchParentHospitalSubject.next({e, type});
   }
   // 打开父级科室下拉框
   isLoading = false;
@@ -82,6 +94,18 @@ export class HospitalManagementComponent implements OnInit {
       });
     }
   }
+  // 打开父级部门下拉框
+  openParentDeptSelect(flag) {
+    if (flag) {
+      this.isLoading = true;
+      this.getAllParentHospital('', true).subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.parentDepts = result.list;
+        }
+      });
+    }
+  }
   // 选择父级科室下拉框
   changeHospitalSelect(e) {
     if(!e){
@@ -101,20 +125,42 @@ export class HospitalManagementComponent implements OnInit {
       });
     }
   }
+  // 获取院区类型
+  getHospitalType() {
+    this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {
+      this.hospitalTypes = result || [];
+    });
+  }
   //获取所有的父级院区列表
-  getAllParentHospital(keyWord = "") {
-    let postData: any = {
-      idx: 0,
-      sum: 10,
-      hospital: {
-        keyWord: keyWord,
-      },
-    };
-    if (this.coopId) {
-      // 过滤这个院区及其子院区
-      postData.hospital.filterByHosId = this.coopId;
+  getAllParentHospital(keyWord = "", isParentDept = false) {
+    if(isParentDept){
+      let postData: any = {
+        idx: 0,
+        sum: 10,
+        hospital: {
+          keyWord: keyWord,
+          type: isParentDept ? this.hospitalTypes.find(v => v.value == 6) : undefined
+        },
+      };
+      if (this.coopId) {
+        // 过滤这个院区及其子院区
+        postData.hospital.filterByHosId = this.coopId;
+      }
+      return this.mainService.getFetchDataList("data", "hospital", postData);
+    }else{
+      let postData: any = {
+        idx: 0,
+        sum: 10,
+        hospital: {
+          keyWord: keyWord,
+        },
+      };
+      if (this.coopId) {
+        // 过滤这个院区及其子院区
+        postData.hospital.filterByHosId = this.coopId;
+      }
+      return this.mainService.getFetchDataList("data", "hospital", postData);
     }
-    return this.mainService.getFetchDataList("data", "hospital", postData);
   }
 
   // 表格数据
@@ -204,6 +250,7 @@ export class HospitalManagementComponent implements OnInit {
     this.validateForm = this.fb.group({
       hospitalType: [null],
       parentHospital: [null],
+      parentDeptId: [null],
       hospitalName: [null, [Validators.required]],
       hospitalNum: [null, [Validators.required]],
     });
@@ -227,6 +274,9 @@ export class HospitalManagementComponent implements OnInit {
     if (this.validateForm.value.parentHospital) {
       data.hospital.parent = { id: this.validateForm.value.parentHospital };
     }
+    if (this.validateForm.value.parentDeptId) {
+      data.hospital.parentDeptId =  this.validateForm.value.parentDeptId;
+    }
     if (this.validateForm.value.hospitalType) {
       data.hospital.type = { id: this.validateForm.value.hospitalType };
     }
@@ -253,12 +303,12 @@ export class HospitalManagementComponent implements OnInit {
     this.modal = true;
     this.coopId = data.id;
     if (data.parent) {
-      this.getAllParentHospital(data.parent.dept).subscribe((res) => {
-        if (res.status == 200) {
-          this.parentHospitals = res.list;
-          this.validateForm.controls.parentHospital.setValue(data.parent.id);
-        }
-      });
+      this.parentHospitals = [data.parent];
+      this.validateForm.controls.parentHospital.setValue(data.parent.id);
+    }
+    if (data.parentDeptId && data.parentDeptDTO) {
+      this.parentDepts = [data.parentDeptDTO];
+      this.validateForm.controls.parentDeptId.setValue(data.parentDeptId);
     }
     if(data.type){
       this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {

src/app/views/incident-management/incident-management.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 
 import { MainService } from "../../services/main.service";
@@ -14,7 +14,7 @@ import cloneDeep from 'lodash-es/cloneDeep'
   templateUrl: "./incident-management.component.html",
   styleUrls: ["./incident-management.component.less"],
 })
-export class IncidentManagementComponent implements OnInit {
+export class IncidentManagementComponent implements OnInit, OnDestroy {
   constructor(
     public route: ActivatedRoute,
     private router: Router,
@@ -85,7 +85,7 @@ export class IncidentManagementComponent implements OnInit {
 			}else{
 				this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
 			}
-			
+
 		}
 		this.getDeparts();
 		this.getUsers('', 'handle');
@@ -114,6 +114,25 @@ export class IncidentManagementComponent implements OnInit {
     this.getIncidentCategoryList();
     this.loading1 = true;
     this.debounceSubject.next(true);
+    this.autoRefresh();
+  }
+
+  ngOnDestroy(){
+    this.cancelRefresh();
+  }
+
+  // 定时器自动刷新页面
+  timer = null;
+  autoRefresh(){
+    this.cancelRefresh();
+    this.timer = setInterval(() => {
+      this.getList();
+    }, 60000)
+  }
+
+  // 清除定时器
+  cancelRefresh(){
+    clearInterval(this.timer);
   }
 
   // 初始化tab
@@ -133,7 +152,7 @@ export class IncidentManagementComponent implements OnInit {
     //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0, isRed: false});
     // }
   }
-	
+
 	defaDept(){
 		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
 		if(itemDept){
@@ -143,7 +162,7 @@ export class IncidentManagementComponent implements OnInit {
 		this.getUsers('', 'handle');
 		this.getUsers('', 'acceptUser');
 	}
-	
+
 	// 选择维修科室
 	deptChange(e){
 		this.searchDTO.maintainGroup = null
@@ -153,11 +172,12 @@ export class IncidentManagementComponent implements OnInit {
 		}else{
 			this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
 		}
-		this.searchDTO.maintainDepartment = e
+		this.searchDTO.department = null
+		this.searchDTO.todoingUser = null
 		this.getDeparts();
 		this.getUsers('', 'handle');
 	}
-	
+
   // 搜索
   search() {
     this.loading1 = true;
@@ -356,7 +376,7 @@ export class IncidentManagementComponent implements OnInit {
         delete postData.incident.duty;
         delete postData.incident.hosId;
     }
-		
+
 		if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
 			if(this.searchDTO.maintainDepartment){
 				let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
@@ -369,7 +389,7 @@ export class IncidentManagementComponent implements OnInit {
 		}else{
 			delete postData.incident.candidateGroupId;
 		}
-		
+
     postData.incident.queryTask = this.queryTask;
 
     if(this.queryTask === 'todo' || this.queryTask === 'owns'){
@@ -428,7 +448,7 @@ export class IncidentManagementComponent implements OnInit {
             delete incident.duty;
             delete incident.hosId;
         }
-				
+
 				if(incident.queryTask!='todo' && incident.queryTask!='doing' && incident.queryTask!='storage'){
 					if(this.searchDTO.maintainDepartment){
 						let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
@@ -436,7 +456,7 @@ export class IncidentManagementComponent implements OnInit {
 						delete incident.hosId;
 					}
 				}
-				
+
         incident.assignee = this.tool.getCurrentUserId();
 
         if(incident.queryTask === 'todo' || incident.queryTask === 'owns'){
@@ -669,7 +689,7 @@ export class IncidentManagementComponent implements OnInit {
         acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
         selectType: this.validateSearchForm.value.selectType || undefined,
         deleteFlag: this.validateSearchForm.value.deleteFlag,
-				candidateGroupId: null
+				candidateGroupId: undefined
       },
     };
 
@@ -686,7 +706,7 @@ export class IncidentManagementComponent implements OnInit {
         delete postData.incident.duty;
         delete postData.incident.hosId;
     }
-		
+
 		if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
 			if(this.searchDTO.maintainDepartment){
 				let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
@@ -694,13 +714,13 @@ export class IncidentManagementComponent implements OnInit {
 				delete postData.incident.hosId;
 			}
 		}
-		
+
 		if(this.queryTask!='todo' && this.queryTask!='owns' && this.queryTask!='storage'){
 			postData.incident.candidateGroupId = this.searchDTO.maintainGroup
 		}else{
 			delete postData.incident.candidateGroupId;
 		}
-		
+
     postData.incident.queryTask = this.queryTask;
 
     if(this.queryTask === 'todo' || this.queryTask === 'owns'){

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

@@ -49,6 +49,7 @@
 							<div class="dropdownItem" *ngIf="sampling" (click)="toSampling()">门诊病理采样端</div>
 							<div class="dropdownItem" *ngIf="communicationBook" (click)="toCommunicationBook()">病理交接本</div>
 							<div class="dropdownItem" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</div>
+							<div class="dropdownItem" *ngIf="realtimeBroadcastRole" (click)="toRealtimeBroadcast()">故障实时播报</div>
             </div>
           </div>
         </div>

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

@@ -34,6 +34,7 @@ export class MainComponent implements OnInit {
 	sampling: boolean = false; //门诊病理采样端权限
 	communicationBook: boolean = false; //病理交接本权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
+  realtimeBroadcastRole: boolean = false; //全局业务查看权限
   incidentConfigRole: boolean = false; //事件配置权限
   otherConfigRole: boolean = false; //三方配置权限
   pageConfigRole: boolean = false; //业务页面控制权限
@@ -316,6 +317,10 @@ export class MainComponent implements OnInit {
         this.disinfectionSupplyRole = true;
         console.log("全局业务查看权限");
       }
+      if (e.link == "realtimeBroadcast") {
+        this.realtimeBroadcastRole = true;
+        console.log("故障实时播报权限");
+      }
       if (e.link == "incidentConfig") {
         this.incidentConfigRole = true;
         console.log("事件配置权限");
@@ -463,6 +468,10 @@ export class MainComponent implements OnInit {
   toDisinfectionSupply(): void {
     this.router.navigateByUrl("disinfectionSupply");
   }
+  // 故障实时播报
+  toRealtimeBroadcast(): void {
+    this.router.navigateByUrl("realtimeBroadcast");
+  }
   // 配置中心
   toConfigurationCenter(): void {
     this.iShowMenuModal = true;

src/app/views/realtime-broadcast/realtime-broadcast-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { RealtimeBroadcastComponent } from './realtime-broadcast.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: RealtimeBroadcastComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class RealtimeBroadcastRoutingModule { }
+

src/app/views/realtime-broadcast/realtime-broadcast.component.less

@@ -0,0 +1,601 @@
+@import "../../../../src/theme.less";
+.icon_transport{
+  color: @primary-color;
+}
+.blue{
+  color: #57D8FF;
+}
+:host {
+  width: 100vw;
+  height: 100vh;
+  background-color: #00253F;
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .modalBody {
+      width: 350px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 100%;
+        height: 145px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+
+        div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 18px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 19px 14px 0 14px;
+          max-height: 500px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 8px;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 14px;
+            }
+          }
+        }
+
+        button:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+  .realtimeBroadcast{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    color: #fff;
+    .header{
+      height: 48px;
+      padding: 0 16px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      background-color: #012F48;
+      .title{
+        display: flex;
+        align-items: center;
+        h1{
+          margin: 0;
+          font-size: 16px;
+          font-weight: normal;
+          color: #FFFFFF;
+        }
+        h2{
+          margin: 0;
+          font-size: 20px;
+          font-weight: bold;
+          color: #FFFFFF;
+          margin-left: 50px;
+        }
+      }
+      .userInfo {
+        height: 100%;
+        float: right;
+        padding: 0 24px;
+        box-sizing: border-box;
+        font-size: 14px;
+
+        // 下拉列表
+        &.dropdown{
+          position: relative;
+          height: 48px;
+          line-height: 48px;
+          .dropdown-content {
+            position: absolute;
+            top: 48px;
+            background-color: #fff;
+            width: 156px;
+            box-shadow: 0px 2px 4px 1px #D9D9D9;
+            z-index: 999999;
+            border-radius: 4px;
+            border: 1px solid rgba(0,0,0,0.15);
+            color: rgba(0,0,0,0.65);
+            &.ct{
+              left: 50%;
+              transform: translateX(-50%);
+            }
+            &.r8{
+              right: 8px;
+            }
+          }
+
+          .dropdown-content .dropdownItem {
+            height: 40px;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            padding: 0 24px;
+          }
+
+          .dropdown-content .dropdownItem:hover {
+            background-color: #e9f7e9;
+          }
+        }
+
+        .wel {
+          line-height: 15px;
+          white-space: nowrap;
+          overflow: hidden;//文本超出隐藏
+          text-overflow: ellipsis;//文本超出省略号替代
+        }
+
+        .user {
+          overflow: hidden;
+          height: 48px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          font-size: 16px;
+          cursor: pointer;
+
+          img {
+            width: 32px;
+            height: 32px;
+            margin-right: 8px;
+          }
+
+          span, .transport-xiala1 {
+            height: 48px;
+            line-height: 48px;
+          }
+        }
+
+        .logOut {
+          text-align: right;
+          color: @primary-color;
+          line-height: 20px;
+
+          span {
+            cursor: pointer;
+            padding: 10px;
+          }
+        }
+      }
+    }
+  }
+
+  // 调度台copy过来的
+  /* 工单总数 */
+  .lists_box {
+    width: 100%;
+    height: calc(100vh - 56px);
+    display: flex;
+    margin-bottom: 8px;
+  }
+
+  .lists {
+    flex: 1;
+    margin-right: 16px;
+    overflow: hidden;
+    position: relative;
+  }
+
+  .lists:nth-child(1) {
+    margin-left: 16px;
+  }
+
+  /* 头部 */
+  .lists .head {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 16px;
+    position: relative;
+    z-index: 8;
+    background-color: #164967;
+    box-shadow: 0px 3px 6px 1px #092543;
+    margin: 8px 0;
+    padding: 0 8px;
+    .title_bold{
+      font-weight: bold;
+    }
+    .refreshSeconds{
+      font-size: 14px;
+    }
+  }
+
+  .lists .head .shuaxin {
+    float: right;
+    color: @primary-color;
+    cursor: pointer;
+  }
+
+  .lists .head .shuaxin i {
+    font-size: 12px;
+  }
+
+  .lists .head .shuaxin span {
+    font-size: 12px;
+  }
+
+  /* 搜索 */
+  .lists .searchBox {
+    width: 100%;
+    padding: 10px 2%;
+    background: #f9fafb;
+    position: relative;
+    z-index: 8;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .search {
+      height: 34px;
+      width: 90%;
+      background-color: white;
+      border: 1px rgb(225, 229, 232) solid;
+      border-radius: 20px;
+      overflow: hidden;
+    }
+  }
+
+  .lists input {
+    padding-left: 3%;
+    color: black;
+    height: 32px;
+    width: 80%;
+    float: left;
+    border: none;
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  .lists input::-webkit-input-placeholder {
+    color: #999999;
+  }
+
+  .lists .magnifier {
+    width: 14%;
+    height: 32px;
+    line-height: 32px;
+    float: left;
+    border-left: 1px rgb(225, 229, 232) solid;
+    cursor: pointer;
+    text-align: right;
+  }
+
+  .lists .magnifier i {
+    color: #999999;
+  }
+
+  .lists .magnifier span {
+    color: @primary-color;
+  }
+
+  /* 单子内容盒子 */
+  .lists .cots_body {
+    width: 100%;
+    height: calc(100% - 68px);
+    background: #0f384e;
+    border: 1px solid #7D7D7D;
+    color: #fff;
+  }
+
+  /* loading */
+  .cots_body .loading {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+  }
+
+  /* 暂无数据 */
+  .cots_body .no_data {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    font-size: 24px;
+    font-weight: bold;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  /* 未分派 */
+  .weifenpai .list {
+    height: 145px;
+    border-bottom: 1px solid #7D7D7D;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+  }
+  // 转出院记录
+  .patientLog .list {
+    height: auto !important;
+    th,
+    td {
+      text-align: center !important;
+    }
+  }
+
+  /* 左边 */
+  .left_cots {
+    width: 100%;
+    float: left;
+    padding: 0 8px;
+    cursor: pointer;
+    position: relative;
+  }
+
+  /* 急标 */
+  .left_cots .ji {
+    position: absolute;
+    right: -3px;
+    top: -3px;
+    width: 30px;
+  }
+
+  /* 右边 */
+  .right_bots {
+    width: 20%;
+    border-left: 1px #e1e5e8 solid;
+    padding: 8px 0;
+  }
+
+  /* 上按钮 */
+  .right_bots .top_bot {
+    width: 70%;
+    border-radius: 4px;
+    color: white;
+    background-color: @primary-color;
+    border: 1px @primary-color solid;
+    cursor: pointer;
+    height: 27px;
+    margin-bottom: 8px;
+  }
+
+  .slider {
+    position: absolute;
+    // top: 98px;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    height: 2px;
+
+    &.sgreen {
+      background: rgb(86, 186, 182);
+    }
+
+    &.syellow {
+      background: rgb(245, 166, 35);
+    }
+    &.sred {
+      background: #d81e06;
+    }
+  }
+
+  /* 中按钮 */
+  .right_bots .mid_bot {
+    width: 70%;
+    border-radius: 4px;
+    color: white;
+    background-color: @primary-color;
+    border: 1px @primary-color solid;
+    cursor: pointer;
+    height: 27px;
+  }
+
+  /* 下按钮 */
+  .right_bots .btm_bot {
+    width: 70%;
+    border-radius: 4px;
+    color: #78797a;
+    background-color: #FFF;
+    border: 1px #e5e9ed solid;
+    cursor: pointer;
+    height: 27px;
+  }
+
+  /* 工单 */
+  .weifenpai .left_cots .gongdan {
+    height: 24px;
+    margin: 4px 0;
+    line-height: 24px;
+    text-align: center;
+  }
+
+  .weifenpai .left_cots .gongdan .left {
+    float: left;
+    font-size: 14px;
+  }
+  .gongdan_name {
+    max-width: 80% !important;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+  }
+
+  .weifenpai .left_cots .gongdan .right {
+    float: right;
+
+    &.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%;
+    width: 10px;
+    height: 10px;
+    background-color: red;
+    margin-top: 7px;
+    margin-right: 8px;
+  }
+
+  /* 地点 */
+  .weifenpai .didian {
+    height: 24px;
+    line-height: 24px;
+    margin: 4px 0;
+    display: flex;
+  }
+
+  .weifenpai .didian .left {
+    float: left;
+    font-size: 14px;
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;//文本超出隐藏
+    text-overflow: ellipsis;//文本超出省略号替代
+    &.noEllipsis{
+      white-space: normal;
+      overflow: visible;
+      text-overflow: inherit;
+      word-break: break-all;
+    }
+  }
+
+  .weifenpai .didian .right {
+    float: right;
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;//文本超出隐藏
+    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;
+  }
+
+  .weifenpai .shijian .left i {
+    color: @primary-color;
+    font-size: 14px;
+
+    &.colorRed {
+      color: red;
+    }
+  }
+
+  .weifenpai .shijian .left span {
+    font-size: 12px;
+  }
+}

src/app/views/realtime-broadcast/realtime-broadcast.component.ts

@@ -0,0 +1,437 @@
+import { Component, OnInit, AfterViewInit } from "@angular/core";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Router } from '@angular/router';
+import { Swiper, Autoplay } from 'swiper';
+Swiper.use([Autoplay]);
+import chunk from 'lodash-es/chunk';
+
+@Component({
+  selector: "app-realtime-broadcast",
+  templateUrl: "./realtime-broadcast.component.html",
+  styleUrls: ["./realtime-broadcast.component.less"],
+})
+export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    public tool: ToolService,
+    private message: NzMessageService,
+    public router: Router,
+  ){}
+  validateForm: FormGroup; //表单
+  isMask:boolean = false; //遮罩
+  changeInpSubject = new Subject(); //防抖
+  showDropdown:boolean = false; //下拉
+  loginUser: any = this.tool.getCurrentUserInfo(); //登录人信息
+
+  ngOnInit(): void {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe(({type, searchText}) => {
+      // this.getHospitalList(type, searchText);
+    });
+    this.initForm();
+  }
+
+  ngAfterViewInit(){
+    this.computedNum();
+    this.getIncidentStatusList();
+  }
+
+  ngOnDestroy(){
+    clearInterval(this.timer);
+    this.mySwiper1pending && this.mySwiper1pending.destroy();
+    this.mySwiper2handler && this.mySwiper2handler.destroy();
+    this.mySwiper3overtime && this.mySwiper3overtime.destroy();
+  }
+
+  mySwiper1pending:Swiper;
+  mySwiper2handler:Swiper;
+  mySwiper3overtime:Swiper;
+  swiperEnter(key){
+    this['mySwiper' + key] && this['mySwiper' + key].autoplay.stop();
+  }
+
+  swiperLeave(key){
+    this['mySwiper' + key] && this['mySwiper' + key].autoplay.start();
+  }
+
+  // 轮播
+  startSwiper(type){
+    let _this = this;
+    this['mySwiper' + type] && this['mySwiper' + type].destroy();
+    setTimeout(() => {
+      this['mySwiper' + type] = new Swiper('#mySwiper' + type, {
+        autoplay: {
+          delay: this.config.rollingSeconds * 1000,
+          // stopOnLastSlide: false,
+          // disableOnInteraction: false,
+        },
+        observer: true, //修改swiper自己或子元素时，自动初始化swiper
+        observeParents: true, //修改swiper的父元素时，自动初始化swiper
+        allowTouchMove: false, //禁止触摸滑动
+        // loop: true,
+        // pagination: {
+        //   el: '.swiper-pagination',
+        //   clickable: true, //轮播按钮支持点击
+        // },
+        on: {
+          // slideChangeTransitionEnd: function(swiper) {
+          //   _this.activeIndex = swiper.realIndex;
+          // },
+          click: function(swiper, event){
+            let parentNode = (event as any).target.closest('.list');
+            let hasClass = parentNode !== null;
+            if(hasClass){
+              const id = parentNode.getAttribute('data-id');
+              if(id !== null){
+                _this.openItsmDetails({id});
+              }
+            }
+          }
+        },
+      });
+    }, 0)
+  }
+
+  // 定时器
+  timer = null;
+  num:number = 0;
+  startGetList(){
+    clearInterval(this.timer);
+    this.timer = setInterval(() => {
+      this.num--;
+      if(this.num < 0){
+        this.num = this.config.refreshSeconds;
+        this.refreshIncidentList();
+      }
+    }, 1000)
+  }
+
+  // 初始化form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      deptIds: [[], [Validators.required]],
+      groupIds: [[]],
+      showOvertime: [undefined, [Validators.required]],
+      refreshSeconds: [30, [Validators.required]],
+      rollingSeconds: [3, [Validators.required]],
+    });
+  }
+
+  // 展示弹窗
+  showConfig(isEdit = false){
+    this.isMask = true;
+    this.getHospitalType();
+    if(isEdit && this.config.id){
+      this.validateForm.controls.deptIds.setValue(this.config.deptIds.split(',').map(v => +v));
+      this.validateForm.controls.groupIds.setValue(this.config.groupIds ? this.config.groupIds.split(',').map(v => +v) : []);
+      this.config.groupList && (this.groupList = this.config.groupList);
+      this.validateForm.controls.showOvertime.setValue(this.config.showOvertime);
+      this.validateForm.controls.refreshSeconds.setValue(this.config.refreshSeconds);
+      this.validateForm.controls.rollingSeconds.setValue(this.config.rollingSeconds);
+    }
+  }
+
+  // 关闭遮罩
+  hideModal(){
+    this.isMask = false;
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(type, searchText) {
+    this.isLoading = true;
+    this.changeInpSubject.next({type, searchText});
+  }
+
+  // 获取院区类型
+  hospitalTypes:any[] = [];
+  getHospitalType() {
+    this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {
+      this.hospitalTypes = result || [];
+      this.getHospitalList();
+    });
+  }
+
+  // 获取维修科室
+  hospitalList:any[] = [];
+  getHospitalList() {
+    let type = this.hospitalTypes.find(v => v.value == 6);
+    let postData = {
+      hospital: {
+        type: type || undefined,
+      },
+      idx: 0,
+      sum: 99999,
+    };
+    this.mainService
+      .getFetchDataList("data", "hospital", postData)
+      .subscribe((result) => {
+        this.hospitalList = result.list || [];
+      });
+  }
+
+  // 修改维修科室
+  changeHospital(arr){
+    this.getGroupList();
+    this.validateForm.controls.groupIds.setValue([]);
+  }
+
+  // 打开运维分组
+  openChangeGroup(flag){
+    flag && this.getGroupList();
+  }
+
+  // 获取运维分组
+  groupList:any[] = [];
+  getGroupList() {
+    if(!this.validateForm.value.deptIds.length){
+      this.isLoading = false;
+      this.groupList = [];
+      return;
+    }
+    let postData = {
+      group2: {
+        hospitalIds: this.validateForm.value.deptIds.toString(),
+        typeIds: 3,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("data", "group2", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.groupList = result.list || [];
+      });
+  }
+
+  // 根据用户查询配置
+  config:any = {};
+  getConfig() {
+    let postData = {
+      incidentViewConfig: {
+        userId: this.tool.getCurrentUserInfo().id,
+      },
+      idx: 0,
+      sum: 1,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "incidentViewConfig", postData)
+      .subscribe((res:any) => {
+        let result = res.list || [];
+        if(result.length){
+          this.config = result[0];
+          this.num = this.config.refreshSeconds;
+
+          // 初始化故障工单列表
+          if(this.config.showOvertime == 1){
+            this.incidentList['2handler'].name = '待处理（不含延期处理）';
+            this.incidentList['3overtime'] = {
+              name: '延期处理',
+              list: [],
+            }
+            this.getIncidentList('1pending');
+            this.getIncidentList('2handler');
+            this.getIncidentList('3overtime');
+          }else{
+            this.incidentList['2handler'].name = '待处理';
+            delete this.incidentList['3overtime'];
+            this.getIncidentList('1pending');
+            this.getIncidentList('2handler');
+          }
+        }else{
+          this.config = {};
+          this.showConfig();
+        }
+      });
+  }
+  // 计算可视区范围展示信息的条数
+  pageSize = 0;
+  computedNum(){
+    let h = (document.querySelector('.lists_box') as HTMLElement).offsetHeight;
+    this.pageSize = Math.floor((h / 145));
+  }
+
+  // 刷新故障工单列表
+  refreshIncidentList() {
+    if(this.config.showOvertime == 1){
+      this.getIncidentList('1pending');
+      this.getIncidentList('2handler');
+      this.getIncidentList('3overtime');
+    }else{
+      this.getIncidentList('1pending');
+      this.getIncidentList('2handler');
+    }
+  }
+
+  // 获取故障工单状态
+  incidentStatusList:any[] = [];
+  getIncidentStatusList() {
+    this.mainService.getDictionary("list", "incident_status").subscribe((result) => {
+      this.incidentStatusList = result || [];
+      this.getConfig();
+    });
+  }
+
+  // 获取故障工单列表
+  loading:boolean = false;
+  incidentList:any = {
+    '1pending': {
+      name: '待接单',
+      list: [],
+    },
+    '2handler': {
+      name: '待处理',
+      list: [],
+    },
+    // '3overtime': {
+    //   name: '延期处理',
+    //   list: [],
+    // }
+  }
+  getIncidentList(type: string) {
+    this.loading = true;
+    let postData: any = {
+      idx: 0,
+      sum: 99999,
+      incident: {
+        deleteFlag: 0,
+				candidateGroups: this.config.groupIds ? this.config.groupIds.toString() : undefined,
+				dutyIds: this.config.deptIds.toString(),
+        queryTask: 'queryAll',
+      },
+    };
+    if(type == '1pending'){
+      postData.incident.statusId = this.incidentStatusList.find(v => v.value === 'pending').id;
+    }else if(type == '2handler'){
+      postData.incident.statusId = this.incidentStatusList.find(v => v.value === 'handler').id;
+      postData.incident.overtime = this.config.showOvertime == 1 ? 0 : undefined;
+    }else if(type == '3overtime'){
+      postData.incident.statusId = this.incidentStatusList.find(v => v.value === 'handler').id;
+      postData.incident.overtime = 1;
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "incident", postData)
+      .subscribe((res:any) => {
+        this.loading = false;
+
+        let list = res.list || [];
+        this.incidentList[type].list = chunk(list, this.pageSize);
+        // console.log(this.incidentList)
+
+        this.startSwiper(type);
+        this.startGetList();
+      });
+  }
+
+  // 优先级颜色
+  priorityColor(priorityId) {
+    // 极低|低
+    if(priorityId == 1 || priorityId == 2){
+      return '';
+    } else if(priorityId == 3){
+      return 'yellow';
+    } else if(priorityId == 4 || priorityId == 5){
+      return 'red';
+    }
+  }
+
+  // 保存
+  btnLoading:boolean = false;
+  submitForm(){
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty({ onlySelf: true });
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) return;
+    this.btnLoading = true;
+    let postData = {
+      id: this.config.id || undefined,
+      hosId: this.tool.getCurrentHospital().id,
+      userId: this.tool.getCurrentUserInfo().id,
+      deptIds: this.validateForm.value.deptIds.toString(),
+      groupIds: this.validateForm.value.groupIds.toString() || undefined,
+      showOvertime: this.validateForm.value.showOvertime,
+      refreshSeconds: this.validateForm.value.refreshSeconds,
+      rollingSeconds: this.validateForm.value.rollingSeconds,
+    }
+    this.mainService
+      .simplePost("addData", "incidentViewConfig", postData)
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.hideModal();
+        if (data.status == 200) {
+          this.showDropdown = false;
+          this.message.success("保存成功");
+          this.getConfig();
+        } else {
+          this.message.error(data.msg || '保存失败');
+        }
+      });
+  }
+
+  // 详情-弹窗
+  detailModalShow = false; //弹窗开关
+  coopData:any = {};
+  openItsmDetails(data) {
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
+
+  // 回到系统管理
+  toMain() {
+    this.router.navigateByUrl("main");
+  }
+
+  // 退出
+  logOut(): void {
+    // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
+    localStorage.removeItem("user");
+    localStorage.removeItem("menu");
+    localStorage.removeItem("index");
+
+    // 假退出
+    this.mainService.logOut().subscribe((data) => {
+      if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
+        localStorage.removeItem("user");
+        localStorage.removeItem("menu");
+        localStorage.removeItem("index");
+      }
+    });
+  }
+
+  // 处理人+协同人
+  transferSynergetic(incidentData){
+    let str = incidentData.groupORHandlerUser || "";
+    if(incidentData.synergetic && incidentData.synergetic.length){
+        str += '，' + incidentData.synergetic.map(v => v.name).join('，');
+    }
+    return str;
+  }
+}

src/app/views/realtime-broadcast/realtime-broadcast.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { RealtimeBroadcastRoutingModule } from './realtime-broadcast-routing.module';
+import { RealtimeBroadcastComponent } from './realtime-broadcast.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
+
+
+@NgModule({
+  declarations: [
+    RealtimeBroadcastComponent,
+  ],
+  imports: [
+    CommonModule,
+    RealtimeBroadcastRoutingModule,
+    ShareModule,
+    IncidentDetailModule,
+  ]
+})
+export class RealtimeBroadcastModule { }

src/app/views/repository-manage/repository-manage.component.html

@@ -11,7 +11,7 @@
 				    </ng-container>
 				  </nz-select>
 				</div>
-				
+
         <div class="list-template__searchItem">
           <span class="label">标题：</span>
           <input nz-input class="formItem" [(ngModel)]="title" placeholder="请输入标题" nzSize="default" />
@@ -20,6 +20,18 @@
           <span class="label">编号：</span>
           <input nz-input class="formItem" [(ngModel)]="solutionNumber" placeholder="请输入编号" nzSize="default" />
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">创建人</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择创建人" [(ngModel)]="createUserId">
+            <ng-container *ngFor="let option of createUserList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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 nz-col nzLg="6" class="list-template__btns">
         <button class="btn default" (click)='search()'>搜索</button>
@@ -49,11 +61,11 @@
 						<td>
 							<div>V{{ data.versionNumber }}</div>
 							<div>{{ data.type ? data.type.name : '-' }}</div>
-						</td>	
+						</td>
 						<td>
 							<div>{{ data.createUser.name }}</div>
 							<div>{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}</div>
-						</td>	
+						</td>
 						<td>{{ data.status ? data.status.name : '-' }}</td>
             <td>
               <div class="coop">
@@ -84,7 +96,7 @@
       <!-- <overlay-scrollbars #osComponentRef1 class="content"> -->
        <div class="view-box">
 				 <div class="view-item left-box">
-					 <div class="item-left-list" 
+					 <div class="item-left-list"
 					 [ngClass]="{'activeClass': index == vIndex}"
 					 *ngFor="let item of detailData let index=index;" (click)="versionsClick(item, index)">V{{item.versionNumber}}</div>
 				 </div>
@@ -111,7 +123,7 @@
 						 </div>
 					 </div>
 				 </div>
-				 <div class="view-item right-box" *ngIf="solutionLogs"> 
+				 <div class="view-item right-box" *ngIf="solutionLogs">
 					 <nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
 						<ng-container *ngFor="let item of solutionLogs; let index = index">
 						    <nz-step
@@ -148,7 +160,7 @@
 				<button class="btn" *ngIf="optType=='audit' && vIndex==0" nz-button nzType="primary" (click)="submitForm(2)" [nzLoading]="btnLoading2">驳回</button>
 				<button class="btn cancel" *ngIf="optType=='audit'" nz-button nzType="default" (click)="hideModal()">取消</button>
 				<button class="btn" *ngIf="optType=='look'" nz-button nzType="primary" (click)="hideModal()">知道了</button>
-				
+
 			</div>
 			<div class="mask-style" *ngIf="isSpinning">
 				<nz-spin nzSimple class="spin-style"></nz-spin>
@@ -158,19 +170,19 @@
   <!-- 删除模态框 -->
   <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmDel()" content="您确认要删除此知识库吗？"></app-dialog-delete>
-	
+
 	<!-- 停用模态框 -->
 	<app-dialog-delete [delModal]="pauseModal" (hideDelModalEvent)="hideDelModal2()" [btnLoading]="btnLoading"
 	  (confirmDelEvent)="confirmDel2()" content="您确认要停用此知识库吗？"></app-dialog-delete>
-		
+
 	<!-- 恢复模态框 -->
 	<app-dialog-delete [delModal]="renewModal" (hideDelModalEvent)="hideDelModal3()" [btnLoading]="btnLoading"
 		(confirmDelEvent)="confirmDel3()" content="您确认要恢复此知识库吗？"></app-dialog-delete>
-		
+
 	<!-- 审核通过模态框 -->
 	<app-dialog-delete [delModal]="auditModal" (hideDelModalEvent)="hideDelModal4()" [btnLoading]="btnLoading"
 		(confirmDelEvent)="confirmDel4()" content="您确认通过此知识库的审核吗？"></app-dialog-delete>
-	
+
 	<!-- 审核驳回模态框 -->
 	<nz-modal [(nzVisible)]="rejectModal" nzTitle="您确认驳回此知识库吗？" (nzOnCancel)="rejectCancel()" (nzOnOk)="rejectOk()">
 		<textarea
@@ -178,10 +190,10 @@
 			[(ngModel)]="rejectData"
 			placeholder="请输入整改意见"
 			[nzAutosize]="{ minRows: 2, maxRows: 6 }"
-			
+
 		></textarea>
 	</nz-modal>
-			
+
   <!-- 编辑模态框 -->
   <app-dialog-delete [delModal]="editModal" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="saveLoading"
     (confirmDelEvent)="confirmDel1()" [content]="'保存后会重置您的发药科室的药品信息，您确认吗？'"></app-dialog-delete>

src/app/views/repository-manage/repository-manage.component.ts

@@ -39,10 +39,15 @@ export class RepositoryManageComponent implements OnInit {
     private http: HttpClient,
 		private sanitizer: DomSanitizer
   ) {}
+  searchTimerSubject = new Subject();
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
 
     });
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1], v[2]);
+    });
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.maintainDept = this.tool.getUserInfoPermission().dutyList
@@ -50,7 +55,9 @@ export class RepositoryManageComponent implements OnInit {
 			this.defaDept()
 		}
 		this.getList();
+    this.getUsers();
   }
+  createUserList: any = []; //创建人列表
 	maintainDept:any = []; //维修科室
 	maintainDepartment:any;
 	hosIds:any; //当前院区
@@ -68,6 +75,7 @@ export class RepositoryManageComponent implements OnInit {
 	hosId: number;
 	loadAllConsumeDept: boolean = true;//是否加载所有消耗科室
   solutionNumber; //编号
+  createUserId; //创建人
 	title; //标题
   num; //编码
   deptalias; //别名
@@ -115,7 +123,7 @@ export class RepositoryManageComponent implements OnInit {
     this.coopData = data;
     this.showDelModal1();
   }
-	
+
 	// 默认科室
 	defaDept(){
 		let itemDept = this.maintainDept.find(i=>i.id == this.hosId)
@@ -123,7 +131,7 @@ export class RepositoryManageComponent implements OnInit {
 			this.maintainDepartment = itemDept.id
 		}
 	}
-	
+
   showDelModal1() {
     this.editModal = true;
   }
@@ -170,6 +178,7 @@ export class RepositoryManageComponent implements OnInit {
     this.pageIndex = 1;
 		this.solutionNumber = null;
 		this.title = null;
+    this.createUserId = undefined;
 		if(this.coopBtns.strideLook){
 			this.defaDept()
 		}
@@ -185,6 +194,7 @@ export class RepositoryManageComponent implements OnInit {
       solution: {
     		title:this.title,
 				solutionNumber:this.solutionNumber,
+        createUserId: this.createUserId || undefined,
     		hosId: this.hosId,
       },
     };
@@ -533,4 +543,36 @@ export class RepositoryManageComponent implements OnInit {
 		this.router.navigateByUrl(`/dispensingDetail/${data.id}`);
   }
 
+  // 人员边输边搜节流阀
+  changeUser(e) {
+    this.searchTimer(this.getUsers, e);
+  }
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 获取创建人
+  isLoading:boolean = false;
+  getUsers(e?) {
+    let postData = {
+      user: {
+        name: e,
+        hospital: { id: this.hosId },
+        simpleQuery: true,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.createUserList = data.list;
+      });
+  }
+
 }

src/app/views/users-management/users-management.component.ts

@@ -257,8 +257,9 @@ export class UsersManagementComponent implements OnInit {
     };
     let groupData = {
       group2: {
-        hospitals: hid,
+        hospitals: this.coopBtns.crossHospital ? undefined : hid,
         typeIds: '1,3',
+        crossHospital: this.coopBtns.crossHospital ? hid : undefined,
       },
       idx: 0,
       sum: 9999,
@@ -304,8 +305,9 @@ export class UsersManagementComponent implements OnInit {
     };
     let groupData = {
       group2: {
-        hospitals: id,
+        hospitals: this.coopBtns.crossHospital ? undefined : id,
         typeIds: '1,3',
+        crossHospital: this.coopBtns.crossHospital ? id : undefined,
       },
       idx: 0,
       sum: 9999,
@@ -474,8 +476,9 @@ export class UsersManagementComponent implements OnInit {
     };
     let groupData = {
       group2: {
-        hospitals: hid,
+        hospitals: this.coopBtns.crossHospital ? undefined : hid,
         typeIds: '1,3',
+        crossHospital: this.coopBtns.crossHospital ? hid : undefined,
       },
       idx: 0,
       sum: 9999,