工时管理开发

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

@@ -0,0 +1,152 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="priorityTable">
+      <div class="list-template__content">
+        <div class="list-template__bottom">
+         <div class="list-template__top" nz-row>
+            <div nz-col nzLg="24" class="list-template__btns">
+              <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="priorityList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="35%">科室名称</th>
+                <th nzWidth="35%">故障现象</th>
+                <th nzWidth="10%">处理组</th>
+                <th nzWidth="10%">处理人</th>
+                <th nzWidth="10%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of priorityList;let i = index">
+                <td>{{data.dept}}</td>
+                <td>{{data.category}}</td>
+                <td>{{data.handleGroupDTO?data.handleGroupDTO.groupName:''}}</td>
+                <td>{{data.handleUserDTO?data.handleUserDTO.name:''}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+                    <span (click)="editPriority(data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+					<div class="list-template__pagination">
+					  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+					    (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+					  </nz-pagination>
+					</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalPriority">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hidePriorityModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validatePriorityForm" class="addForm">
+				<nz-form-item>
+				 <nz-form-label nzRequired nzFor="department" [nzSpan]="6">科室</nz-form-label>
+				 <nz-form-control nzErrorTip="请选择科室!" [nzSpan]="18">
+				   <nz-input-group>
+				 		<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择申请科室" formControlName="department">
+				 		  <ng-container *ngFor="let option of hospitals">
+				 		    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+				 		  </ng-container>
+				 		  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+				 		    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				 		  </nz-option>
+				 		</nz-select>
+				 	</nz-input-group>
+				 </nz-form-control>
+				</nz-form-item>
+				
+        <nz-form-item>
+          <nz-form-label nzFor="malfunction" [nzSpan]="6">故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="18">
+          	<!-- <nz-cascader [nzOptions]="malfunctionData" nzMode="multiple"
+          		formControlName="malfunction" 
+          		nzPlaceHolder="请选择故障现象">
+          	</nz-cascader> -->
+						<!-- <nz-tree-select
+							nzPlaceHolder="请选择故障现象"
+							formControlName="malfunction" 
+							[nzNodes]="malfunctionData"
+							[nzMultiple]="true"
+						>
+						</nz-tree-select> -->
+						<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="malfunction" >
+						  <ng-container *ngFor="let option of malfunctionData">
+						    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						  <nz-option *ngIf="isDeptLoading" 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 nzRequired nzFor="handleGroup" [nzSpan]="6">处理组</nz-form-label>
+           <nz-form-control nzErrorTip="请选择处理组!" [nzSpan]="18">
+             <nz-input-group>
+           		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择处理组" formControlName="handleGroup">
+           		  <ng-container *ngFor="let option of allUserGroup">
+           		    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+           		  </ng-container>
+           		  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+           		    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+           		  </nz-option>
+           		</nz-select>
+           	</nz-input-group>
+           </nz-form-control>
+        </nz-form-item>
+				
+				<nz-form-item>
+					<nz-form-label nzRequired nzFor="binding" [nzSpan]="7">是否绑定人员</nz-form-label>
+					<nz-form-control nzErrorTip="请选择!" [nzSpan]="17">
+						<nz-radio-group formControlName="binding" (ngModelChange)="changeRadio($event)">
+						  <label nz-radio nzValue="1">是</label>
+						  <label nz-radio nzValue="0">否</label>
+						</nz-radio-group>
+					</nz-form-control>
+				</nz-form-item>
+				
+        <nz-form-item *ngIf="validatePriorityForm.value.binding==1">
+          <nz-form-label nzRequired nzFor="handleUser" [nzSpan]="6">处理人</nz-form-label>
+          <nz-form-control nzErrorTip="请选择处理人!" [nzSpan]="18">
+            <nz-input-group>
+          		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp3($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择处理人" formControlName="handleUser">
+          		  <ng-container *ngFor="let option of userData">
+          		    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          		  </ng-container>
+          		  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+          		    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+          		  </nz-option>
+          		</nz-select>
+          	</nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,290 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 20px;
+      background-color: #fff;
+      .contentInner{
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .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: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > 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: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+							.ant-select{
+								width: 100% !important;
+							}
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,382 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { MainService } from "../../../services/main.service";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-deptUser",
+  templateUrl: "./configuration-deptUser.component.html",
+  styleUrls: ["./configuration-deptUser.component.less"],
+})
+export class ConfigurationDeptUserComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+	pageIndex: number = 1; //页码
+	listLength: number = 10; //总条数
+	pageSize: number = 10; //每页条数
+	hosId:any;
+	hospitals:any = [];
+	isDeptLoading: boolean = false;
+	searchParentDeptSubject = new Subject();
+	searchParentUserSubject = new Subject();
+	currentHospital:any;
+	malfunctionData:any = [];
+	allUserGroup:any = [];
+	userData:any = [];
+	
+  formatterMinute = (value: number) => `${value} 分钟`;
+  parserMinute = (value: string) => value.replace(' 分钟', '');
+
+  ngOnInit() {
+		this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isDeptLoading = true;
+			this.getDeparts(e);
+		});
+		this.searchParentUserSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isDeptLoading = true;
+			this.getUser(e);
+		});
+		
+    // 优先级
+    setTimeout(() => {
+      this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
+    }, 100)
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.currentHospital = this.tool.getCurrentHospital();
+    this.getPriorityList();
+		this.getMalfunction()
+		this.getDeparts('')
+		this.getUser('');
+		this.getGrop()
+  }
+
+  // 新增优先级弹框
+  modelName = ""; //模态框名称
+  modalPriority: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addPriorityModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalPriority = true;
+    this.initPriorityForm();
+  }
+  //关闭新增/编辑弹框
+  hidePriorityModal() {
+    this.modalPriority = false;
+  }
+	
+	changeInp(e) {
+	  this.searchParentDeptSubject.next(e);
+	}
+	
+	changeInp3(e){
+		this.searchParentUserSubject.next(e);
+	}
+	
+	// 获取所有科室
+	getDeparts(dept) {
+	  var that = this;
+	  let data = {
+	    department: {
+	      dept,
+	      hospital: {
+	        id: this.hosId
+	      },
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+		that.mainService
+		  .getFetchDataList("data", "department", data)
+		  .subscribe((data) => {
+				setTimeout(_=>{
+					this.hospitals = data.list
+					that.isDeptLoading = false;
+				},100)
+		  });
+	}
+	
+	// 获取故障现象数据
+	getMalfunction(){
+		if(!this.currentHospital.type || (this.currentHospital.type && this.currentHospital.type.value !== '6')){
+		  this.malfunctionData = [];
+		  return;
+		};
+		let postData = {
+			hasThird: 'true',
+		  category: {
+		    dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
+		  },
+		};
+		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+		  let incidentCategoryList = res.data || [];
+		  incidentCategoryList = incidentCategoryList.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, title: v.category, key: v.id, isLeaf: false}));
+		  let arr = this.tool.tranListToTreeDataLeaf(incidentCategoryList, undefined, "parentId");
+			for(let i of arr){
+				for(let t of i.children){
+					for(let x of t.children){
+						this.malfunctionData.push({
+							name:x.mutiCategory,
+							id:x.id
+						})
+					}
+				}
+			}
+		})
+	}
+	
+	// 获取处理组
+	getGrop(){
+		let groupData = {
+		  group2: {
+		    hospitals: this.hosId,
+		    type:1
+		  },
+		  idx: 0,
+		  sum: 9999,
+		};
+		this.mainService
+		  .getFetchDataList("data", "group2", groupData)
+		  .subscribe((data) => {
+		    this.allUserGroup = data.list;
+		  });
+	}
+	
+	// 获取处理人
+	getUser(name){
+		let data = {
+			idx: 0,
+			sum: 20,
+			user: {
+				name:name,
+				hospital: { id: this.hosId || "" },
+			},
+		};
+		this.mainService
+			.getFetchDataList("data", "user", data)
+			.subscribe((data) => {
+				setTimeout(_=>{
+					this.isDeptLoading = false
+					this.userData = data.list;
+				},100)
+			});
+	}
+	
+  // 编辑
+  editPriority(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalPriority = true;
+    this.initPriorityForm();
+    this.coopData = data;
+		let deptArr = []
+		for(let i of data.deptList){
+			deptArr.push(i.id)
+		}
+    this.validatePriorityForm.controls.department.setValue(deptArr);
+    this.validatePriorityForm.controls.handleGroup.setValue(data.handleGroupDTO.id);
+		this.validatePriorityForm.controls.binding.setValue(data.handleUserDTO?'1':'0')
+		if(data.handleUserDTO){
+			this.validatePriorityForm.controls.handleUser.setValue(data.handleUserDTO.id);
+		}
+		if(data.categoryList){
+			let malfunction = []
+			for(let i of data.categoryList){
+				malfunction.push(i.id)
+			}
+			this.validatePriorityForm.controls.malfunction.setValue(malfunction)
+			// let arr = []
+			// for(let i of this.coopData.categoryList){
+			// 	arr.push(this.tool.tranListToTreeDataFindIdsLeaf(this.malfunctionData,i.id))
+			// }
+			// this.validatePriorityForm.controls.malfunction.setValue(arr);
+		}
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitPriorityForm(): void {
+    for (const i in this.validatePriorityForm.controls) {
+      this.validatePriorityForm.controls[i].markAsDirty();
+      this.validatePriorityForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validatePriorityForm.invalid) {
+      return;
+    }
+    console.log(this.validatePriorityForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+		let malfunction = this.validatePriorityForm.value.malfunction
+    if (this.add) {
+      //增加
+      postData = {
+				deptIds:this.validatePriorityForm.value.department.join(','), //科室
+				categoryIds: malfunction.join(','),//故障
+				handleGroup: this.validatePriorityForm.value.handleGroup,//处理组
+				handleUser: this.validatePriorityForm.value.handleUser,//处理人
+				hosId:this.hosId
+      };
+    } else {
+      //编辑
+      postData = {
+				...this.coopData,
+				deptIds:this.validatePriorityForm.value.department.join(','), //科室
+				categoryIds: malfunction.join(','),//故障
+				handleGroup: this.validatePriorityForm.value.handleGroup,//处理组
+				handleUser: this.validatePriorityForm.value.handleUser,//处理人
+				hosId:this.hosId
+      };
+    }
+    this.mainService
+      .simplePost("addData", "incidentAssignManager", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hidePriorityModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+	
+	changeRadio(e){
+		if(this.validatePriorityForm.value.binding=='1'){
+			this.validatePriorityForm = this.fb.group({
+			  department: [this.validatePriorityForm.value.department, [Validators.required]],//科室
+			  malfunction: [this.validatePriorityForm.value.malfunction, []],//故障
+			  handleGroup: [this.validatePriorityForm.value.handleGroup, [Validators.required]],//处理组
+				binding:['1',[Validators.required]],//是否绑定人员
+			  handleUser: [this.validatePriorityForm.value.handleUser, [Validators.required]],//处理人
+			});
+		}else{
+			this.validatePriorityForm = this.fb.group({
+			  department: [this.validatePriorityForm.value.department, [Validators.required]],//科室
+			  malfunction: [this.validatePriorityForm.value.malfunction, []],//故障
+			  handleGroup: [this.validatePriorityForm.value.handleGroup, [Validators.required]],//处理组
+				binding:['0',[Validators.required]],//是否绑定人员
+			  handleUser: [this.validatePriorityForm.value.handleUser, []],//处理人
+			});
+		}
+	}
+	
+  // 初始化新增form表单
+  validatePriorityForm: FormGroup; //新增/编辑表单
+  initPriorityForm() {
+    this.validatePriorityForm = this.fb.group({
+      department: [null, [Validators.required]],//科室
+      malfunction: [null, []],//故障
+      handleGroup: [null, [Validators.required]],//处理组
+			binding:['0',[Validators.required]],//是否绑定人员
+      handleUser: [null, []],//处理人
+    });
+    console.log(this.validatePriorityForm.controls)
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  priorityList: any[] = []; //表格数据
+  tablePriorityHeight:number = 0;
+  getPriorityList() {
+    let data = {
+			idx: this.pageIndex - 1,
+			sum: this.pageSize,
+			incidentAssignManager: {
+				hosId: this.hosId || "" ,
+			},
+		};
+		this.loading1 = true;
+		this.mainService
+			.getFetchDataList("data", "incidentAssignManager", data)
+			.subscribe((data) => {
+				this.loading1 = false;
+				for(let i of data.list){
+					i.dept = i.deptList.map(t=>{
+						return t.dept
+					})
+					if(i.categoryList){
+						i.category = i.categoryList.map(t=>{
+							return t.mutiCategory
+						})
+						i.category= i.category.join('、')
+					}
+					i.dept = i.dept.join('、')
+				}
+				this.priorityList = data.list
+				console.log(8888,this.priorityList)
+				this.listLength = data.totalNum;
+			});
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+		let ids = this.coopData.ids.split(',')
+    this.btnLoading = true;
+		//删除-优先级
+		this.mainService
+			.simplePost("rmvData", "incidentAssignManager", ids)
+			.subscribe((data) => {
+				this.btnLoading = false;
+				this.delModal = false;
+				if (data.status == 200) {
+					this.showPromptModal(this.tipsMsg2, true, "");
+				} else {
+					this.showPromptModal(this.tipsMsg2, false, data.msg);
+				}
+			});
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getPriorityList();
+  }
+}

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -0,0 +1,108 @@
+
+<div class="content">
+  <div class="contentInner">
+    <div class="address">
+      <div class="contentHead">工时大类
+				<div>
+					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id" (click)="delCategoryModal(1)">删除</button>
+					<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button>
+				</div>
+			</div>
+      <overlay-scrollbars #osComponentRef1 class="contentBody">
+        <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
+        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }}</div>
+      </overlay-scrollbars>
+    </div>
+    <div class="address">
+      <div class="contentHead">工时小类
+				<div>
+					<button nz-button class="mar-rig-10 btn cancel" *ngIf="activeCategory2.id && activeCategory1.id" nzType="default" nzSize="small" (click)="delCategoryModal(2)">删除</button>
+					<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button>
+				</div>
+			</div>
+      <overlay-scrollbars #osComponentRef2 class="contentBody">
+        <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
+        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }}</div>
+      </overlay-scrollbars>
+    </div>
+  </div>
+</div>
+
+
+<!-- 新增-->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalCategory">
+  <div class="modalBody">
+    <div class="title">新增<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateCategoryForm" class="addForm">
+				<nz-form-item *ngIf="coopType === 2">
+				  <nz-form-label [nzSpan]="6" nzFor="workName">大类工时名称</nz-form-label>
+				  <nz-form-control [nzSpan]="18">
+				    <nz-input-group>
+							<div>
+								{{activeCategory1.workName}}
+							</div>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="5" nzRequired nzFor="workName">工时名称</nz-form-label>
+				  <nz-form-control [nzSpan]="19" nzErrorTip="请填写工时名称!">
+				    <nz-input-group>
+				      <input nz-input formControlName="workName" placeholder="请填写工时名称" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="5" nzRequired nzFor="workUnit">单位</nz-form-label>
+				  <nz-form-control [nzSpan]="19" nzErrorTip="请填写单位(2个字以内)!">
+				    <nz-input-group>
+				      <input nz-input (input)="handleInput($event)" formControlName="workUnit" placeholder="请填写单位(2个字以内)" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="5" nzRequired nzFor="wage">工价</nz-form-label>
+				  <nz-form-control [nzSpan]="19" nzErrorTip="请填写工价!">
+				   <nz-input-number
+							formControlName="wage"
+				    	[nzMin]="0"
+							[nzPrecision]="2"
+				    	[nzMax]="999999"
+				    	[nzStep]="0.1"
+				    	[nzPlaceHolder]="'请填写工价(保留2位小数)'"
+				    ></nz-input-number>
+				  </nz-form-control>
+				</nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="integral">工时积分</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择工时积分!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear formControlName="integral" nzPlaceHolder="请选择工时积分">
+              <ng-container *ngFor="let option of scoreList">
+                <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>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitCategoryForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideCategoryModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" 
+  (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="确定要删除吗？" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.less

@@ -0,0 +1,303 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+
+  .hospitalConfig{
+    height: 60px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 72px;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+		padding: 20px 300px;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+				.mar-rig-10{
+					margin-right: 10px;
+				}
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .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: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > 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: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+							.ant-input-number{
+								width: 100% !important;
+							}
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,311 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { MainService } from "../../../services/main.service";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from "ng-zorro-antd";
+
+@Component({
+  selector: "app-configuration-manHour",
+  templateUrl: "./configuration-manHour.component.html",
+  styleUrls: ["./configuration-manHour.component.less"],
+})
+export class ConfigurationManHourComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+		private message: NzMessageService,
+  ) {}
+
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: OverlayScrollbarsComponent;
+
+  coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
+  // 部门设置、全院设置
+  hospitalConfig:any = 2;
+  hospitalConfigList:any = [
+    // { id: 1, name: '部门设置',},
+    { id: 2, name: '全院设置',},
+  ];
+	hosId:any;
+  debounceSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    this.debounceSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0]){
+        this.getCategoryList(v[0], v[1].id);
+      }
+    });
+
+    this.currentHospital = this.tool.getCurrentHospital();
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.getCategoryList(1);
+    this.getScores();
+  }
+
+	
+	// 监听单位输入
+	workUnitshow:boolean = false;
+	handleInput(event: KeyboardEvent){
+		const input = event.target as HTMLInputElement;
+		if (input.value.length>2) {
+			this.workUnitshow = true
+		} else{
+			this.workUnitshow = false
+		}
+	}
+	
+  // 获取积分
+  scoreList: any = [];
+  getScores() {
+    let postData = {
+      dictionary: {
+        key: "incident_category_score"
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", postData)
+      .subscribe((data) => {
+        this.scoreList = data.list || [];
+      });
+  }
+
+  // 点击故障现象
+  activeCategory1:any = {};
+  activeCategory2:any = {};
+  activeCategory3:any = {};
+	listType:any = 1;
+  clickCategory(item, type:number){
+		this.listType = type
+    switch(type){
+      case 1:
+        this.categoryList2 = [];
+        this.categoryList3 = [];
+        this.activeCategory2 = {};
+        this.activeCategory3 = {};
+        break;
+      case 2:
+        this.categoryList3 = [];
+        this.activeCategory3 = {};
+        break;
+    }
+    this['activeCategory' + type] = item;
+    console.log(this['activeCategory' + type])
+    switch(type){
+      case 1:
+        this.categoryLoading2 = true;
+        this.loading1 = true;
+        this.debounceSubject.next([2, item]);
+        break;
+      case 2:
+        this.categoryLoading3 = true;
+        this.loading1 = true;
+        this.debounceSubject.next([3, item]);
+        break;
+    }
+  }
+	
+	// 取消删除弹框
+	cancelDel(){
+		this.hideDelModal();
+	}
+	
+	// 确认删除
+	confirmDel() {
+	  let that = this;
+	  that.btnLoading = true;
+	  that.mainService
+	    .coopTypeConfig('rmvData', 'workHourManagement', [this['activeCategory' + this.listType].id])
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideDelModal();
+	      if (data["status"] == 200) {
+	        that.showPromptModal("删除", true, "");
+	      } else {
+	        that.showPromptModal("删除", false, data["msg"]);
+	      }
+	    });
+	}
+	
+	// 关闭删除模态框
+	hideDelModal() {
+	  this.delModal = false;
+	}
+
+  // 获取工时
+  loading1:boolean = false;
+  tableCategoryHeight:number = 0;
+  categoryList1: any[] = [];
+  categoryList2: any[] = [];
+  categoryList3: any[] = [];
+  categoryLoading1:boolean = false;
+  categoryLoading2:boolean = false;
+  categoryLoading3:boolean = false;
+  getCategoryList(type:number, parentId = 0) {
+    setTimeout(() => {
+      this['categoryLoading' + type] = true;
+    }, 0)
+    let postData = {
+			idx: 0,
+			sum: 99999,
+			workHourManagement: {
+				hosId: this.hosId,
+				treeLevel: type,
+				parent: type === 1 ? null : { id: parentId }
+			}
+    };
+		this.mainService
+		  .getFetchDataList("data", "workHourManagement", postData)
+		  .subscribe((res) => {
+		    this['categoryLoading' + type] = false;
+		    this['categoryList' + type] = res.list || [];
+		  });
+  }
+
+  // 新增故障现象弹框
+  modelName = ""; //模态框名称
+  add: boolean; //true:新增；false:编辑
+  modalCategory: boolean = false; //新增/编辑模态框
+  coopType: number = 0;
+  addCategoryModal(type:number) {
+    this.coopType = type;
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalCategory = true;
+    this.initCategoryForm();
+  }
+	
+	// 删除工时
+	delModal: boolean = false; //删除模态框
+	delCategoryModal(type:number){
+		this.coopType = type;
+		this.delModal = true
+	}
+	
+  //关闭新增/编辑弹框
+  hideCategoryModal() {
+    this.modalCategory = false;
+  }
+
+  // 初始化新增form表单
+  validateCategoryForm: FormGroup; //新增/编辑表单
+  initCategoryForm() {
+    this.validateCategoryForm = this.fb.group({
+      workName: [null, [Validators.required]],//名称
+			workUnit: [null, [Validators.required]],//单位
+			wage: [null, [Validators.required]],//工价
+			integral: [null, [Validators.required]],//工时积分
+    });
+  }
+
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitCategoryForm(): void {
+    for (const i in this.validateCategoryForm.controls) {
+      this.validateCategoryForm.controls[i].markAsDirty();
+      this.validateCategoryForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateCategoryForm.invalid) {
+      return;
+    }
+		if(this.workUnitshow){
+			this.message.error('单位长度不能多于2位')
+			return;
+		}
+    console.log(this.validateCategoryForm.value);
+    this.btnLoading = true;
+    // -----------------------------------
+    let postData:any = {
+			...this.validateCategoryForm.value,
+			integral:{
+				id:this.validateCategoryForm.value.integral
+			},
+			hosId: this.hosId,
+			treeLevel: this.coopType,
+			parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
+    };
+			
+		this.mainService
+			.simplePost("addData", "workHourManagement", postData)
+			.subscribe((data) => {
+				this.btnLoading = false;
+				if (data.status == 200) {
+					this.modalCategory = false
+					this.showPromptModal("新增", true, "");
+				} else {
+					this.showPromptModal("新增", false, data.msg);
+				}
+			});
+    // -----------------------------------
+  }
+
+  // 初始化新增form表单
+  validateConfigForm: FormGroup; //新增/编辑表单
+  initConfigForm() {
+    this.validateConfigForm = this.fb.group({
+      hosId: [null, [Validators.required]],//院区
+      dutyId: [null, [Validators.required]],//责任部门
+      priority: [null, [Validators.required]],//优先级
+      score: [null, [Validators.required]],//积分
+      userGroup: [1, [Validators.required]],//分配方式
+      userId: [null],//维修人
+      groupId: [null, [Validators.required]],//维修组
+    });
+    console.log(this.validateConfigForm.controls)
+  }
+	
+	// 获取当前选中的故障现象索引
+	get currentCategoryIndex(){
+	  if(this.activeCategory3.id){
+	    return 3;
+	  }
+	  if(this.activeCategory2.id){
+	    return 2;
+	  }
+	  if(this.activeCategory1.id){
+	    return 1;
+	  }
+	}
+	
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    if(this.coopType !== 0){
+      this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
+    }else{
+      this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
+    }
+  }
+}

src/app/services/tool.service.ts

@@ -257,7 +257,7 @@ export class ToolService {
   tranListToTreeDataLeaf(list:Array<any>, rootValue:any, parentKeyName:string, keyName:string = 'id'):Array<any> {
     return list.filter((t) => {
       let children = this.tranListToTreeData(list, t[keyName], parentKeyName, keyName);
-      if(!children.length){
+			if(!children.length){
         t.isLeaf = true;
       }
       return t[parentKeyName] === rootValue

src/app/share/wang-editor/wang-editor.component.html

@@ -1,4 +1,7 @@
 <div class="wangeditor-box">
 	<div id="editorMenu" class="editor-class"></div>
 	<div id="editor"></div>
+	<div class="mask-style" *ngIf="isLoading">
+		<nz-spin nzSimple class="spin-style"></nz-spin>
+	</div>
 </div>

src/app/share/wang-editor/wang-editor.component.less

@@ -16,5 +16,19 @@
 		  border: 1px solid #ccc !important;
 		}
 	}
-
+	.mask-style{
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99999;
+		display: flex;
+		background: rgba(0,0,0,0.5);
+		align-items: center;
+		justify-content: center;
+		.spin-style{
+			z-index:9999;
+		}
+	}
 }

src/app/share/wang-editor/wang-editor.component.ts

@@ -1,48 +1,115 @@
 import { Component, ElementRef, Output, Input, OnInit, EventEmitter } from '@angular/core';
 import WangEditor from 'wangeditor';
+import { HttpHeaders, HttpRequest, HttpClient  } from "@angular/common/http";
+import host from "../../../assets/js/http";
+import { NzMessageService } from "ng-zorro-antd";
+
 @Component({
   selector: 'app-wang-editor',
   templateUrl: './wang-editor.component.html',
   styleUrls: ['./wang-editor.component.less']
 })
 export class wangEditorComponent implements OnInit {
+	
 	@Output() changeContent = new EventEmitter();
 	@Input() content: string;
 	editor: any;
+	isLoading:boolean=false;
 	constructor(
-
+		private http: HttpClient,
+		private message: NzMessageService
 	) { }
 	
   ngOnInit() {
+		// if(this.editor){
+		// 	this.editors()
+		// }
 		this.editor = new WangEditor('#editorMenu', '#editor');
 		this.setEditorConfig()
-		this.editor.create();
-		// 设置内容
-		this.setContent()
   }
 	
 	// 编辑器相关配置设置
 	setEditorConfig () {
 		// 使用 base64 保存图片
-		this.editor.config.uploadImgShowBase64 = true;
+		this.editor.config.uploadImgShowBase64 = false;
 		// 菜单展示项配置
-		// this.editor.config.menus = this.getMenuConfig();
+		this.editor.config.menus = this.getMenuConfig();
 		// 自定义配置颜色（字体颜色、背景色）
 		this.editor.config.colors = this.getColorConfig();
 		// 表情面板可以有多个 tab ，因此要配置成一个数组。数组每个元素代表一个 tab 的配置
-		this.editor.config.emotions = this.getEmotionsConfig();
+		// this.editor.config.emotions = this.getEmotionsConfig();
 		// 自定义字体
 		this.editor.config.fontNames = this.getFontFamilyConfig();
-		// 编辑区域的z-index默认为10000
-		// this.editor.config.zIndex = 100;
+
+		// 上传图片大小 20M 
+		this.editor.config.uploadImgMaxSize = 20 * 1024 * 1024
+		// // 隐藏插入网络图片的功能
+		this.editor.config.showLinkImg = false
+		
+		// 上传视频大小 50M
+		this.editor.config.uploadVideoMaxSize = 50 * 1024 * 1024
+		this.editor.config.showLinkVideo = false
+		
+		// // 配置触发 onchange 的时间频率，默认为 200ms
+		this.editor.config.onchangeTimeout = 500 // 修改为 500ms
+		this.editor.config.customUploadImg = (resultFiles, insertImgFn) =>{
+			if(resultFiles[0].size > this.editor.config.uploadImgMaxSize){
+				this.message.error('图片大小不能超过20M')
+				return
+			}
+			let url = `/service/common/common/uploadAttachment/solutionContent/0/0`
+			const formData = new FormData()
+			formData.append('file', resultFiles[0]);
+			formData.append('filename', resultFiles[0].name);
+			const req = new HttpRequest('POST', url, formData, {
+				reportProgress: false,
+				withCredentials: false
+			});
+			this.isLoading = true
+			this.http.request(req).subscribe((res:any) => {
+				if(res.status==200 && res.body){
+					this.isLoading = false
+					let url = location.origin + '/file' + res.body.data.relativeFilePath
+					insertImgFn(url,url,url)
+				}
+			});
+		}
+		
+		this.editor.config.customUploadVideo = (resultFiles, insertVideoFn) =>{
+			if(resultFiles[0].size > this.editor.config.uploadVideoMaxSize){
+				this.message.error('视频大小不能超过50M')
+				return
+			}
+			let url = `/service/common/common/uploadAttachment/solutionContent/0/0`
+			const formData = new FormData()
+			formData.append('file', resultFiles[0]);
+			formData.append('filename', resultFiles[0].name);
+			const req = new HttpRequest('POST', url, formData, {
+				reportProgress: false,
+				withCredentials: false
+			});
+			this.isLoading = true
+			this.http.request(req).subscribe((res:any) => {
+				if(res.status==200 && res.body){
+					this.isLoading = false
+					let url = location.origin + '/file' + res.body.data.relativeFilePath
+					insertVideoFn(url)
+				}
+			});
+		}
+		
 		// 配置编辑器内容改变触发方法
 		this.editor.config.onchange = this.editorContentChange;
 		// 编辑器获取到焦点触发方法
 		this.editor.config.onfocus = this.editorOnFocus;
 		// 编辑器失去焦点触发方法
 		this.editor.config.onblur = this.editorOnBlur;
+		
+		this.editor.create();
+		// 设置内容
+		this.setContent()
 	}
-	
+			
 	  // 获取显示菜单项
 	  getMenuConfig (): string[] {
 	    return [
@@ -59,11 +126,11 @@ export class wangEditorComponent implements OnInit {
 	      'list',  // 列表
 	      'justify',  // 对齐方式
 	      'quote',  // 引用
-	      'emoticon',  // 表情
-	      'table',  // 表格
+	      // 'emoticon',  // 表情
+	      // 'table',  // 表格
 	      'image',  // 插入图片
 	      'video',  // 插入视频
-	      'code',  // 插入代码
+	      // 'code',  // 插入代码
 	      'undo',  // 撤销
 	      'redo'  // 重复
 	    ];
@@ -126,11 +193,11 @@ export class wangEditorComponent implements OnInit {
 	      'Verdana'
 	    ];
 	  }
-	
+		
 	  // 富文本编辑器内容变化触发方法
 	  editorContentChange = (html) => {
-	    console.log(html);
 			this.changeContent.emit(html)
+	    console.log(222,html);
 	  }
 	
 	  // 编辑器获取到焦点触发事件
@@ -145,9 +212,14 @@ export class wangEditorComponent implements OnInit {
 	
 	  // 设置编辑器显示内容
 	  setContent() {
+			console.log(7777,this.content)
 	    this.editor.txt.html(this.content);
 	  }
-	
+		
+		editors(){
+			this.editor.destroy()//销毁组件
+			this.editor = null
+		}
 	//   // 获取编辑器内容，带html
 	//   getContent() {
 	//     this.showMessage = this.editor.txt.html();

src/app/views/incident-config/incident-config.component.html

@@ -20,6 +20,14 @@
   <ng-container *ngIf="activeTagId === 3">
     <app-configuration-dictionary></app-configuration-dictionary>
   </ng-container>
+	<!-- 工时管理 -->
+	<ng-container *ngIf="activeTagId === 4">
+	  <app-configuration-manHour></app-configuration-manHour>
+	</ng-container>
+	<!-- 科室绑定人员 -->
+	<ng-container *ngIf="activeTagId === 5">
+	  <app-configuration-deptUser></app-configuration-deptUser>
+	</ng-container>
 </div>
 
 

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

@@ -16,6 +16,8 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 1, name: '故障现象',},
     { id: 2, name: '优先级',},
     { id: 3, name: '数据字典',},
+		{ id: 4, name: '工时管理',},
+		{ id: 5, name: '科室绑定人员',},
   ];
 
   ngOnInit(): void {}

src/app/views/incident-config/incident-config.module.ts

@@ -7,6 +7,8 @@ import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationCategoryComponent } from 'src/app/components/configurationCenter/configuration-category/configuration-category.component';
 import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
 import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
+import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
+import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
 
 
 @NgModule({
@@ -15,6 +17,8 @@ import { ConfigurationDictionaryComponent } from 'src/app/components/configurati
     ConfigurationCategoryComponent,
     ConfigurationPriorityComponent,
     ConfigurationDictionaryComponent,
+		ConfigurationManHourComponent,
+		ConfigurationDeptUserComponent
   ],
   imports: [
     CommonModule,

src/app/views/other-config/other-config.module.ts

@@ -7,7 +7,8 @@ import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationCategoryComponent } from 'src/app/components/configurationCenter/configuration-category/configuration-category.component';
 import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
 import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
-
+import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
+import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
 
 @NgModule({
   declarations: [
@@ -15,6 +16,8 @@ import { ConfigurationDictionaryComponent } from 'src/app/components/configurati
     ConfigurationCategoryComponent,
     ConfigurationPriorityComponent,
     ConfigurationDictionaryComponent,
+		ConfigurationManHourComponent,
+		ConfigurationDeptUserComponent,
   ],
   imports: [
     CommonModule,

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

@@ -14,10 +14,15 @@
 						<input nz-input formControlName="title"  placeholder="请输入标题" nzSize="default" />
 				  </nz-form-control>
 				</nz-form-item>
-				<nz-form-item class="form-item">
+				
+				<nz-form-item class="form-item" *ngIf="add">
+				  <nz-form-label nzFor="content" [nzSm]="4" [nzXs]="24">内容</nz-form-label>
+					<app-wang-editor (changeContent)="changeContent($event)"></app-wang-editor>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item" *ngIf="!add && isContentShow">
 				  <nz-form-label nzFor="content" [nzSm]="4" [nzXs]="24">内容</nz-form-label>
-					<app-wang-editor *ngIf="add || detailContent==''" (changeContent)="changeContent($event)"></app-wang-editor>
-					<app-wang-editor *ngIf="!add && detailContent" (changeContent)="changeContent($event)" [content]="detailContent"></app-wang-editor>
+					<app-wang-editor (changeContent)="changeContent($event)" [content]="detailContent"></app-wang-editor>
 				</nz-form-item>
 			</div>
 			
@@ -60,10 +65,18 @@
 				<nz-form-item class="form-item" *ngIf="classItem==1">
 				  <nz-form-label nzRequired nzFor="malfunction" [nzSm]="6" [nzXs]="24">关联故障现象</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择关联故障现象!" [nzSm]="16" [nzXs]="24">
-						<nz-cascader [nzOptions]="malfunctionData" 
+					<!-- 	<nz-cascader [nzOptions]="malfunctionData" 
 							formControlName="malfunction" 
 							nzPlaceHolder="请选择关联故障现象">
-						</nz-cascader>
+						</nz-cascader> -->
+						<nz-select [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="malfunction" >
+						  <ng-container *ngFor="let option of malfunctionData">
+						    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+						    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+						  </nz-option>
+						</nz-select>
 				  </nz-form-control>
 				</nz-form-item>
 				
@@ -73,7 +86,7 @@
 				    <nz-input-group>
 							<nz-select (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择关联产品" formControlName="assetProductId">
 							  <ng-container *ngFor="let option of productData">
-							    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name + '(' + option.brand + ')' + '(' + option.model + ')'" [nzValue]="option.id"></nz-option>
 							  </ng-container>
 							  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
 							    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -68,6 +68,7 @@ export class RepositoryManageAddComponent implements OnInit {
   promptInfo: string; //操作结果提示信息
   promptModalShow: boolean; //操作提示框是否展示
   modal: boolean = false; //新增/编辑模态框
+	isContentShow: boolean = false; //显示富文本
   add: boolean; //true:新增；false:编辑
   validateForm: FormGroup; //新增/编辑表单
   coopId: number; //表格中执行操作的id
@@ -138,8 +139,8 @@ export class RepositoryManageAddComponent implements OnInit {
 				this.detailData = data
 				this.solutionNumber = data.solutionNumber
 				this.versionNumber = data.versionNumber
-				this.detailContent = data.content || null
-				this.editOrData = data.content || null
+				this.detailContent = data.content || ''
+				this.editOrData = data.content || ''
 				let item = this.dicData.find(i=>i.id == this.detailData.type.id)
 				if(item){
 					this.classItem = item.value
@@ -153,6 +154,7 @@ export class RepositoryManageAddComponent implements OnInit {
 				}
 				this.validateForm.controls.assetProductId.setValue(data.assetProductId || '');
 				this.isSpinning = false
+				this.isContentShow = true
 			});
 	}
 	getFile(){
@@ -218,11 +220,22 @@ export class RepositoryManageAddComponent implements OnInit {
 		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
 		  let incidentCategoryList = res.data || [];
 		  incidentCategoryList = incidentCategoryList.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, label: v.category, value: v.id}));
-		  this.malfunctionData = this.tool.tranListToTreeDataLeaf(incidentCategoryList, undefined, "parentId");
+		  let arr = this.tool.tranListToTreeDataLeaf(incidentCategoryList, undefined, "parentId");
+			
+			for(let i of arr){
+				for(let t of i.children){
+					for(let x of t.children){
+						this.malfunctionData.push({
+							name:x.mutiCategory,
+							id:x.id
+						})
+					}
+				}
+			}
 			
 			if(this.detailData && this.detailData.categoryId){
-				let malfunctionId = this.tool.tranListToTreeDataFindIdsLeaf(this.malfunctionData,this.detailData.categoryId);
-				this.validateForm.controls.malfunction.setValue(malfunctionId);
+				// let malfunctionId = this.tool.tranListToTreeDataFindIdsLeaf(this.malfunctionData,this.detailData.categoryId);
+				this.validateForm.controls.malfunction.setValue(this.detailData.categoryId);
 			}
 		})
 	}
@@ -233,7 +246,7 @@ export class RepositoryManageAddComponent implements OnInit {
 		let data = {
 		  idx: 0,
 		  sum: 9999,
-		  inspection: {
+		  inspectionForm: {
 		    hosId: this.hosId
 		  },
 		};
@@ -253,6 +266,8 @@ export class RepositoryManageAddComponent implements OnInit {
 			this.dicData = res
 			if(!this.add){
 				this.getDetail()
+			}else{
+				this.isContentShow = true
 			}
 			if(this.optType=='upgrade'){
 				this.getDetail()
@@ -326,7 +341,7 @@ export class RepositoryManageAddComponent implements OnInit {
 			operationType: operationType
 	  };
 		if(this.classItem==1){
-			data.categoryId = this.validateForm.value.malfunction[2]
+			data.categoryId = this.validateForm.value.malfunction
 			delete data.inspectionForm
 		}else if(this.classItem==2){
 			data.inspectionForm.id = this.validateForm.value.polling
@@ -436,17 +451,12 @@ export class RepositoryManageAddComponent implements OnInit {
 		console.log(888,file)
 		let type = file.name.split('.')
 		const isPic = (type[1] === 'xlsx' || type[1] === 'pdf' || 
-		type[1] === 'xls' || type[1] === 'ppt' || type[1] === 'txt' ||
-		type[1] === 'doc' || type[1] === 'docx');
+		type[1] === 'xls' || type[1] === 'ppt' || type[1] === 'pptx' ||
+		type[1] === 'txt' || type[1] === 'doc' || type[1] === 'docx');
 		if (!isPic) {
 			this.message.error('只能上传PDF、word、ppt、excel、txt等文件类型格式!');
-			return;
+			return false;
 		}
-		const isLt4M = file.size / 1024 / 1024 < 10;
-		if (!isLt4M) {
-			this.message.error('图片大小不能大于10MB!');
-			return;
-		} 
 		this.fileData = this.fileData.concat(file);
 		return false;
 	};

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

@@ -135,6 +135,7 @@
 					flex: 1;
 					font-size: 14px;
 					border-right: 1px solid #E9E9E9;
+					overflow-y: auto;
 					.item-left-list{
 						display: flex;
 						align-items: center;
@@ -191,6 +192,7 @@
 					flex: 1.6;
 					padding: 10px;
 					font-size: 14px;
+					overflow-y: auto;
 					.back-class{
 						color: red;
 						cursor: pointer;