浏览代码

BUG修复

seimin 9 月之前
父节点
当前提交
287920b9e5

+ 2 - 2
src/app/views/inspection-configuration-item/inspection-configuration-item.component.html

@@ -72,7 +72,7 @@
72
               <nz-form-label [nzSpan]="6" nzRequired nzFor="type">填&nbsp;写&nbsp;方&nbsp;式</nz-form-label>
72
               <nz-form-label [nzSpan]="6" nzRequired nzFor="type">填&nbsp;写&nbsp;方&nbsp;式</nz-form-label>
73
               <nz-form-control [nzSpan]="18" nzErrorTip="请选择填写方式!">
73
               <nz-form-control [nzSpan]="18" nzErrorTip="请选择填写方式!">
74
                 <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="type" nzShowSearch
74
                 <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="type" nzShowSearch
75
-                  nzPlaceHolder="请选择填写方式" nzServerSearch (ngModelChange)="changeType($event)" [nzDisabled]="inspectionConfigurationDetail.status.value !== '0'">
75
+                  nzPlaceHolder="请选择填写方式" nzServerSearch (ngModelChange)="changeType($event)" [nzDisabled]="inspectionConfigurationDetail.status.value !== '0' && !add">
76
                   <ng-container *ngFor="let data of dispatchMethods">
76
                   <ng-container *ngFor="let data of dispatchMethods">
77
                     <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.value"></nz-option>
77
                     <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.value"></nz-option>
78
                   </ng-container>
78
                   </ng-container>
@@ -231,7 +231,7 @@
231
             </div>
231
             </div>
232
             <div class="btns">
232
             <div class="btns">
233
               <span class="icon_transport transport-weibiaoti2010104" (click)="editPage(data)"></span>
233
               <span class="icon_transport transport-weibiaoti2010104" (click)="editPage(data)"></span>
234
-              <span class="icon_transport transport-shanchu1" (click)="showDelModal(data,'您确认要删除吗?','删除','delPage')"></span>
234
+              <span class="icon_transport transport-shanchu1" (click)="showDelModal(data,'删除会同步删除关联的巡检项,您确认要删除吗?','删除','delPage')"></span>
235
             </div>
235
             </div>
236
           </div>
236
           </div>
237
         </div>
237
         </div>

+ 2 - 1
src/app/views/inspection-configuration-item/inspection-configuration-item.component.ts

@@ -95,7 +95,8 @@ export class InspectionConfigurationItemComponent implements OnInit, AfterViewIn
95
       .subscribe((data) => {
95
       .subscribe((data) => {
96
         this.loading1 = false;
96
         this.loading1 = false;
97
         if (data.status == 200) {
97
         if (data.status == 200) {
98
-          this.listOfData = data.list;
98
+          let list = data.list || [];
99
+          this.listOfData = list.map(v => ({...v, defaultValue: v.defaultValue || v.formItemConfigList.map(vv => vv.valuex).toString()}));
99
           this.listLength = data.totalNum;
100
           this.listLength = data.totalNum;
100
         }else{
101
         }else{
101
           this.message.error(data.msg || "请求数据失败");
102
           this.message.error(data.msg || "请求数据失败");

+ 1 - 0
src/app/views/inspection-plan-config/inspection-plan-config.component.ts

@@ -432,6 +432,7 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
432
     let postData = {
432
     let postData = {
433
       ...this.planDetail,
433
       ...this.planDetail,
434
       nodeList,
434
       nodeList,
435
+      saveButton: '启动',
435
     };
436
     };
436
     console.log(postData);
437
     console.log(postData);
437
     this.mainService
438
     this.mainService