Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html

@@ -14,24 +14,26 @@
         <div class="queryField ordiv">
           <label style="margin-right: 10px;">归属地:</label>
           <mat-form-field class="example-full-width">
-              <input readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
+            <input readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"
+              (focus)="openorganizationbox()">
           </mat-form-field>
           <mat-checkbox style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
-            <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+          <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img
-            <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
+              [src]='imgsrcopen'> </span>
+          <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'>
+          </span>
           <div class="organizationbox" *ngIf="isorganizationbox">
-                <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+            <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">
+              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)'
-                        <button 
+                class="organizationlist">
-                            type="button" 
+                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
-                            mat-icon-button 
-                            matTreeNodeToggle
-                            [attr.aria-label]="'toggle ' + node.name">
                   <mat-icon class="mat-icon-rtl-mirror">
                     {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
                   </mat-icon>
@@ -66,8 +68,10 @@
               </mat-option>
             </mat-select>
           </mat-form-field>
-              <span *ngIf="pcMore" style="margin-left: 20px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+          <span *ngIf="pcMore" style="margin-left: 20px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img
-              <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
+              [src]='imgsrcopen'> </span>
+          <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img
+              [src]='imgsrcdown'> </span>
         </div>
         <div class="queryField" *ngIf="pcfind">
           <button mat-raised-button color="primary">查询</button>
@@ -83,21 +87,21 @@
           <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
         </div>
 
-          <div class="queryField" *ngIf="!padMore&&!pcMore">
+        <!-- <div class="queryField" *ngIf="!padMore&&!pcMore">
           <label style="margin-right: 10px;">预案级别:</label>
           <mat-form-field>
             <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
-                    <!-- <mat-option value=6>应急预案(国家级)</mat-option>
+              <mat-option value=6>应急预案(国家级)</mat-option>
               <mat-option value=7>应急预案(市级)</mat-option>
               <mat-option value=8>类型预案</mat-option>
               <mat-option value=1>Ⅰ级预案</mat-option>
-                    <mat-option value=2>Ⅱ级预案</mat-option> -->
+              <mat-option value=2>Ⅱ级预案</mat-option>
               <mat-option value=3>Ⅲ级预案</mat-option>
               <mat-option value=4>Ⅳ级预案</mat-option>
               <mat-option value=5>Ⅴ级预案</mat-option>
             </mat-select>
           </mat-form-field>
-        </div>
+        </div> -->
 
         <div class="queryField" *ngIf="!padMore&&!pcMore">
           <label style="margin-right: 10px;">审核时间:</label>
@@ -136,7 +140,8 @@
         <ng-container matColumnDef="level">
           <th mat-header-cell *matHeaderCellDef>预案级别</th>
           <td mat-cell *matCellDef="let element">{{element.planCategory==1?'Ⅰ级预案':element.planCategory==2?'Ⅱ级预案':
-                  element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}}</td>
+            element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}}
+          </td>
         </ng-container>
         <ng-container matColumnDef="addtime">
           <th mat-header-cell *matHeaderCellDef>审核时间</th>
@@ -163,7 +168,8 @@
           <th mat-header-cell *matHeaderCellDef>操作</th>
           <td mat-cell *matCellDef="let element">
             <!-- <span  (click)="lookUnitInfo(element)" style="color: blue;cursor: pointer;">查看单位信息</span> -->
-                    <span  (click)="routerTo(element)" style="color: blue;cursor: pointer;margin-left: 10px;">{{url=='1'?'审核预案':'查看预案'}} </span>
+            <span (click)="routerTo(element)"
+              style="color: blue;cursor: pointer;margin-left: 10px;">{{url=='1'?'审核预案':'查看预案'}} </span>
             <!-- <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> -->
           </td>
@@ -171,14 +177,10 @@
         <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
       </table>
-          <mat-paginator 
+      <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
-              [length]="length"
-              [pageSize]="pageSize"
-              [pageSizeOptions]="pageSizeOptions"
         (page)="chagePage($event)">
       </mat-paginator>
 
     </div>
   </div>
 </div>
-