From 721be9145e66a2ddbe482e1d3c7d0e962bed643d Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 29 May 2023 11:22:59 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=87=8D=E7=BD=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan-audit/plan-audit.component.html      | 99 ++++++++++---------
 .../plan-record/plan-record.component.html    |  2 +-
 .../plan-record/plan-record.component.ts      |  5 +-
 .../wait-examineer.component.html             |  2 +-
 src/index.html                                |  4 +-
 5 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/app/plan-audit/plan-audit/plan-audit.component.html b/src/app/plan-audit/plan-audit/plan-audit.component.html
index 77d664b..c955ccf 100644
--- a/src/app/plan-audit/plan-audit/plan-audit.component.html
+++ b/src/app/plan-audit/plan-audit/plan-audit.component.html
@@ -8,45 +8,48 @@
             <input matInput placeholder="请输入单位名称" name="CompanyName" [(ngModel)]="CompanyName">
           </mat-form-field>
         </div>
-  
+
         <div class="queryField ordiv">
           <label style="margin-right: 10px;">消防救援站:</label>
           <mat-form-field>
-            <input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName" name="selectOrganizationIName" (focus)="openorganizationbox()">
+            <input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName"
+              name="selectOrganizationIName" (focus)="openorganizationbox()">
           </mat-form-field>
-          <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization" name="HasChildrenOrganization">包含下级</mat-checkbox>
-  
+          <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization"
+            name="HasChildrenOrganization">包含下级</mat-checkbox>
+
           <div class="organizationbox" *ngIf="isorganizationbox">
-              <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
-              <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-                <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
-                  <button type="button" mat-icon-button disabled ></button>
-                  <li>{{node.name}}</li>
-                </mat-tree-node>
-                <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                  <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
+            <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+            <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
+              <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)' class="organizationlist">
+                <button type="button" mat-icon-button disabled></button>
+                <li>{{node.name}}</li>
+              </mat-tree-node>
+              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)'
+                class="organizationlist">
+                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
                   <mat-icon class="mat-icon-rtl-mirror">
-                      {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+                    {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
                   </mat-icon>
-                  </button>
-                  <li>{{node.name}}</li>
-                </mat-tree-node>
-              </mat-tree>  
+                </button>
+                <li>{{node.name}}</li>
+              </mat-tree-node>
+            </mat-tree>
           </div>
-  
+
         </div>
-  
+
         <div class="queryField">
           <label style="margin-right: 10px;">单位类型:</label>
           <mat-form-field>
             <mat-select placeholder='请选择单位类型' [(ngModel)]="BuildingTypeId" name="BuildingTypeId">
-              <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
+              <mat-option *ngFor="let unit of allunittype" [value]="unit.id">
                 {{unit.name}}
               </mat-option>
             </mat-select>
           </mat-form-field>
         </div>
-  
+
         <div class="queryField">
           <label style="margin-right: 10px;">预案类型:</label>
           <mat-form-field class="maginleft">
@@ -57,7 +60,7 @@
             </mat-select>
           </mat-form-field>
         </div>
-  
+
         <div class="queryField">
           <label style="margin-right: 10px;">审核状态:</label>
           <mat-form-field class="maginleft">
@@ -68,7 +71,7 @@
             </mat-select>
           </mat-form-field>
         </div>
-  
+
         <div class="queryField">
           <label style="margin-right: 10px;">编制级别:</label>
           <mat-form-field class="maginleft">
@@ -78,11 +81,12 @@
               </mat-option>
             </mat-select>
           </mat-form-field>
-          <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenPlanLevel" name="HasChildrenPlanLevel">包含下级</mat-checkbox>
+          <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenPlanLevel"
+            name="HasChildrenPlanLevel">包含下级</mat-checkbox>
         </div>
-  
+
       </div>
-  
+
       <div style="width: 100%;text-align: center;">
         <button mat-raised-button color="primary">查询</button>
         <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
@@ -90,33 +94,33 @@
     </form>
   </div>
   <mat-divider></mat-divider>
-  
+
   <div class="body">
     <div class="tablebox">
       <table mat-table [dataSource]="tabledataSource">
-  
+
         <ng-container matColumnDef="unitname">
           <th mat-header-cell *matHeaderCellDef>单位名称</th>
           <td mat-cell *matCellDef="let element">{{element.companyName}}</td>
         </ng-container>
-  
+
         <ng-container matColumnDef="planname">
           <th mat-header-cell *matHeaderCellDef>预案名称</th>
           <td mat-cell *matCellDef="let element">{{element.name}}</td>
         </ng-container>
-  
+
         <ng-container matColumnDef="addpeople">
           <th mat-header-cell *matHeaderCellDef>添加人</th>
           <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
         </ng-container>
-  
+
         <ng-container matColumnDef="addtime">
           <th mat-header-cell *matHeaderCellDef>添加时间</th>
           <td mat-cell *matCellDef="let element">
             {{element.creationTime|date:'yyyy-MM-dd'}}
           </td>
         </ng-container>
-  
+
         <ng-container matColumnDef="plantype">
           <th mat-header-cell *matHeaderCellDef>预案类型</th>
           <td mat-cell *matCellDef="let element">
@@ -126,7 +130,7 @@
             <label *ngIf="element.planType==4">其他预案</label>
           </td>
         </ng-container>
-  
+
         <ng-container matColumnDef="auditstate">
           <th mat-header-cell *matHeaderCellDef>审核状态</th>
           <td mat-cell *matCellDef="let element">
@@ -136,12 +140,12 @@
             <label *ngIf="element.auditStatus==4">审核退回</label>
           </td>
         </ng-container>
-  
+
         <ng-container matColumnDef="isopen">
           <th mat-header-cell *matHeaderCellDef>是否公开</th>
           <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
         </ng-container>
-  
+
         <ng-container matColumnDef="preparethelevel">
           <th mat-header-cell *matHeaderCellDef>编制级别</th>
           <td mat-cell *matCellDef="let element">
@@ -151,24 +155,25 @@
             <label *ngIf="element.planLevel==8">中队</label>
           </td>
         </ng-container>
-  
+
         <ng-container matColumnDef="operation">
           <th mat-header-cell *matHeaderCellDef>操作</th>
           <td mat-cell *matCellDef="let element">
-            <label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)' *ngIf="element.auditStatus!=4">预案审核</label>
-            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)' *ngIf="element.auditStatus==2">预案公开</label>
-            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)' *ngIf="element.auditStatus==2">预案取消公开</label>
-            <label style="color: #999;"*ngIf="element.auditStatus==4">预案已驳回</label>
+            <label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)'
+              *ngIf="element.auditStatus!=4">预案审核</label>
+            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)'
+              *ngIf="element.auditStatus==2">预案公开</label>
+            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)'
+              *ngIf="element.auditStatus==2">预案取消公开</label>
+            <label style="color: #999;" *ngIf="element.auditStatus==4">预案已驳回</label>
           </td>
         </ng-container>
-  
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
       </table>
-      <mat-paginator [length]="length"
-          [pageSize]="pageSize"
-          [pageSizeOptions]="pageSizeOptions"
-          (page)="chagePage($event)">
+      <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
+        (page)="chagePage($event)">
       </mat-paginator>
     </div>
   </div>
diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html
index 6e582ef..da81445 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.html
+++ b/src/app/plan-audit/plan-record/plan-record.component.html
@@ -77,7 +77,7 @@
         </div>
         <div class="btnbox">
           <button mat-raised-button color="primary" type="submit">查询</button>
-          <button mat-raised-button color="primary" (click)='record()'>重置</button>
+          <button mat-raised-button color="primary" type="button" (click)='record()'>重置</button>
         </div>
       </form>
       <div class="tablediv">
diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts
index aafff47..d293d38 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/src/app/plan-audit/plan-record/plan-record.component.ts
@@ -121,7 +121,6 @@ export class PlanRecordComponent implements OnInit {
   }
   //提交查询
   onSubmit(value) {
-    //console.log(value)
     this.PageNumber = 1;
     this.getAlltabledate();
   }
@@ -135,13 +134,13 @@ export class PlanRecordComponent implements OnInit {
     this.endtime = "";
     this.PlanLevel = "";
     this.plantypes = [];
-    this.PageNumber = 1;
+    this.PageNumber = 1; //分页事件触发刷新
     this.getAlltabledate();
   }
 
   //分页事件
   chagePage(e) {
-    console.log(e);
+    console.log("分页事件", e);
     this.PageNumber = e.pageIndex + 1;
     this.getAlltabledate();
   }
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index 3d48d6f..d851b2a 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -59,7 +59,7 @@
         </div>
         <div class="btnbox">
           <button mat-raised-button color="primary" type="submit">查询</button>
-          <button mat-raised-button color="primary" (click)='record()'>重置</button>
+          <button mat-raised-button color="primary" type="button" (click)='record()'>重置</button>
         </div>
       </form>
 
diff --git a/src/index.html b/src/index.html
index ae5fbd1..7ca66fa 100644
--- a/src/index.html
+++ b/src/index.html
@@ -31,9 +31,9 @@
     securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
   }
 </script>
-<!-- <script
+<script
   src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
+<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
 <!-- <script
   src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
 <script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->