巡检详情

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.3.108",
+		"target": "http://192.168.4.105",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/inspection-execute-detail/inspection-execute-detail.component.html

@@ -10,6 +10,9 @@
       >
         基础信息
       </div>
+      <div [ngClass]="{ item: true, flex_1: true, checked: tabType == 2 }" (click)="checkTab(2)" *ngIf="orderInfo.status.value === '2'">
+        巡检信息
+      </div>
       <div
         [ngClass]="{ item: true, flex_1: true, checked: tabType == 4 }"
         (click)="checkTab(4)"
@@ -20,7 +23,7 @@
 
     <!-- 基础信息 -->
     <overlay-scrollbars
-      #osComponentRef3
+      #osComponentRef1
       style="flex: 1"
       *ngIf="tabType == 1"
     >
@@ -81,9 +84,27 @@
         </div>
       </div>
     </overlay-scrollbars>
-    <!-- 日志 -->
+    <!-- 巡检信息 -->
     <overlay-scrollbars
       #osComponentRef2
+      style="flex: 1"
+      *ngIf="tabType == 2"
+    >
+      <div class="content orders">
+        <div class="inner">
+          <div class="top" *ngFor="let item of valueList">
+            <div class="info" nz-row>
+              <div nz-col nzSpan="8" *ngFor="let value of item">
+                {{ value.name }}：<span [ngClass]="value.exception === 1 ? 'red': ''">{{ getValuex(value) }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </overlay-scrollbars>
+    <!-- 日志 -->
+    <overlay-scrollbars
+      #osComponentRef4
       style="flex:1;"
       *ngIf="tabType == 4"
     >

src/app/share/inspection-execute-detail/inspection-execute-detail.component.ts

@@ -4,6 +4,7 @@ import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { NzMessageService } from "ng-zorro-antd";
 import { ToolService } from 'src/app/services/tool.service';
+import chunk from 'lodash-es/chunk'
 @Component({
   selector: "app-inspection-execute-detail",
   templateUrl: "./inspection-execute-detail.component.html",
@@ -20,6 +21,11 @@ export class InspectionExecuteDetailComponent implements OnInit {
     static: false,
   })
   osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef4: OverlayScrollbarsComponent;
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
@@ -37,6 +43,10 @@ export class InspectionExecuteDetailComponent implements OnInit {
     this.getInfo();
   }
 
+  getValuex(value){
+    return value.formItemConfigList ? value.formItemConfigList.map(v => v.valuex).toString() : value.valuex;
+  }
+
   // 获取详情
   hsLoading:boolean = false;
   getInfo() {
@@ -54,6 +64,30 @@ export class InspectionExecuteDetailComponent implements OnInit {
       });
   }
 
+  // 获取巡检信息
+  valueList:any[] = [];
+  getValue() {
+    this.id = +this.route.snapshot.paramMap.get("id");
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      inspectionFormValues: {
+        taskId: this.id,
+      }
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "inspectionFormValues", postData)
+      .subscribe((data) => {
+        let valueList = data.list || [];
+        this.valueList = chunk(valueList, 3);
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+      });
+  }
+
   // 获取列表
   pageIndex: number = 1;//表格当前页码
   pageSize: number = 10;//表格每页展示条数
@@ -63,6 +97,9 @@ export class InspectionExecuteDetailComponent implements OnInit {
   tabType: number = 1; //tab栏
   checkTab(type) {
     this.tabType = type;
+    if(type === 2){
+      this.getValue();
+    }
   }
 
   // 关闭弹框

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

@@ -7,7 +7,7 @@
             <button nz-button class="btn default" (click)="goBack()">返回</button>
           </div>
           <div nz-col nzLg="6" class="list-template__btns">
-            <button nz-button class="btn default" (click)="addModal()">新增巡检项</button>
+            <button nz-button class="btn default" (click)="addModal()" *ngIf="pageList.length">新增巡检项</button>
           </div>
         </div>
         <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"