[新增]综合分析中队跳转查看重点单位信息

src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts

@@ -163,10 +163,7 @@ export class AddUnitThreeBarDetailsComponent implements OnInit {
         this.option.series[0].data = this.zhongNumData
         this.detailPlanEchart.setOption(this.option)
       }else{
-        const config = new MatSnackBarConfig();
+        this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open('已到达最底层','确定',config);
       }
     })
   }

src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts

@@ -125,7 +125,7 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit {
     };
     this.detailPlanEchart.setOption(option);
     this.detailPlanEchart.on('click', (params) => {
-      //this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_two_reverse'],{queryParams:{'level':params.name}});
+      this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
       /* const dialogRef = this.dialog.open(CompangInfoComponent, {
         width:"400px",
       }); */

src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts

@@ -109,6 +109,9 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
       }]
     };
     this.detailPlanEchart.setOption(option);
+    this.detailPlanEchart.on('click', (params) => {
+      this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
+    });
   }
 
  

src/app/statistic-analysis/compang-info/compang-info.component.html

@@ -1 +1,53 @@
-<p>compang-info works!</p>
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-03-05 15:57:08
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-03-06 11:35:12
+-->
+<div class="body">
+    <div class="topbox">
+        <div class="btnbox">
+            <button mat-stroked-button (click)="goBack ()">返回</button>
+        </div>
+    </div>
+    <div class="title">
+        <span>{{titlename}}</span>
+    </div>
+    <div class="tablebox">
+      <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
+        <ng-container matColumnDef="unitname">
+            <th mat-header-cell *matHeaderCellDef style="width: 10%;">名称</th>
+            <td mat-cell *matCellDef="let element">{{element.name}}</td>
+        </ng-container>
+        <ng-container matColumnDef="modifiedTime">
+            <th mat-header-cell *matHeaderCellDef style="width: 10%;">修改时间</th>
+            <td mat-cell *matCellDef="let element">{{element.modifiedTime|date:'yyyy-MM-dd'}}</td>
+        </ng-container>
+        <ng-container matColumnDef="organizationName">
+            <th mat-header-cell *matHeaderCellDef style="width: 10%;">消防救援站</th>
+            <td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
+        </ng-container>
+        <ng-container matColumnDef="buildingTypes">
+            <th mat-header-cell *matHeaderCellDef style="width: 10%;">类型</th>
+            <td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}</td>
+        </ng-container>
+        <ng-container matColumnDef="operation">
+            <th mat-header-cell *matHeaderCellDef style="width: 10%;">操作</th>
+            <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
+              <span  style="color: blue;" (click)="unitdetails(element)">详情</span>
+            </td>
+        </ng-container>
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+    </table>
+        <mat-paginator style="width: 50%;margin-left: 25%;" pageEvent [length]="length"
+            [pageSize]="pageSize"
+            [pageSizeOptions]="pageSizeOptions"
+            (page)="changePage($event)">
+            
+        </mat-paginator>
+    
+    </div>
+</div>

src/app/statistic-analysis/compang-info/compang-info.component.scss

@@ -0,0 +1,73 @@
+.body{
+    display: flex;
+    flex-direction: column;
+    .topbox{
+        width: 100%;
+        height: 80px;
+        min-height: 80px;
+        border-bottom: 1px gray solid;
+        .btnbox{
+            display: flex;
+            flex-direction:row-reverse;
+            float: right;
+            justify-content: center;
+            align-items: center;  
+            height: 100%;
+            button{
+                width: 88px;
+                height: 36px;
+            }
+            margin-right:4%;
+    
+        }
+    }
+    .title{
+        width: 100%;
+        text-align: center;
+        margin-top: 2%;
+        span{
+            text-align: center;
+            font-size: 28px;
+        }
+    }
+    .buttonbox{
+        padding-left: 50px;
+        button{
+            margin:0 10px
+        }
+    }
+    .tablebox{
+        width: 100%;
+        text-align: center;
+        table{
+            width: 50%;
+            text-align: center;
+            margin-left: 25%;
+            margin-top:20px;
+            th,td{
+                text-align: center;
+                font-size: 15px;
+                color: #000000;
+            }
+        }
+        mat-paginator{
+            width: 100%;
+            margin-left: 0%;
+        }
+        .mat-column-unitname{
+            width: 15%;
+        }
+        .mat-column-integrity{
+            width: 13%;
+        }
+        .mat-column-operation{
+            width: 5%;
+        }
+        .mat-column-jurisdictionsquadron{
+            width: 10%;
+        }
+        span:hover{
+          text-decoration:underline
+      }
+    }
+}

src/app/statistic-analysis/compang-info/compang-info.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-03-05 15:57:08
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-06 08:43:10
+ * @LastEditTime: 2021-03-06 11:35:04
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -17,6 +17,7 @@ import { PageEvent } from '@angular/material/paginator';
 import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import { TreeService } from '../../http-interceptors/tree.service'
+import { MatTableDataSource } from '@angular/material/table';
 declare var CryptoJS
 
 @Component({
@@ -26,9 +27,66 @@ declare var CryptoJS
 })
 export class CompangInfoComponent  implements OnInit{
 
-  constructor(private http: HttpClient,public snackBar: MatSnackBar) {}
+  constructor(private http: HttpClient,public snackBar: MatSnackBar,public route: ActivatedRoute,private router: Router) {}
 
   ngOnInit(): void {
+    this.route.queryParams.subscribe(params => {
+      this.titlename = params['name'];
+      this.type = params['type'];
+    });
+    this.getAlltabledate()
+  }
+  displayedColumns: string[] = ['unitname','modifiedTime','organizationName','buildingTypes','operation'];
+  tabledataSource
+  titlename //上个页面传过来的名称
+  type //上个页面传过来:1重点单位 2预案
+  jsId=1 //组织机构id
+  //分页
+  @ViewChild(MatPaginator, {static: true}) 
+  pageEvent: PageEvent;
+  paginator: MatPaginator;
+  length:any; //共多少条数据
+  pageSize:any; //每页条数
+  pageSizeOptions: number[] = [10] //设置每页条数
+  PageNumber:any; //第几页
+  //分页事件
+  changePage(e){
+    this.PageNumber = e.pageIndex+1
+    this.getAlltabledate()
+  }
+  //返回
+  goBack () {
+    history.go(-1)
+    //this.echartsData.statefulInspectionToggle = true
   }
 
+  //获取表格数据
+  getAlltabledate(){
+    if(this.type==1){
+      //重点单位
+      let paramsdata:any = {
+        OrganizationId: this.jsId || '',
+        PageNumber: this.PageNumber || '1',
+        PageSize:  this.pageSizeOptions[0],
+        IntegrityScoreMin:0,
+        IntegrityScoreMax:1
+      }
+      this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
+        this.length = data.totalCount
+        //console.log(789,data.items)
+        this.tabledataSource = new MatTableDataSource(data.items);
+      })
+    }
+  }
+  //跳转查看基本信息页面
+  unitdetails(element){
+    if(this.type==1){
+      sessionStorage.setItem("editable","0")
+      sessionStorage.setItem("companyName",element.name)
+      sessionStorage.setItem("companyId",element.id)
+      sessionStorage.setItem(element.id,JSON.stringify(element.companyIntegrityScore))
+      window.open(`/keyUnit/viewunitinfo?id=${element.id}&usci=${element.usci}`,'_blank');
+    }
+    
+  }
 }

src/app/statistic-analysis/statistic-analysis-routing.module.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-02 16:57:00
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-11-05 11:07:16
+ * @LastEditTime: 2021-03-06 09:50:16
  */
 import { Component, NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
@@ -33,6 +33,7 @@ import { AddUnitThreeLineDetailsComponent } from './addUnit/add-unit-three-line-
 import { AddUnitThreeBarDetailsComponent } from './addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component';
 import { HomeComponent } from './home/home.component';
 import { yueDateComponent }from './scheduled-updates/scheduled-updates.component'
+import { CompangInfoComponent }from './compang-info/compang-info.component'
 import { from } from 'rxjs';
 
 
@@ -65,7 +66,8 @@ const routes: Routes = [
   { path: 'scheduledUpdates', component: ScheduledUpdatesComponent},
   { path: 'scheduledUpdates/yueDate', component: yueDateComponent},
   { path: 'scheduledUpdates/PublicEcharts', component: publicEchartsComponent},
-  { path: 'home', component: HomeComponent}
+  { path: 'home', component: HomeComponent},
+  { path: 'CompangInfo',component:CompangInfoComponent}
 ];
 
 @NgModule({