seimin 3 月之前
父节点
当前提交
571700c47f

+ 12 - 8
src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -583,7 +583,7 @@ export class ConfigurationCategoryComponent implements OnInit {
583 583
           if (data.status == 200) {
584 584
             this['activeCategory' + this.deleteType] = {};
585 585
             this.categoryConfigList = [];
586
-            this.showPromptModal(this.tipsMsg2, true, "");
586
+            this.showPromptModal(this.tipsMsg2, true, "", this.deleteType);
587 587
           } else {
588 588
             this.showPromptModal(this.tipsMsg2, false, data.msg);
589 589
           }
@@ -815,7 +815,7 @@ export class ConfigurationCategoryComponent implements OnInit {
815 815
   ifSuccess: boolean; //操作成功/失败
816 816
   promptInfo: string; //操作结果提示信息
817 817
   promptModalShow: boolean; //操作提示框是否展示
818
-  showPromptModal(con, success, promptInfo?) {
818
+  showPromptModal(con, success, promptInfo?, deleteType?) {
819 819
     this.promptModalShow = false;
820 820
     this.promptContent = con;
821 821
     this.ifSuccess = success;
@@ -837,13 +837,17 @@ export class ConfigurationCategoryComponent implements OnInit {
837 837
         }
838 838
       }
839 839
     }else{
840
-      if(this.coopType !== 0){
841
-        this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
840
+      if(deleteType){
841
+        this.getCategoryList(deleteType, deleteType === 1 ? undefined : this['activeCategory' + (deleteType - 1)].id);
842 842
       }else{
843
-        this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
844
-      }
845
-      if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
846
-        this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
843
+        if(this.coopType !== 0){
844
+          this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
845
+        }else{
846
+          this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
847
+        }
848
+        if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
849
+          this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
850
+        }
847 851
       }
848 852
     }
849 853
   }

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

@@ -34,7 +34,7 @@
34 34
 <!-- 新增-->
35 35
 <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalCategory">
36 36
   <div class="modalBody">
37
-    <div class="title">新增<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
37
+    <div class="title">{{add ? '新增' : '编辑'}}<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
38 38
     <div class="content">
39 39
       <form nz-form [formGroup]="validateCategoryForm" class="addForm">
40 40
 				<nz-form-item *ngIf="coopType === 2 && add">

+ 1 - 1
src/app/views/incident-management/incident-management.component.html

@@ -157,7 +157,7 @@
157 157
         <nz-form-item>
158 158
           <nz-form-label [nzSpan]="5" nzFor="levelCategory">故障现象</nz-form-label>
159 159
           <nz-form-control [nzSpan]="19" nzErrorTip="请输入故障现象!">
160
-            <nz-tree-select [nzNodes]="incidentCategoryList" nzPlaceHolder="请选择故障现象" formControlName="levelCategory"></nz-tree-select>
160
+            <nz-tree-select [nzDropdownStyle]="{ height: '400px'}" [nzNodes]="incidentCategoryList" nzPlaceHolder="请选择故障现象" formControlName="levelCategory"></nz-tree-select>
161 161
           </nz-form-control>
162 162
         </nz-form-item>
163 163
         <nz-form-item>

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

@@ -233,7 +233,7 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
233 233
           if(this.config.showOvertime == 1){
234 234
             this.incidentList['2handler'].name = '待处理(不含延期处理)';
235 235
             this.incidentList['3overtime'] = {
236
-              name: '延期处理',
236
+              name: '挂起',
237 237
               list: [],
238 238
             }
239 239
             this.getIncidentList('1pending');
@@ -291,7 +291,7 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
291 291
       list: [],
292 292
     },
293 293
     // '3overtime': {
294
-    //   name: '延期处理',
294
+    //   name: '挂起',
295 295
     //   list: [],
296 296
     // }
297 297
   }