[新增]复查按钮

src/app/home/home.module.ts

@@ -76,6 +76,7 @@ import { UploadComponent } from './task/station-task-execution/upload/upload.com
 import { chineseNumbers, fileName } from '../pipe/pipe';
 import { TaskDetailsPagesComponent } from './task/station-task-execution/task-details/task-details.component';
 import { NzTabsModule } from 'ng-zorro-antd/tabs';
+import { CheckagainComponent } from './task/da-oneself-plan/checkagain/checkagain.component';
 @NgModule({
   declarations: [
     NavComponent,
@@ -119,7 +120,8 @@ import { NzTabsModule } from 'ng-zorro-antd/tabs';
     HomeComponent,
     UploadComponent,
     fileName,
-    chineseNumbers
+    chineseNumbers,
+    CheckagainComponent
   ],
   imports: [
     CommonModule,
@@ -161,6 +163,6 @@ import { NzTabsModule } from 'ng-zorro-antd/tabs';
     NzTabsModule
   ],
   providers: [StationTaskExecutionComponent, StationWeeklyPlanComponent],
-  entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent, EditOrComponent, CreateTaskComponent, UploadComponent]
+  entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent, AllotPersonComponent, EditOrComponent, CreateTaskComponent, UploadComponent,CheckagainComponent]
 })
 export class HomeModule { }

src/app/home/statistic-analysis/home/home.component.ts

@@ -377,8 +377,9 @@ export class HomeComponent implements OnInit {
   ]
 
   mapcard = [
-    { name: "重点单位数量", num: 19273, url: '../../../../assets/statistic-analysis/unit.png' },
+    // { name: "重点单位数量", num: 19273, url: '../../../../assets/statistic-analysis/unit.png' },
     { name: "不合格单位数量", num: 121, url: '../../../../assets/statistic-analysis/ununit.png' },
+    { name: "隐患单位数量", num: 121, url: '../../../../assets/statistic-analysis/ununit.png' },
     { name: "协作任务数量", num: 102, url: '../../../../assets/statistic-analysis/task.png' }
   ]
 

src/app/home/system-management/user/user.component.html

@@ -19,9 +19,13 @@
             <button (click)="reset()" nz-button nzType="default"><i nz-icon nzType="reload"
                     nzTheme="outline"></i>重置</button>
         </div>
+        <div>
+            <button nz-button nzType="primary" style="margin-right: 6px;" (click)="export()"><span nz-icon
+                    nzType="export" nzTheme="outline"></span>导出</button>
+            <button nz-button nzType="primary" (click)="addUser()"><i nz-icon nzType="plus-circle"
+                    nzTheme="outline"></i>创建用户</button>
+        </div>
 
-        <button nz-button nzType="primary" (click)="addUser()"><i nz-icon nzType="plus-circle"
-                nzTheme="outline"></i>创建用户</button>
     </div>
     <div class="content">
         <div class="tablebox">

src/app/home/system-management/user/user.component.ts

@@ -100,7 +100,7 @@ export class UserComponent implements OnInit {
       ContainsChildren: "true",
       PageNumber: 1,
       PageSize: 9999,
-      code:'0000'
+      code: '0000'
     }
     this.http.get('/api/Organizations', {
       params: params
@@ -263,4 +263,30 @@ export class UserComponent implements OnInit {
       nzCancelText: '取消'
     });
   }
+
+  export() {
+    let params = {
+      Username: this.searchForm.Username,
+      RoleName: this.searchForm.RoleName,
+      Name: this.searchForm.name,
+      OrganizationId: this.searchForm.or,
+      ContainsChildren: 'true',
+      ExportToExcel: 'true'
+    }
+    this.http.get('/api/Users', {
+      params: params,
+      responseType: 'blob' as 'json'
+    }).subscribe((data: any) => {
+      const link = document.createElement('a');
+      const blob = new Blob([data], { type: 'application/vnd.ms-excel' });
+      link.setAttribute('href', window.URL.createObjectURL(blob));
+      link.setAttribute('download', '用户列表' + '.xls');
+      link.style.visibility = 'hidden';
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      this.message.create('success', '导出成功！');
+    })
+
+  }
 }

src/app/home/task/da-oneself-plan/checkagain/checkagain.component.html

@@ -0,0 +1,244 @@
+<div class="box">
+    <div id="tablebox">
+        <p style="margin:0pt; orphans:0; text-align:center; widows:0">
+            <!-- <span style="font-family:'Times New Roman'; font-size:16pt; font-weight:bold">“</span>
+            <span style="font-family:仿宋_GB2312; font-size:16pt; font-weight:bold">防消联勤</span>
+            <span style="font-family:'Times New Roman'; font-size:16pt; font-weight:bold">”</span> -->
+            <span style="font-family:仿宋_GB2312; font-size:16pt; font-weight:bold">检查复查情况</span>
+        </p>
+        <!-- <p style="margin:0pt; orphans:0;text-align: center;">
+            <span style="font-family:仿宋_GB2312; font-size:12pt;margin-right: 50pt;">执勤中队：{{organization}}</span>
+            <span style="font-family:仿宋_GB2312; font-size:12pt;margin-left: 50pt;">
+                检查日期：{{checkTime | date:"yyyy-MM-dd HH:mm:ss" }}
+            </span>
+        </p> -->
+        <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin:0 auto; width:475.65pt">
+            <!-- <tr style="height:20.8pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0">
+                        <span style="font-family:宋体; font-size:9pt">单位名称</span>
+                    </p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:130.95pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0">
+                        <span style="font-family:宋体; font-size:9pt">{{company}}</span>
+                    </p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:84.05pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">法人或主要负责人</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:128.25pt">
+                    <p style="font-size:10.5pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">{{olddata.legalPersonName}}</span></p>
+                </td>
+            </tr>
+            <tr style="height:18.3pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">单位地址</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:130.95pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">
+                            {{taskAlldataOfcompany.address}}</span>
+                    </p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:84.05pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">建筑结构</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:128.25pt">
+                    <p style="font-size:10.5pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.datas.basicInfo.structure}}</span>
+                    </p>
+                </td>
+            </tr>
+            <tr style="height:22.2pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">建筑高度</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:130.95pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.datas.basicInfo.height}}</span>
+                    </p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:84.05pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">建筑层数</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:128.25pt">
+                    <p style="font-size:10.5pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.datas.basicInfo.layer}}</span>
+                    </p>
+                </td>
+            </tr>
+            <tr style="height:21.25pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">消防安全管理人</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:130.95pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.directorName}}</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:84.05pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">联系电话</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:128.25pt">
+                    <p style="font-size:10.5pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.directorPhone}}</span></p>
+                </td>
+            </tr>
+            <tr style="height:22.95pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">消防安全重点部位</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:130.95pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.useNature}}</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:84.05pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">消防控制室单位</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:128.25pt">
+                    <p style="font-size:10.5pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.datas.facilities.controlPosition}}</span>
+                    </p>
+                </td>
+            </tr>
+            <tr style="height:20.4pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">单位性质</span></p>
+                </td>
+                <td colspan="5"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:364.85pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.datas.basicInfo.nature}}</span>
+                    </p>
+                </td>
+            </tr>
+            <tr style="height:25.5pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">单位主要消防设施</span></p>
+                </td>
+                <td colspan="5"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:364.85pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0">
+                        <span style="font-family:宋体; font-size:9pt"
+                            *ngFor="let item of taskAlldataOfcompany.zhuyaosheshi.data">
+                            {{item.check ? item.name : ''}}
+                        </span>
+                    </p>
+                </td>
+            </tr>
+            <tr style="height:19.7pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:88.45pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">消防设施及器材</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:111.05pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">室内消火栓数量：{{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shineishuliang}}</span>
+                    </p>
+                </td>
+                <td colspan="3"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:103.95pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">室外消火栓数量：{{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shiwaishuliang}}</span>
+                    </p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:128.25pt">
+                    <p style="font-size:9pt; line-height:150%; margin:0pt; orphans:0; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">消防泵数量：{{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.xiaofangshuanshuliang}}</span>
+                    </p>
+                </td>
+            </tr> -->
+            <tr *ngFor="let item of taskAlldataOfform">
+                <td colspan="4"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:265.65pt">
+                    <p style="margin:0pt; orphans:0; text-align:justify; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">{{item.name}}</span></p>
+                    <p *ngIf="item.name != '实战演练' && item.name != '数字化预案'"
+                        style="margin:0pt; orphans:0; text-align:justify; widows:0">
+                        <img (click)="viewImg(i)" *ngFor="let i of item.data.imgShow" [src]="i" width="145" height="82"
+                            alt=""
+                            style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline;margin-right: 3pt;" />
+                    </p>
+                    <p style="margin:0pt; orphans:0; text-align:justify; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">&#xa0;</span></p>
+                    <p style="margin:0pt; orphans:0; text-align:justify; widows:0">
+                        <span *ngIf="item.name != '实战演练' && item.name != '数字化预案'"
+                            style="font-family:宋体; font-size:9pt">位置：{{item.data.addres}} </span>
+                    </p>
+                    <p style="margin:0pt; orphans:0; text-align:justify; widows:0"><span
+                            *ngIf="item.name != '实战演练' && item.name != '数字化预案'"
+                            style="font-family:宋体; font-size:9pt">结果：{{item.data.jieguo}}</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:48.6pt">
+                    <p style="margin:0pt; orphans:0; text-indent:8pt; widows:0">
+                        <ng-container *ngIf="item.name != '实战演练' && item.name != '数字化预案'; else elseTemplate">
+                            <span style="font-family:宋体; font-size:6pt">{{item.data.zhenggai == '是' ? '√' :
+                                '□'}}是</span>
+                            <span style="font-family:宋体; font-size:6pt">{{item.data.zhenggai == '是' ? '□' :
+                                '√'}}否</span>
+                        </ng-container>
+                        <ng-template #elseTemplate>
+                            <span style="font-family:宋体; font-size:9pt">□是</span>
+                            <span style="font-family:宋体; font-size:9pt">□否</span>
+                        </ng-template>
+                    </p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:128.25pt">
+                    <p style="margin:0pt; orphans:0; text-align:justify; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">具体问题： <span
+                                *ngIf="item.name != '实战演练' && item.name != '数字化预案'">{{item.data.remarks}}</span> </span>
+                    </p>
+                </td>
+            </tr>
+            <tr style="height:0pt">
+                <td style="width:99.25pt; border:none"></td>
+                <td style="width:121.85pt; border:none"></td>
+                <td style="width:19.9pt; border:none"></td>
+                <td style="width:35.45pt; border:none"></td>
+                <td style="width:59.4pt; border:none"></td>
+                <td style="width:139.05pt; border:none"></td>
+            </tr>
+        </table>
+        <p style="margin:0pt; orphans:0; text-align:justify; widows:0"><span
+                style="font-family:宋体; font-size:16pt">&#xa0;</span></p>
+    </div>
+</div>

src/app/home/task/da-oneself-plan/checkagain/checkagain.component.scss

@@ -0,0 +1,4 @@
+.box{
+    height: 600px;
+    overflow-y: auto;
+}

src/app/home/task/da-oneself-plan/checkagain/checkagain.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CheckagainComponent } from './checkagain.component';
+
+describe('CheckagainComponent', () => {
+  let component: CheckagainComponent;
+  let fixture: ComponentFixture<CheckagainComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ CheckagainComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CheckagainComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/home/task/da-oneself-plan/checkagain/checkagain.component.ts

@@ -0,0 +1,41 @@
+import { Component, Input, OnInit } from '@angular/core';
+import Viewer from 'viewerjs';
+@Component({
+  selector: 'app-checkagain',
+  templateUrl: './checkagain.component.html',
+  styleUrls: ['./checkagain.component.scss']
+})
+export class CheckagainComponent implements OnInit {
+
+  @Input() data?: any;
+
+  constructor() { }
+  taskAlldataOfform = []
+  ngOnInit(): void {
+    this.data.form.forEach(element => {
+      if (element.data.shangbao != '否' && element.name != '实战演练' && element.name != '数字化预案') {
+        this.taskAlldataOfform.push(element)
+      }
+    });
+  }
+  //查看图片
+  viewImg(url) {
+    let dom = document.getElementById(`viewerjs`)
+    let pObjs = dom.childNodes;
+    let node = document.createElement("img")
+    node.style.display = "none";
+    node.src = url;
+    node.id = 'img'
+    dom.appendChild(node)
+
+    setTimeout(() => {
+      let viewer = new Viewer(document.getElementById(`viewerjs`), {
+        hidden: () => {
+          dom.removeChild(pObjs[0]);
+          viewer.destroy();
+        }
+      });
+      node.click();
+    }, 0);
+  }
+}

src/app/home/task/da-oneself-plan/da-oneself-plan.component.html

@@ -137,6 +137,9 @@
                                             单位名称
                                         </span>
                                     </div>
+                                    <div class="checkagain" *ngIf="i.recheckStatus != '无需复查'" (click)="checkagain(i)">
+                                        <img src="../../../../assets/images/icon/isCheckAgain.png" alt="">
+                                    </div>
                                     <div class="flexcol">
                                         <span class="ellipsi" [title]="i.company.useNature">
                                             {{i.company.useNature}}

src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss

@@ -336,7 +336,14 @@
             box-sizing: border-box;
             padding: 12px 0px;
             border-bottom: 1px dashed #C7CAD0;
-
+            position: relative;
+            .checkagain{
+              position: absolute;
+              left: 12%;
+              top: 50%;
+              transform: translateY(-50%);
+              cursor: pointer;
+            }
             div {
               flex: 1;
               white-space: nowrap;

src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts

@@ -4,6 +4,7 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { PlanAdjustmentComponent } from './plan-adjustment/plan-adjustment.component'
 import { HttpClient } from '@angular/common/http';
+import { CheckagainComponent } from './checkagain/checkagain.component';
 @Component({
   selector: 'app-da-oneself-plan',
   templateUrl: './da-oneself-plan.component.html',
@@ -166,7 +167,7 @@ export class DaOneselfPlanComponent implements OnInit {
       Month: selectedTime,
       CompanyOrganizationId: item.id,
       PageNumber: this.PageNumber,
-      approvalStatuses: ['通过', '待检查'],
+      approvalStatuses: ['通过', '待检查', '已检查'],
       PageSize: this.PageSize
     }
     item.isLoading = true
@@ -240,4 +241,29 @@ export class DaOneselfPlanComponent implements OnInit {
       this.getTaskListOfStation(item)
     });
   }
+  checkagain(i) {
+
+    if (i.recheckStatus == '需要复查') {
+      this.message.create('warning', '暂未去该单位复查不合格项');
+      return
+    }
+    let arr = JSON.parse(i.resultDataHistory)
+    let obj = JSON.parse(arr[arr.length - 1])
+    console.log(obj)
+    const modal = this.modal.create({
+      nzTitle: '复查记录(' + i.recheckStatus + ')',
+      nzContent: CheckagainComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 1200,
+      nzFooter: null,
+      nzComponentParams: {
+        data: obj
+      }
+    });
+    const instance = modal.getContentComponent();
+    modal.afterClose.subscribe(result => {
+      // this.getTasks()
+      // this.getTaskListOfStation(item)
+    });
+  }
 }