优化功能

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

@@ -7,21 +7,21 @@
 <div class="content">
   <div class="contentInner">
     <div class="address">
-      <div class="contentHead">一级故障现象<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button></div>
+      <div class="contentHead">一级故障现象<div><button nz-button nzType="primary" nzSize="small" (click)="editCategory(1, activeCategory1)" class="mr8" *ngIf="activeCategory1.id && hospitalConfig === 2">编辑</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.category" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.category }}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
-      <div class="contentHead">二级故障现象<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button></div>
+      <div class="contentHead">二级故障现象<div><button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory2.id && hospitalConfig === 2" (click)="editCategory(2, activeCategory2)" class="mr8">编辑</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.category" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.category }}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
-      <div class="contentHead">三级故障现象<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory2.id" (click)="addCategoryModal(3)">新增</button></div>
+      <div class="contentHead">三级故障现象<div><button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory3.id && hospitalConfig === 2" (click)="editCategory(3, activeCategory3)" class="mr8">编辑</button><button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory2.id" (click)="addCategoryModal(3)">新增</button></div></div>
       <overlay-scrollbars #osComponentRef3 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading3" class="mt8 text_align_center"></nz-spin>
         <div [hidden]="categoryLoading3" class="contentItem" [title]="item.category" [ngClass]="{ active: item.id === activeCategory3.id }" (click)="clickCategory(item, 3)" *ngFor="let item of categoryList3">{{ item.category }}</div>
@@ -186,11 +186,38 @@
   <div class="modalBody">
     <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
     <div class="content">
-      <div class="tips" *ngIf="coopType === 1">您将添加一级故障现象，请输入故障现象</div>
-      <div class="tips" *ngIf="coopType === 2">您将在“<span class="red">{{activeCategory1.category}}</span>”下新增故障现象，请输入故障现象</div>
-      <div class="tips" *ngIf="coopType === 3">您将在“<span class="red">{{activeCategory1.category}}{{activeCategory2.category ? ' - ' + activeCategory2.category : ''}}</span>”下新增故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 1 && add">您将添加一级故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 2 && add">您将在“<span class="red">{{activeCategory1.category}}</span>”下新增故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 3 && add">您将在“<span class="red">{{activeCategory1.category}}{{activeCategory2.category ? ' - ' + activeCategory2.category : ''}}</span>”下新增故障现象，请输入故障现象</div>
       <form nz-form [formGroup]="validateCategoryForm" class="addForm">
+        <nz-form-item *ngIf="!add && (coopType === 2 || coopType === 3)">
+          <nz-form-label nzFor="category1" nzRequired [nzSpan]="6">一级故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请选择一级故障现象!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择一级故障现象" formControlName="category1" (ngModelChange)="changeOneCategory($event)">
+						  <ng-container *ngFor="let option of categoryList1">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+						    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+						  </nz-option>
+						</nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item *ngIf="!add && coopType === 3">
+          <nz-form-label nzFor="category2" nzRequired [nzSpan]="6">二级故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请选择二级故障现象!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择二级故障现象" formControlName="category2">
+						  <ng-container *ngFor="let option of categoryList2">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+						    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+						  </nz-option>
+						</nz-select>
+          </nz-form-control>
+        </nz-form-item>
         <nz-form-item>
+          <nz-form-label nzFor="category" nzRequired [nzSpan]="6" *ngIf="!add">故障现象名称</nz-form-label>
           <nz-form-control [nzSpan]="24" nzErrorTip="请输入故障现象名称!">
             <nz-input-group>
               <textarea formControlName="name" nz-input placeholder="请输入故障现象名称" [nzAutosize]="{minRows: 3}"></textarea>

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

@@ -349,7 +349,7 @@ export class ConfigurationCategoryComponent implements OnInit {
   categoryLoading1:boolean = false;
   categoryLoading2:boolean = false;
   categoryLoading3:boolean = false;
-  getCategoryList(type:number, parentId = 0) {
+  getCategoryList(type:number, parentId = 0, isEdit = false, isOnly = false) {
     setTimeout(() => {
       this['categoryLoading' + type] = true;
     }, 0)
@@ -363,6 +363,13 @@ export class ConfigurationCategoryComponent implements OnInit {
     this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
       this['categoryLoading' + type] = false;
       this['categoryList' + type] = res.data || [];
+      if(isEdit){
+        this['activeCategory' + type] = this['categoryList' + type].find(v => v.id == this['activeCategory' + type].id);
+      }
+
+      if(isOnly){
+        this['activeCategory' + type] = this['categoryList' + type].find(v => v.id == this.validateCategoryForm.value['category' + type]);
+      }
     })
   }
 
@@ -385,23 +392,51 @@ export class ConfigurationCategoryComponent implements OnInit {
 
   // 初始化新增form表单
   validateCategoryForm: FormGroup; //新增/编辑表单
-  initCategoryForm() {
-    this.validateCategoryForm = this.fb.group({
-      name: [null, [Validators.required]],//名称
-    });
+  initCategoryForm(isEdit = false) {
+    if(isEdit){
+      if(this.coopType === 1){
+        this.validateCategoryForm = this.fb.group({
+          name: [null, [Validators.required]],//名称
+        });
+      }else if(this.coopType === 2){
+        this.validateCategoryForm = this.fb.group({
+          category1: [null, [Validators.required]],//一级故障现象
+          name: [null, [Validators.required]],//名称
+        });
+      }else if(this.coopType === 3){
+        this.validateCategoryForm = this.fb.group({
+          category1: [null, [Validators.required]],//一级故障现象
+          category2: [null, [Validators.required]],//二级故障现象
+          name: [null, [Validators.required]],//名称
+        });
+      }
+    }else{
+      this.validateCategoryForm = this.fb.group({
+        name: [null, [Validators.required]],//名称
+      });
+    }
+
     console.log(this.validateCategoryForm.controls)
   }
 
   // 编辑
-  // editCategory(data) {
-  //   console.log(data);
-  //   this.modelName = "编辑";
-  //   this.add = false;
-  //   this.modalCategory = true;
-  //   this.initCategoryForm();
-  //   this.coopData = data;
-  //   this.validateCategoryForm.controls.name.setValue(data.name);
-  // }
+  editCategory(type, data) {
+    console.log(data);
+    this.coopType = type;
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalCategory = true;
+    this.initCategoryForm(true);
+    this.coopData = data;
+
+    this.validateCategoryForm.controls.name.setValue(data.category);
+    if(type === 2){
+      this.validateCategoryForm.controls.category1.setValue(this.activeCategory1.id);
+    }else if(type === 3){
+      this.validateCategoryForm.controls.category1.setValue(this.activeCategory1.id);
+      this.validateCategoryForm.controls.category2.setValue(this.activeCategory2.id);
+    }
+  }
 
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
@@ -416,34 +451,52 @@ export class ConfigurationCategoryComponent implements OnInit {
     console.log(this.validateCategoryForm.value);
     this.btnLoading = true;
     // -----------------------------------
-    let postData:any = {
-      category: {
-        hosId: this.currentHospital.id,
-        parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
+    if(this.add){
+      // 新增
+      let postData:any = {
+        category: {
+          hosId: this.currentHospital.id,
+          parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
+          category: this.validateCategoryForm.value.name,
+          hierarchy: this.coopType,
+          dutyIds: this.hospitalConfig === 1 ? this.currentHospital.id.toString() : undefined,
+        },
+      };
+      this.mainService
+        .incidentPost("checkIncidentCategory", postData)
+        .subscribe((result) => {
+          if (result.status == 200) {
+            this.submitCategoryAddForm();
+          } else if(result.status == 502) {
+            this.btnLoading = false;
+            this.showDelModal(null, result.msg, '', 'relevance');
+          } else {
+            this.btnLoading = false;
+            this.showPromptModal('新增', false, result.msg);
+          }
+        });
+    }else{
+      // 编辑
+      console.log(this['activeCategory' + this.coopType])
+      //编辑
+      let postData = {
+        ...this.coopData,
+        parent: this.coopType === 1 ? undefined : (this.coopType === 2 ? { id: this.validateCategoryForm.value.category1 } : { id: this.validateCategoryForm.value.category2 }),
         category: this.validateCategoryForm.value.name,
-        hierarchy: this.coopType,
-        dutyIds: this.hospitalConfig === 1 ? this.currentHospital.id.toString() : undefined,
-      },
-    };
-    this.mainService
-      .incidentPost("checkIncidentCategory", postData)
-      .subscribe((result) => {
-        let msg = "";
-        if (this.add) {
-          msg = "新增";
-        } else {
-          msg = "修改";
-        }
-        if (result.status == 200) {
-          this.submitCategoryAddForm();
-        } else if(result.status == 502) {
-          this.btnLoading = false;
-          this.showDelModal(null, result.msg, '', 'relevance');
-        } else {
+      };
+      console.log(postData);
+      this.mainService
+        .simplePost("addData", "incidentCategory", postData)
+        .subscribe((result) => {
           this.btnLoading = false;
-          this.showPromptModal(msg, false, result.msg);
-        }
-      });
+          this.hideCategoryModal();
+          if (result.status == 200) {
+            this.showPromptModal('编辑', true, '');
+          } else {
+            this.showPromptModal('编辑', false, result.msg);
+          }
+        });
+    }
     // -----------------------------------
   }
 
@@ -704,6 +757,12 @@ export class ConfigurationCategoryComponent implements OnInit {
     this.validateConfigForm.get(name)!.updateValueAndValidity();
   }
 
+  // 修改故障现象
+  changeOneCategory(id){
+    this.validateCategoryForm.controls.category2.setValue(null);
+    this.getCategoryList(2, id);
+  }
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
@@ -717,13 +776,28 @@ export class ConfigurationCategoryComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    if(this.coopType !== 0){
-      this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
+    if(con === '编辑'){
+      if(success){
+        if(this.coopType === 1){
+          this.getCategoryList(1, 0, true);
+        }else if(this.coopType === 2){
+          this.getCategoryList(1, 0, false, true);
+          this.getCategoryList(2, this.validateCategoryForm.value.category1, true);
+        }else if(this.coopType === 3){
+          this.getCategoryList(1, 0, false, true);
+          this.getCategoryList(2, this.validateCategoryForm.value.category1, false, true);
+          this.getCategoryList(3, this.validateCategoryForm.value.category2, true);
+        }
+      }
     }else{
-      this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
-    }
-    if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
-      this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
+      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);
+      }
+      if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
+        this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
+      }
     }
   }
 }

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

@@ -1263,26 +1263,10 @@
                               nzErrorTip="请选择类型！"
                             >
                               <div class="radios">
-                                <overlay-scrollbars
-                                  #osComponentRef10
-                                  [ngStyle]="{ height: '100%' }"
-                                >
-                                  <nz-radio-group
-                                    formControlName="taskType"
-                                    nz-row
-                                    [(ngModel)]="radioValueZy"
-                                    (ngModelChange)="radioChangeZy(radioValueZy)"
-                                  >
+                                <overlay-scrollbars #osComponentRef10 [ngStyle]="{ height: '100%' }">
+                                  <nz-radio-group formControlName="taskType" nz-row [(ngModel)]="radioValueZy" (ngModelChange)="radioChangeZy(radioValueZy)">
                                     <div nz-row>
-                                      <label
-                                        nz-col
-                                        nz-radio
-                                        [nzValue]="item1.id"
-                                        *ngFor="
-                                          let item1 of workTypesArrange[item.key]
-                                        "
-                                        >{{ item1.taskTypeName }}</label
-                                      >
+                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[item.key]">{{ item1.taskTypeName }}</label>
                                     </div>
                                   </nz-radio-group>
                                 </overlay-scrollbars>
@@ -1596,26 +1580,10 @@
                               nzErrorTip="请选择类型！"
                             >
                               <div class="radios" style="height: 225px">
-                                <overlay-scrollbars
-                                  #osComponentRef11
-                                  [ngStyle]="{ height: '100%' }"
-                                >
-                                  <nz-radio-group
-                                    formControlName="taskTypeQt"
-                                    nz-row
-                                    [(ngModel)]="radioValueQt"
-                                    (ngModelChange)="radioChangeQt(radioValueQt)"
-                                  >
+                                <overlay-scrollbars #osComponentRef11 [ngStyle]="{ height: '100%' }">
+                                  <nz-radio-group formControlName="taskTypeQt" nz-row [(ngModel)]="radioValueQt" (ngModelChange)="radioChangeQt(radioValueQt)">
                                     <div nz-row>
-                                      <label
-                                        nz-col
-                                        nz-radio
-                                        [nzValue]="item1.id"
-                                        *ngFor="
-                                          let item1 of workTypesArrange[item.key]
-                                        "
-                                        >{{ item1.taskTypeName }}</label
-                                      >
+                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[item.key]">{{ item1.taskTypeName }}</label>
                                     </div>
                                   </nz-radio-group>
                                 </overlay-scrollbars>

src/app/views/fuwutai/fuwutai.component.less

@@ -2374,7 +2374,7 @@
                   height: 267px;
                   width: 100%;
                   overflow-y: auto;
-                  padding: 10px 18px;
+                  padding: 8px;
                   background: #fff;
                   border: 1px solid #e6dede;
                   border-radius: 5px;
@@ -2383,19 +2383,14 @@
                     display: flex;
                     flex-wrap: wrap;
                     .ant-radio-wrapper {
-                      // flex: 1;
-                      // max-width: 100%;
-                      // width: 160px;
+                      width: 16.66%;
                       display: flex;
                       align-items: center;
+                      margin-right: 0;
                       ::ng-deep span.ant-radio + * {
-                        // min-width: 110px;
-                        white-space: normal;
-                        float: left;
-                        padding-right: 0;
-                      }
-                      ::ng-deep span.ant-radio {
-                        float: left;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: inherit;
                       }
                     }
                   }

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

@@ -425,7 +425,7 @@
             </div>
           </div>
           <div class="userInfo">
-            <div class="wel">欢迎您：</div>
+            <div class="wel">欢迎您<strong>{{tool.getCurrentUserInfo().name}}</strong>：</div>
             <div class="user">
               <img src="../../assets/images/icon_keshi.png" alt="" />
               <span *ngIf="deptDisplay" [title]="deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}</span>
@@ -3695,6 +3695,7 @@
   </div>
   <div class="dialog-operate">
     <strong class="dialog-refresh" (click)="showNurseCode()">刷新</strong>
+    <strong>{{tool.getCurrentUserInfo().name}}</strong>
     <span>{{ refreshQRCodeTime }}s</span>
   </div>
 </div>

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

@@ -168,6 +168,8 @@
         right: 0;
         bottom: 0;
         left: 0;
+        display: flex;
+        align-items: center;
 
         img {
           width: 100%;