Merge branch 'lmm1' into lmm

src/app/app-routing.module.ts

@@ -23,6 +23,7 @@ import { IncidentConfigGuard } from './guard/IncidentConfig.guard';
 import { OtherConfigGuard } from './guard/OtherConfig.guard';
 //业务页面控制查看权限
 import { PageConfigGuard } from './guard/PageConfig.guard';
+import { NurseConfigGuard } from './guard/nurseConfig.guard';
 
 const routes: Routes = [
   // 默认
@@ -124,6 +125,12 @@ const routes: Routes = [
     loadChildren: () => import('./views/page-config/page-config.module').then(m => m.PageConfigModule),
     canActivate: [PageConfigGuard]
   },
+  // 护士端控制查看
+  {
+    path: 'nurseConfig',
+    loadChildren: () => import('./views/nurse-config/nurse-config.module').then(m => m.NurseConfigModule),
+    canActivate: [NurseConfigGuard]
+  },
   // 问卷预览
   {
     path: "preview",

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

@@ -0,0 +1,92 @@
+<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]="commonFaultsList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="25%">排序号</th>
+                <th nzWidth="25%">故障现象</th>
+                <th nzWidth="25%">别名</th>
+                <th nzWidth="25%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of commonFaultsList;let i = index">
+                <td>{{data.orders}}</td>
+                <td>{{data.categoryDTO?.mutiCategory}}</td>
+                <td>{{data.content}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+                    <span (click)="editPriority(data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </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 [nzSpan]="6" nzRequired nzFor="orders">排序号</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入排序号!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="content">别名</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入别名!">
+            <nz-input-group>
+              <input formControlName="content" nz-input placeholder="请输入别名">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label nzFor="category" nzRequired [nzSpan]="6">故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="18">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="category" (nzOnSearch)="changeCommonInp('category', $event)">
+						  <ng-container *ngFor="let option of malfunctionData">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [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)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-quick/configuration-quick.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-quick/configuration-quick.component.ts

@@ -0,0 +1,235 @@
+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-quick",
+  templateUrl: "./configuration-quick.component.html",
+  styleUrls: ["./configuration-quick.component.less"],
+})
+export class ConfigurationQuickComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+	hosId:any;
+	hospitals:any = [];
+	isDeptLoading: boolean = false;
+
+	currentHospital:any;
+	malfunctionData:any = [];
+	allUserGroup:any = [];
+	userData:any = [];
+
+  changeCommonInpSubject = new Subject();
+
+  ngOnInit() {
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'category'){
+        this.searchApplicationCategory(v[1]);
+      }
+    });
+
+    // 优先级
+    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.getCommonFaultsList();
+		this.searchApplicationCategory()
+  }
+
+  // 新增优先级弹框
+  modelName = ""; //模态框名称
+  modalPriority: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addPriorityModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalPriority = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hidePriorityModal() {
+    this.modalPriority = false;
+  }
+
+  changeCommonInp(type, e) {
+    this.changeCommonInpSubject.next([type, e]);
+  }
+
+	// 获取故障现象数据
+  isLoading:boolean = false;
+	searchApplicationCategory(keyWord?){
+		let postData = {
+		  category: {
+        category: keyWord,
+        selectType: "mutlQuery",
+		    hierarchy: 3,
+		  },
+		};
+    this.isLoading = true;
+		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(data => {
+		  this.isLoading = false;
+      if (data.status == 200) {
+        this.malfunctionData = data.data || [];
+      }
+		})
+	}
+
+  // 编辑
+  editPriority(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalPriority = true;
+    this.initForm();
+    this.coopData = data;
+    this.validatePriorityForm.controls.orders.setValue(data.orders);
+    this.validatePriorityForm.controls.content.setValue(data.content);
+    this.validatePriorityForm.controls.category.setValue(data.category);
+  }
+
+  // 新增/编辑表单提交
+  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 = {};
+    if (this.add) {
+      //增加
+      postData = {
+        orders: this.validatePriorityForm.value.orders,
+        content: this.validatePriorityForm.value.content,
+        category: this.validatePriorityForm.value.category,
+      };
+    } else {
+      //编辑
+      postData = {
+				...this.coopData,
+				orders: this.validatePriorityForm.value.orders,
+        content: this.validatePriorityForm.value.content,
+        category: this.validatePriorityForm.value.category,
+      };
+    }
+    this.mainService
+      .simplePost("addData", "incidentCategoryContent", 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);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validatePriorityForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validatePriorityForm = this.fb.group({
+      orders: [0, [Validators.required]],//排序号
+      content: [null, [Validators.required]],//别名
+      category: [null, [Validators.required]],//故障现象
+    });
+    console.log(this.validatePriorityForm.controls)
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  commonFaultsList: any[] = []; //表格数据
+  tablePriorityHeight:number = 0;
+  getCommonFaultsList() {
+    let data = {
+			idx: 0,
+			sum: 99999,
+			incidentCategoryContent: {},
+		};
+		this.loading1 = true;
+		this.mainService
+			.getFetchDataList("simple/data", "incidentCategoryContent", data)
+			.subscribe((data) => {
+				this.loading1 = false;
+				this.commonFaultsList = data.list || [];
+			});
+  }
+
+  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;
+    console.log(this.coopData);
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+		//删除-优先级
+		this.mainService
+			.simplePost("rmvData", "incidentCategoryContent", [this.coopData.id])
+			.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.getCommonFaultsList();
+  }
+}

src/app/components/select-menu/select-menu.component.ts

@@ -32,6 +32,9 @@ export class SelectMenuComponent implements OnInit {
     // 业务页面控制
     let pageConfig = menus.find(item => item.link == 'pageConfig');
     pageConfig && configurationCenterMenus.push(pageConfig);
+    // 护士端配置控制
+    let nurseConfig = menus.find(item => item.link == 'nurseConfig');
+    nurseConfig && configurationCenterMenus.push(nurseConfig);
     this.configurationCenterMenus = configurationCenterMenus;
   }
   clickHandle(item){

src/app/guard/nurseConfig.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NurseConfigGuard 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 == 'nurseConfig');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1,27 +1,12 @@
 <div class="nurse">
   <nz-layout class="app-layout display_flex flex_auto">
-    <nz-sider
-      class="menu-sidebar slider"
-      nzWidth="224px"
-      nzBreakpoint="xs"
-      [nzTrigger]="null"
-    >
-      <div
-        class="sidebar-logo display_flex align-items_center justify-content_flex-center"
-      >
-        <div style="line-height: normal;height: 100%;" class="display_flex align-items_center justify-content_flex-center flex-direction_column">
-          <!-- <img src="../../assets/images/xiehe_logo.jpg" style="width:100%;" alt="logo" /> -->
-          <img [src]="tool.logoUrl" />
-          <span>{{tool.logoTitle}}</span>
+    <nz-sider class="menu-sidebar slider" nzWidth="190px" nzBreakpoint="xs" [nzTrigger]="null">
+      <div class="sidebar-logo display_flex align-items_center justify-content_flex-center">
+        <div style="line-height: normal;height: 100%;" class="display_flex align-items_center justify-content_flex-center logoTitle">
+          <div class="title ellipsis-multiline" nz-tooltip nzTooltipTitle="{{tool.logoTitle}}">{{tool.logoTitle}}</div>
         </div>
       </div>
-      <div
-        class="notAvailable display_flex align-items_center justify-content_flex-center"
-        *ngIf="
-          !deptTaskTypeRules.openInspection &&
-          !deptTaskTypeRules.openPatientTransport
-        "
-      >
+      <div class="notAvailable display_flex align-items_center justify-content_flex-center" *ngIf="!deptTaskTypeRules.openInspection && !deptTaskTypeRules.openPatientTransport">
         <div>
           <img src="../../assets/images/icon_jianchakong.png" alt="" />
           <div>暂未开通</div>
@@ -29,44 +14,23 @@
       </div>
       <div class="mainInfo">
         <div class="searchBox">
-          <input
-            nz-input
-            [(ngModel)]="tabSearchCont"
-            (ngModelChange)="searchTabInp($event)"
-            placeholder="请输入关键字"
-          />
+          <input nz-input [(ngModel)]="tabSearchCont" (ngModelChange)="searchTabInp($event)" placeholder="请输入关键字" />
         </div>
         <div class="checkBanner" nz-row>
-          <button
-            nz-button
-            nz-col
-            nzSpan="12"
-            class="checkItem checked"
-            (click)="changeInfo()"
-          >
+          <button nz-button nz-col nzSpan="12" class="checkItem checked" (click)="changeInfo()">
           {{(currentDept.typeValue == 'surgery' && !this.tabSearchCont) ? '手术安排信息' : '患者信息'}}
           </button>
         </div>
         <!-- 患者信息-复苏室科室类型 -->
         <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="currentDept.typeValue == 'recovery'">
           <overlay-scrollbars #osComponentRef4 class="box">
-            <div
-              class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="
-                pLoading &&
-                (deptTaskTypeRules.openInspection ||
-                  deptTaskTypeRules.openPatientTransport)
-              "
-            >
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="pLoading && (deptTaskTypeRules.openInspection || deptTaskTypeRules.openPatientTransport)">
               <div>
                 <img src="../../assets/images/loading.gif" alt="" />
                 <div>加载中...</div>
               </div>
             </div>
-            <div
-              class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="!patientList.length && !pLoading"
-            >
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="!patientList.length && !pLoading">
               <div>
                 <div>暂无数据</div>
               </div>
@@ -75,101 +39,28 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.illnessState">
-                    <i
-                      *ngIf="item.illnessState.value === '2'"
-                      class="colorRed icon_transport transport-wei"
-                      nz-tooltip
-                      nzTooltipTitle="病危"
-                    ></i>
-                    <i
-                      *ngIf="item.illnessState.value === '3'"
-                      class="colorRed icon_transport transport-zhong1"
-                      nz-tooltip
-                      nzTooltipTitle="病重"
-                    ></i>
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
                   </ng-container>
                   <ng-container *ngIf="item.careLevel">
-                    <i
-                      *ngIf="item.careLevel.value === '0'"
-                      class="icon_transport transport-te1"
-                      nz-tooltip
-                      nzTooltipTitle="特级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.careLevel.value === '1'"
-                      class="icon_transport transport-Bduanshuzi1"
-                      nz-tooltip
-                      nzTooltipTitle="一级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.careLevel.value === '2'"
-                      class="icon_transport transport-Bduanshuzi"
-                      nz-tooltip
-                      nzTooltipTitle="二级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.careLevel.value === '3'"
-                      class="icon_transport transport-Bduanshuzi11"
-                      nz-tooltip
-                      nzTooltipTitle="三级护理"
-                    ></i>
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
                   </ng-container>
-                  <span
-                    nz-tooltip
-                    [nzTooltipTitle]="recentInfo"
-                    nzTooltipPlacement="right"
-                    [nzMouseEnterDelay]="1"
-                    (mouseenter)="getRecentInfo(item.patientCode)"
-                    >{{ item.patientName }}({{ item.bedNum }})</span
-                  >
+                  <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ item.bedNum }})</span>
                 </div>
-                <div
-                  class="checkInfo"
-                  nz-row
-                  *ngIf="
-                    followFlag === '1' &&
-                    currentDept.typeValue != 'checkRoom2' &&
-                    currentDept.typeValue != 'outpatientDept' &&
-                    currentDept.typeValue != 'checkRoom'
-                  "
-                >
-                  <span
-                    nz-col
-                    nzSpan="2"
-                    class="icon_transport transport-zhongdianguanzhu"
-                    (click)="follow(item)"
-                    [ngStyle]="{
-                      color: item.focusPatient === 0 ? 'white' : 'red'
-                    }"
-                    nz-tooltip
-                    [nzTooltipTitle]="
-                      item.focusPatient === 0
-                        ? '白色心为非特殊关注，需手动建单后配送人员上门送检'
-                        : '红色心为特殊关注，患者所有检查会自动建单，配送人员主动上门送检'
-                    "
-                  ></span>
+                <div class="checkInfo" nz-row *ngIf="followFlag === '1' && currentDept.typeValue != 'checkRoom2' && currentDept.typeValue != 'outpatientDept' && currentDept.typeValue != 'checkRoom'">
+                  <span nz-col nzSpan="2" class="icon_transport transport-zhongdianguanzhu" (click)="follow(item)" [ngStyle]="{color: item.focusPatient === 0 ? 'white' : 'red'}" nz-tooltip [nzTooltipTitle]="item.focusPatient === 0 ? '白色心为非特殊关注，需手动建单后配送人员上门送检' : '红色心为特殊关注，患者所有检查会自动建单，配送人员主动上门送检'"></span>
                   <span nz-col nzSpan="2"></span>
                   <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
-                  <span nz-col nzSpan="6" class="txtR"
-                    >待检 {{ item.watingCount }}</span
-                  >
+                  <span nz-col nzSpan="6" class="txtR">待检 {{ item.watingCount }}</span>
                   <span nz-col nzSpan="2"></span>
                 </div>
-                <div
-                  class="checkInfo"
-                  nz-row
-                  *ngIf="
-                    followFlag === '0' ||
-                    currentDept.typeValue == 'checkRoom2' ||
-                    currentDept.typeValue == 'outpatientDept' ||
-                    currentDept.typeValue == 'checkRoom'
-                  "
-                >
+                <div class="checkInfo" nz-row *ngIf="followFlag === '0' || currentDept.typeValue == 'checkRoom2' || currentDept.typeValue == 'outpatientDept' || currentDept.typeValue == 'checkRoom'">
                   <span nz-col nzSpan="2"></span>
                   <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
-                  <span nz-col nzSpan="6" class="txtR"
-                    >待检 {{ item.watingCount }}</span
-                  >
+                  <span nz-col nzSpan="6" class="txtR">待检 {{ item.watingCount }}</span>
                   <span nz-col nzSpan="2"></span>
                 </div>
                 <div class="btn" (click)="newPatientOrder(item)">一键建单</div>
@@ -180,23 +71,13 @@
         <!-- 患者信息 -->
         <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="(currentDept.typeValue != 'surgery' || (currentDept.typeValue == 'surgery' && this.tabSearchCont)) && currentDept.typeValue != 'recovery'">
           <overlay-scrollbars #osComponentRef4 class="box">
-            <div
-              class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="
-                pLoading &&
-                (deptTaskTypeRules.openInspection ||
-                  deptTaskTypeRules.openPatientTransport)
-              "
-            >
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="pLoading && (deptTaskTypeRules.openInspection || deptTaskTypeRules.openPatientTransport)">
               <div>
                 <img src="../../assets/images/loading.gif" alt="" />
                 <div>加载中...</div>
               </div>
             </div>
-            <div
-              class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="!patientList.length && !pLoading"
-            >
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="!patientList.length && !pLoading">
               <div>
                 <div>暂无数据</div>
               </div>
@@ -205,79 +86,19 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.illnessState">
-                    <i
-                      *ngIf="item.illnessState.value === '2'"
-                      class="colorRed icon_transport transport-wei"
-                      nz-tooltip
-                      nzTooltipTitle="病危"
-                    ></i>
-                    <i
-                      *ngIf="item.illnessState.value === '3'"
-                      class="colorRed icon_transport transport-zhong1"
-                      nz-tooltip
-                      nzTooltipTitle="病重"
-                    ></i>
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
                   </ng-container>
                   <ng-container *ngIf="item.careLevel">
-                    <i
-                      *ngIf="item.careLevel.value === '0'"
-                      class="icon_transport transport-te1"
-                      nz-tooltip
-                      nzTooltipTitle="特级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.careLevel.value === '1'"
-                      class="icon_transport transport-Bduanshuzi1"
-                      nz-tooltip
-                      nzTooltipTitle="一级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.careLevel.value === '2'"
-                      class="icon_transport transport-Bduanshuzi"
-                      nz-tooltip
-                      nzTooltipTitle="二级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.careLevel.value === '3'"
-                      class="icon_transport transport-Bduanshuzi11"
-                      nz-tooltip
-                      nzTooltipTitle="三级护理"
-                    ></i>
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11"  nz-tooltip nzTooltipTitle="三级护理"></i>
                   </ng-container>
-                  <span
-                    nz-tooltip
-                    [nzTooltipTitle]="recentInfo"
-                    nzTooltipPlacement="right"
-                    [nzMouseEnterDelay]="1"
-                    (mouseenter)="getRecentInfo(item.patientCode)"
-                    >{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span
-                  >
+                  <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span>
                 </div>
-                <div
-                  class="checkInfo"
-                  nz-row
-                  *ngIf="
-                    followFlag === '1' &&
-                    currentDept.typeValue != 'checkRoom2' &&
-                    currentDept.typeValue != 'outpatientDept' &&
-                    currentDept.typeValue != 'checkRoom'
-                  "
-                >
-                  <span
-                    nz-col
-                    nzSpan="2"
-                    class="icon_transport transport-zhongdianguanzhu"
-                    (click)="follow(item)"
-                    [ngStyle]="{
-                      color: item.focusPatient === 0 ? 'white' : 'red'
-                    }"
-                    nz-tooltip
-                    [nzTooltipTitle]="
-                      item.focusPatient === 0
-                        ? '白色心为非特殊关注，需手动建单后配送人员上门送检'
-                        : '红色心为特殊关注，患者所有检查会自动建单，配送人员主动上门送检'
-                    "
-                  ></span>
+                <div class="checkInfo" nz-row *ngIf="followFlag === '1' && currentDept.typeValue != 'checkRoom2' && currentDept.typeValue != 'outpatientDept' && currentDept.typeValue != 'checkRoom'">
+                  <span nz-col nzSpan="2" class="icon_transport transport-zhongdianguanzhu" (click)="follow(item)" [ngStyle]="{color: item.focusPatient === 0 ? 'white' : 'red'}" nz-tooltip [nzTooltipTitle]="item.focusPatient === 0 ? '白色心为非特殊关注，需手动建单后配送人员上门送检' : '红色心为特殊关注，患者所有检查会自动建单，配送人员主动上门送检'"></span>
                   <span nz-col nzSpan="2"></span>
                   <ng-container *ngIf="currentDept.typeValue == 'outpatientService'">
                     <span nz-col nzSpan="18">{{ item.identityCardNo }}</span>
@@ -288,16 +109,7 @@
                   </ng-container>
                   <span nz-col nzSpan="2"></span>
                 </div>
-                <div
-                  class="checkInfo"
-                  nz-row
-                  *ngIf="
-                    followFlag === '0' ||
-                    currentDept.typeValue == 'checkRoom2' ||
-                    currentDept.typeValue == 'outpatientDept' ||
-                    currentDept.typeValue == 'checkRoom'
-                  "
-                >
+                <div class="checkInfo" nz-row *ngIf="followFlag === '0' || currentDept.typeValue == 'checkRoom2' || currentDept.typeValue == 'outpatientDept' || currentDept.typeValue == 'checkRoom'">
                   <span nz-col nzSpan="2"></span>
                   <ng-container *ngIf="currentDept.typeValue == 'outpatientService'">
                     <span nz-col nzSpan="18">{{ item.identityCardNo }}</span>
@@ -319,23 +131,13 @@
         <!-- 手术安排信息-手术室科室类型 -->
         <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="currentDept.typeValue == 'surgery' && !this.tabSearchCont">
           <overlay-scrollbars #osComponentRef4 class="box">
-            <div
-              class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="
-                pLoading &&
-                (deptTaskTypeRules.openInspection ||
-                  deptTaskTypeRules.openPatientTransport)
-              "
-            >
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="pLoading && (deptTaskTypeRules.openInspection || deptTaskTypeRules.openPatientTransport)">
               <div>
                 <img src="../../assets/images/loading.gif" alt="" />
                 <div>加载中...</div>
               </div>
             </div>
-            <div
-              class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="!patientList.length && !pLoading"
-            >
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="!patientList.length && !pLoading">
               <div>
                 <div>暂无数据</div>
               </div>
@@ -344,44 +146,14 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.illnessState">
-                    <i
-                      *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'"
-                      class="colorRed icon_transport transport-wei"
-                      nz-tooltip
-                      nzTooltipTitle="病危"
-                    ></i>
-                    <i
-                      *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'"
-                      class="colorRed icon_transport transport-zhong1"
-                      nz-tooltip
-                      nzTooltipTitle="病重"
-                    ></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
                   </ng-container>
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.careLevel">
-                    <i
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'"
-                      class="icon_transport transport-te1"
-                      nz-tooltip
-                      nzTooltipTitle="特级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'"
-                      class="icon_transport transport-Bduanshuzi1"
-                      nz-tooltip
-                      nzTooltipTitle="一级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'"
-                      class="icon_transport transport-Bduanshuzi"
-                      nz-tooltip
-                      nzTooltipTitle="二级护理"
-                    ></i>
-                    <i
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'"
-                      class="icon_transport transport-Bduanshuzi11"
-                      nz-tooltip
-                      nzTooltipTitle="三级护理"
-                    ></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
                   </ng-container>
                   <span>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.residenceNo : '' }})</span>
                 </div>
@@ -398,14 +170,6 @@
             </div>
           </overlay-scrollbars>
         </div>
-        <!-- 翻页 -->
-        <!-- <div class="paging">
-          <div>
-            <nz-pagination [(nzPageIndex)]="infoPageIdx" [(nzTotal)]="infoLength" (nzPageIndexChange)="getPatient()"
-              [nzPageSize]='5' nzSimple>
-            </nz-pagination>
-          </div>
-        </div> -->
       </div>
     </nz-sider>
     <nz-layout class="layout" style="background: #fff; position: relative">
@@ -442,6 +206,7 @@
           <div class="mainInfo" nz-row>
             <div nz-col nzSpan="17" class="cont">
               <div class="top" [ngSwitch]="currentDept.typeValue">
+                <ng-container *ngIf="false">
                 <div class="nums borderB" nz-row *ngSwitchCase="'outpatientService'" hidden></div>
                 <div class="nums borderB" nz-row *ngSwitchCase="'surgery'">
                   <!-- 手术未开通 -->
@@ -859,6 +624,7 @@
                     </div>
                   </div>
                 </div>
+                </ng-container>
                 <div class="tab borderB" nz-row style="padding: 4px 0">
                   <div nz-col nzSpan="21" class="h100p">
                     <overlay-scrollbars #osComponentRef11 nz-row class="h100p w100">
@@ -2292,36 +2058,6 @@
   </nz-layout>
 </div>
 
-<!-- 返回系统按钮 -->
-<!-- 右侧悬浮框 -->
-<!-- <div id="fixedMenu" class="fixed" *ngIf="mainRole">
-  <div class="right">
-    <div class="fixedMenu hujiaozhongxin">
-      <div class="menuItems">
-        <div class="item">快捷菜单</div>
-      </div>
-    </div>
-    <div class="fixedMenu">
-      <div class="menuItems">
-        <div class="others" [ngStyle]="{'height':showLastItems?(mainRole?(35*2)+'px':(35*1)+'px'):0}">
-          <div [ngClass]="{'item':true,'checked':fixedTab=='back'}" *ngIf="mainRole"
-            (click)="checkFixedTab('toSystem')">
-            返回系统
-          </div>
-        </div>
-      </div>
-      <div class="arrow" *ngIf="!showLastItems" (click)="fixedMenuXiala()">
-        <i class="icon_transport transport-xiala2-01"></i>
-      </div>
-      <div class="arrow" *ngIf="showLastItems" (click)="fixedMenuShangla()">
-        <i class="icon_transport transport-shangla-"></i>
-      </div>
-    </div>
-  </div>
-  <div *ngIf="showLastItems&&fixedTab!=''" (click)="fixedMenuShangla()" class="fixedMark">
-  </div>
-</div> -->
-
 <!-- 患者信息一键建单模态框 -->
 <div
   class="save display_flex align-items_center justify-content_flex-center patient"
@@ -2666,56 +2402,8 @@
               </nz-form-control>
             </nz-form-item>
             <!-- 工单备注 -->
-            <!-- <div *ngIf="isRemarks">
-              <p class="mt8 mb8">工单备注：</p>
-              <textarea
-                nz-input
-                [placeholder]="workOrderRemarkTips1"
-                [nzAutosize]="{ minRows: 3, maxRows: 5 }"
-                maxlength="100"
-                [(ngModel)]="workOrderRemark1"
-                #remarksEle1
-              ></textarea>
-              <p class="mt8 mb8" *ngIf="customRemarks1.length">快捷输入：</p>
-              <div *ngIf="customRemarks1.length">
-                <span
-                  class="addRemarks"
-                  *ngFor="let item of customRemarks1"
-                  (click)="addRemarks1(item)"
-                  >【{{ item }}】</span
-                >
-              </div>
-              <p class="mt8 mb8" *ngIf="historyCustomRemarks1.length">历史输入：</p>
-              <div *ngIf="historyCustomRemarks1.length">
-                <span
-                  class="addRemarks"
-                  *ngFor="let item of historyCustomRemarks1"
-                  (click)="addRemarks1(item)"
-                  >【{{ item }}】</span
-                >
-              </div>
-            </div> -->
-            <!-- 工单备注 -->
             <ng-container *ngIf="isRemarks">
               <nz-form-item>
-                <!-- <p class="mt8 mb8" *ngIf="customRemarks2.length">快捷输入：</p>
-                <div *ngIf="customRemarks2.length">
-                  <span
-                    class="addRemarks"
-                    *ngFor="let item of customRemarks2"
-                    (click)="addRemarks2(item)"
-                    >【{{ item }}】</span
-                  >
-                </div> -->
-                <!-- <p class="mt8 mb8" *ngIf="historyCustomRemarks2.length">历史输入：</p>
-                <div *ngIf="historyCustomRemarks2.length">
-                  <span
-                    class="addRemarks"
-                    *ngFor="let item of historyCustomRemarks2"
-                    (click)="addRemarks2(item)"
-                    >【{{ item }}】</span
-                  >
-                </div> -->
                 <div class="display_flex align-items_center">
                   <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
                   <div *ngIf="customRemarks2.length" style="word-break: break-all;">

src/app/views/hushijiandan/hushijiandan.component.less

@@ -102,17 +102,17 @@
 
   .nzContent {
     position: absolute;
-    top: 88px;
+    top: 48px;
     bottom: 0;
     left: 0;
     right: 0;
     height: 100%;
   }
-	
+
 	.isKeyClass{
 		height: 350px !important;
 	}
-	
+
   .modal {
     // 相对于 background 定位， 位置暂时设置为 0，0，0，0 在指令中将其位置水平垂直居中在页面中间
     position: absolute;
@@ -142,8 +142,8 @@
         text-align: center;
         margin: 0;
       }
-			
-			
+
+
       .icon-close {
         position: absolute;
         top: 0;
@@ -153,7 +153,7 @@
         color: @hs_border_color;
       }
     }
-		
+
 		.key{
 			letter-spacing: 10px;
 			font-weight: bold;
@@ -164,7 +164,7 @@
 			top: -15px;
 			height: 33px;
 		}
-		
+
     .dialog-center {
       width: 235px;
       height: 208px;
@@ -266,13 +266,13 @@
       border-radius: 5px;
       overflow: hidden;
       margin-top: 12px;
-			
+
 			.weight{
 				font-weight: 600;
 				position: relative;
 				top: -9px;
 			}
-			
+
       div {
         text-align: center;
         margin: 0;
@@ -327,7 +327,7 @@
         padding: 19px 14px 0 14px;
         max-height: 500px;
         overflow-y: auto;
-				
+
 				.ant-select{
 					width: 100%;
 				}
@@ -342,34 +342,34 @@
 				  position: relative;
 				  .list-template__nzTable {
 				    padding: 16px 16px 0;
-				
+
 				    .thead {
 				      background-image: linear-gradient(to right, @bg-start, @bg-end);
-				
+
 				      th {
 				        background: transparent;
 				        color: #fff;
 				        text-align: center;
 				      }
 				    }
-				
+
 				    .ant-table-body {
 				      border-bottom: 1px solid #e5e9ed;
 				    }
-				
+
 				    .ant-table-tbody {
 				      tr {
 				        text-align: center;
 				        color: #333;
-				
+
 				        td {
 				          border: none;
-				
+
 				          &.tab_hover:hover{
 				            text-decoration: underline;
 				            cursor: pointer;
 				          }
-				
+
 				          .coop {
 				            button{
 				              color: #333;
@@ -379,19 +379,19 @@
 				              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: "";
@@ -411,7 +411,7 @@
 				    right: 8px;
 				  }
 				}
-				
+
         .addForm {
           .ant-form-item {
             margin-bottom: 14px;
@@ -926,26 +926,25 @@
       }
 
       .sidebar-logo {
-        height: 88px;
+        height: 48px;
         overflow: hidden;
-        line-height: 88px;
+        line-height: 48px;
         background: #fff;
         transition: all 0.3s;
         border-bottom: 1px solid #fff;
         z-index: 10;
         position: relative;
 
-        img {
-          max-width: 100%;
-          max-height: 50%;
-          vertical-align: middle;
+        .logoTitle{
+          padding: 0 8px;
+          line-height: normal;
+          height:100%;
         }
 
-        span {
-          margin-top: 8px;
+        .title {
           color: @primary-color;
           font-weight: 600;
-          font-size: 14px;
+          font-size: 13px;
         }
       }
 
@@ -955,7 +954,7 @@
         color: #fff;
         position: absolute;
         top: 0;
-        padding-top: 88px;
+        padding-top: 48px;
         overflow: hidden;
 
         .searchBox {
@@ -989,7 +988,7 @@
           top: 0;
           height: 100%;
           width: 110%;
-          padding-top: 170px;
+          padding-top: 130px;
           padding-bottom: 60px;
           overflow: hidden;
           padding-right: 10%;
@@ -1110,7 +1109,7 @@
         position: absolute;
         top: 0;
         z-index: 9;
-        padding-top: 88px;
+        padding-top: 48px;
         background: rgba(0, 0, 0, 0.5);
         color: #fff;
         font-size: 20px;
@@ -1127,11 +1126,11 @@
       width: 100%;
       z-index: 2;
       background: #fff;
-      height: 88px;
+      height: 48px;
 
       .app-header {
         position: relative;
-        height: 88px;
+        height: 48px;
         padding: 0;
         background: #fff;
         box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
@@ -1139,7 +1138,7 @@
 
         .nurseTitle {
           display: flex;
-          height: 88px;
+          height: 48px;
           font-size: 22px;
           color: #333;
           flex: 1;
@@ -1323,7 +1322,7 @@
             z-index: 9;
 
             .nums {
-              height: 88px;
+              height: 48px;
               position: relative;
 
               div {
@@ -2269,7 +2268,7 @@
     width: 100%;
     height: 100%;
     background: rgba(0, 0, 0, 0.2);
-    z-index: 88;
+    z-index: 48;
   }
 
   & > .left {

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

@@ -32,7 +32,7 @@
         <div class="left">
           <i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
           <i class="icon_transport transport-hushizhihanghuligongzuo green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
-          <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole || pageConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
+          <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole || pageConfigRole || nurseConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
           <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole">

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

@@ -35,6 +35,7 @@ export class MainComponent implements OnInit {
   incidentConfigRole: boolean = false; //事件配置权限
   otherConfigRole: boolean = false; //三方配置权限
   pageConfigRole: boolean = false; //业务页面控制权限
+  nurseConfigRole: boolean = false; //护士端配置控制权限
   PCCommutesToWork: boolean = false; //PC上下班权限
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
@@ -317,6 +318,10 @@ export class MainComponent implements OnInit {
         this.pageConfigRole = true;
         console.log("业务页面控制权限");
       }
+      if (e.link == "nurseConfig") {
+        this.nurseConfigRole = true;
+        console.log("护士端配置控制权限");
+      }
       if (e.link == "PCCommutesToWork") {
         this.PCCommutesToWork = true;
         console.log("PC上下班");

src/app/views/nurse-config/nurse-config-routing.module.ts

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

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

@@ -0,0 +1,17 @@
+<div class="incidentConfig">
+  <div class="tagsAndTemplete">
+    <div class="tags">
+      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;护士端配置</div>
+      <div class="tagList">
+        <span *ngFor="let tag of tagList" [ngClass]="{ active: activeTagLink === tag.link }" (click)="clickTag(tag)">{{ tag.title }}</span>
+      </div>
+      <button nz-button class="btn default" (click)="goBack()">返回</button>
+    </div>
+  </div>
+  <!-- 快捷按钮配置 -->
+  <ng-container *ngIf="activeTagLink === 'nurseConfigQuick'">
+    <app-configuration-quick></app-configuration-quick>
+  </ng-container>
+</div>
+
+

src/app/views/nurse-config/nurse-config.component.less

@@ -0,0 +1,57 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  .incidentConfig{
+    padding-bottom: 24px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    background-color: #F0F2F5;
+    .tagsAndTemplete{
+      height: 64px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .tags{
+        height: 100%;
+        background: #fff;
+        flex: 1;
+        padding: 16px 24px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        position: relative;
+        .transport-peizhizhongxin{
+          color: @primary-color;
+          font-size: 20px;
+          margin-right: 8px;;
+        }
+        .tagList{
+          width: 100%;
+          height: 100%;
+          position: absolute;
+          left: 0;
+          top: 50%;
+          transform: translateY(-50%);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          span{
+            height: 100%;
+            display: inline-block;
+            padding: 0 24px;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            &.active{
+              color: @primary-color;
+              background: #F0F6ED;
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,40 @@
+import { Component, OnInit, AfterViewInit } from "@angular/core";
+import { Location } from '@angular/common';
+
+@Component({
+  selector: "app-nurse-config",
+  templateUrl: "./nurse-config.component.html",
+  styleUrls: ["./nurse-config.component.less"],
+})
+export class NurseConfigComponent implements OnInit, AfterViewInit {
+  constructor(
+    private _location: Location,
+  ){}
+
+  // tab
+  tagList:any = [
+    // { id: 1, name: '快捷按钮配置',},
+  ];
+
+  ngOnInit(): void {}
+
+  ngAfterViewInit(){
+    setTimeout(() => {
+      let menus = JSON.parse(localStorage.getItem("menu"));
+      let nurseConfig = menus.find(item => item.link == 'nurseConfig');
+      this.tagList = nurseConfig ? (nurseConfig.childrens || []) : [];
+      this.tagList.length && this.clickTag(this.tagList[0]);
+    }, 0)
+  }
+
+  // 点击tab
+  activeTagLink:any = 1;
+  clickTag(tag){
+    this.activeTagLink = tag.link;
+  }
+
+  // 返回
+  goBack(){
+    this._location.back();
+  }
+}

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

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { NurseConfigRoutingModule } from './nurse-config-routing.module';
+import { NurseConfigComponent } from './nurse-config.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { ConfigurationQuickComponent } from 'src/app/components/configurationCenter/configuration-quick/configuration-quick.component';
+
+
+@NgModule({
+  declarations: [
+    NurseConfigComponent,
+    ConfigurationQuickComponent,
+  ],
+  imports: [
+    CommonModule,
+    NurseConfigRoutingModule,
+    ShareModule,
+  ]
+})
+export class NurseConfigModule { }

src/assets/iconfont/demo_index.html

@@ -55,6 +55,42 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe65c;</span>
+                <div class="name">护士</div>
+                <div class="code-name">&amp;#xe65c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe65a;</span>
+                <div class="name">向右</div>
+                <div class="code-name">&amp;#xe65a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe65b;</span>
+                <div class="name">药品数据</div>
+                <div class="code-name">&amp;#xe65b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe666;</span>
+                <div class="name">标本信息</div>
+                <div class="code-name">&amp;#xe666;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe6cd;</span>
+                <div class="name">报修</div>
+                <div class="code-name">&amp;#xe6cd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe6ae;</span>
+                <div class="name">目录</div>
+                <div class="code-name">&amp;#xe6ae;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe7ba;</span>
                 <div class="name">护士执行护理工作</div>
                 <div class="code-name">&amp;#xe7ba;</div>
@@ -948,9 +984,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1729066208752') format('woff2'),
-       url('iconfont.woff?t=1729066208752') format('woff'),
-       url('iconfont.ttf?t=1729066208752') format('truetype');
+  src: url('iconfont.woff2?t=1732254783696') format('woff2'),
+       url('iconfont.woff?t=1732254783696') format('woff'),
+       url('iconfont.ttf?t=1732254783696') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -977,6 +1013,60 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-hushi1"></span>
+            <div class="name">
+              护士
+            </div>
+            <div class="code-name">.transport-hushi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-xiangyou1"></span>
+            <div class="name">
+              向右
+            </div>
+            <div class="code-name">.transport-xiangyou1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-yaopinshuju"></span>
+            <div class="name">
+              药品数据
+            </div>
+            <div class="code-name">.transport-yaopinshuju
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-biaobenxinxi"></span>
+            <div class="name">
+              标本信息
+            </div>
+            <div class="code-name">.transport-biaobenxinxi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-baoxiu"></span>
+            <div class="name">
+              报修
+            </div>
+            <div class="code-name">.transport-baoxiu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-RectangleCopy"></span>
+            <div class="name">
+              目录
+            </div>
+            <div class="code-name">.transport-RectangleCopy
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-hushizhihanghuligongzuo"></span>
             <div class="name">
               护士执行护理工作
@@ -2319,6 +2409,54 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-hushi1"></use>
+                </svg>
+                <div class="name">护士</div>
+                <div class="code-name">#transport-hushi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-xiangyou1"></use>
+                </svg>
+                <div class="name">向右</div>
+                <div class="code-name">#transport-xiangyou1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-yaopinshuju"></use>
+                </svg>
+                <div class="name">药品数据</div>
+                <div class="code-name">#transport-yaopinshuju</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-biaobenxinxi"></use>
+                </svg>
+                <div class="name">标本信息</div>
+                <div class="code-name">#transport-biaobenxinxi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-baoxiu"></use>
+                </svg>
+                <div class="name">报修</div>
+                <div class="code-name">#transport-baoxiu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-RectangleCopy"></use>
+                </svg>
+                <div class="name">目录</div>
+                <div class="code-name">#transport-RectangleCopy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-hushizhihanghuligongzuo"></use>
                 </svg>
                 <div class="name">护士执行护理工作</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1729066208752') format('woff2'),
-       url('iconfont.woff?t=1729066208752') format('woff'),
-       url('iconfont.ttf?t=1729066208752') format('truetype');
+  src: url('iconfont.woff2?t=1732254783696') format('woff2'),
+       url('iconfont.woff?t=1732254783696') format('woff'),
+       url('iconfont.ttf?t=1732254783696') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-hushi1:before {
+  content: "\e65c";
+}
+
+.transport-xiangyou1:before {
+  content: "\e65a";
+}
+
+.transport-yaopinshuju:before {
+  content: "\e65b";
+}
+
+.transport-biaobenxinxi:before {
+  content: "\e666";
+}
+
+.transport-baoxiu:before {
+  content: "\e6cd";
+}
+
+.transport-RectangleCopy:before {
+  content: "\e6ae";
+}
+
 .transport-hushizhihanghuligongzuo:before {
   content: "\e7ba";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,48 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "22953497",
+      "name": "护士",
+      "font_class": "hushi1",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "1205",
+      "name": "向右",
+      "font_class": "xiangyou1",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "1440397",
+      "name": "药品数据",
+      "font_class": "yaopinshuju",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "2276224",
+      "name": "标本信息",
+      "font_class": "biaobenxinxi",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "2616660",
+      "name": "报修",
+      "font_class": "baoxiu",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "7549848",
+      "name": "目录",
+      "font_class": "RectangleCopy",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
       "icon_id": "39318134",
       "name": "护士执行护理工作",
       "font_class": "hushizhihanghuligongzuo",