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

src/app/gis-management/fire-facilities/fire-facilities.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-11-23 09:28:54
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-11-27 16:17:53
+ * @LastEditTime: 2021-03-15 16:35:56
 -->
 <div class="content">
 
@@ -45,9 +45,9 @@
                     <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
                       <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p>
                       <table>
-                        <tr *ngFor="let header of items.header">
+                        <tr *ngFor="let header of tableMsg.header">
                             <th >{{header}}</th>
-                            <td *ngFor="let body of items.body">{{body[header]? body[header] : '暂无数据'}}</td>
+                            <td *ngFor="let body of tableMsg.body">{{body[header]? body[header] : '暂无数据'}}</td>
                           </tr>
                       </table>
                     </div>

src/app/plan-audit/fire-facilities/fire-facilities.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-11-23 09:28:54
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-11-27 16:17:53
+ * @LastEditTime: 2021-03-15 16:32:59
 -->
 <div class="content">
 
@@ -45,9 +45,9 @@
                     <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
                       <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p>
                       <table>
-                        <tr *ngFor="let header of items.header">
+                        <tr *ngFor="let header of tableMsg.header">
                             <th >{{header}}</th>
-                            <td *ngFor="let body of items.body">{{body[header]? body[header] : '暂无数据'}}</td>
+                            <td *ngFor="let body of tableMsg.body">{{body[header]? body[header] : '暂无数据'}}</td>
                           </tr>
                       </table>
                     </div>

src/app/plan-audit/plan-audit-routing.module.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-02 15:48:12
+ * @LastEditTime: 2021-03-15 15:53:17
  */
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
@@ -19,7 +19,7 @@ const routes: Routes = [
   { path: 'planaudit', component: PlanAuditComponent },
   //{ path: 'planpass', component: PlanPassComponent },
   { path: 'planrecord', component: PlanRecordComponent },//预案审核记录
-  { path: 'waitexamineer', component: WaitExamineerComponent },//预案待审核
+  { path: 'waitexamineergis', component: WaitExamineerComponent },//预案待审核
 ];
 
 @NgModule({

src/app/plan-audit/plan-list/plan-list.component.ts

@@ -88,7 +88,7 @@ export class OpenPlanToolDialog {
       buildingIndex: this.data.key, //总平面图/建筑 index
       storeyId: this.data.select.id
     }
-    this.http.get("/api/Buildings",{params:{companyId : sessionStorage.getItem('unitId')} }).subscribe((data:any)=>{
+    this.http.get("/api/Buildings",{params:{companyId : sessionStorage.getItem('companyId')} }).subscribe((data:any)=>{
       this.plan.allBuildings = data
       this.plan.seekPanelPoint(parameter)
     })

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 16:13:50
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-10 08:36:31
+ * @LastEditTime: 2021-03-15 15:51:30
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -28,6 +28,7 @@ export class WaitExamineerComponent implements OnInit {
    }
 
   ngOnInit(): void {
+    sessionStorage.setItem('gisplan','look')
     let level = sessionStorage.getItem("level");
     if(level == "0"){//如果是总队
       this.preparelevels = [

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

@@ -151,11 +151,11 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit {
     const pointInPixel= [params.offsetX, params.offsetY];
       if (this.detailPlanEchart.containPixel('grid',pointInPixel)){
         let xIndex=this.detailPlanEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
-        if(this.echartsData.level=='0'||this.echartsData.level=='1'){
+        if((this.echartsData.level=='0'||this.echartsData.level=='1')&&this.tabledata[0].organizations[xIndex].subOrganizations.length>=1){
           //总队和支队跳转
-          this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_barDetails'],{queryParams:{'time':'','buildingTpye':option.xAxis.data[xIndex]+this.organizationName,'zhuid':option.xAxis.id[xIndex],'id':this.canshuId}});
+          this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_barDetails'],{queryParams:{'time':'','buildingTpye':option.xAxis.data[xIndex]+this.organizationName,'zhuid':option.xAxis.id[xIndex],'id':this.echartsData.zuzhiorBuilding=='zhi'?this.canshuId:this.lastId}});
         }else{
-          this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
+          this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex]}});
         }
       }
       

src/app/statistic-analysis/all-plan/all-plan.component.html

@@ -0,0 +1,54 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-03-05 15:57:08
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-03-15 13:52:29
+-->
+<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;" >详情</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/all-plan/all-plan.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/all-plan/all-plan.component.spec.ts

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

src/app/statistic-analysis/all-plan/all-plan.component.ts

@@ -0,0 +1,63 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-03-15 11:32:30
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-03-15 13:51:48
+ */
+import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http'
+import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { MatPaginator } from '@angular/material/paginator';
+import { FlatTreeControl } from '@angular/cdk/tree';
+import { FormControl } from '@angular/forms';
+import { Router,ActivatedRoute } from '@angular/router'
+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({
+  selector: 'app-all-plan',
+  templateUrl: './all-plan.component.html',
+  styleUrls: ['./all-plan.component.scss']
+})
+export class AllPlanComponent implements OnInit {
+
+  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.jsId=params['jsid']
+    });
+  }
+  displayedColumns: string[] = ['unitname','modifiedTime','organizationName','buildingTypes','operation'];
+  tabledataSource
+  titlename //上个页面传过来的名称
+  type //上个页面传过来:1重点单位 2预案
+  jsId //组织机构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
+  }
+
+}

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

@@ -104,7 +104,7 @@ export class BuildingTypeOneComponent implements OnInit {
         this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_two_reverse'],{queryParams:{'level':params.name,'id':params.data.id}});
       }else if(this.echartsData.level=='3'){
         //中队跳转
-        this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
+        this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1,'buildid':params.id}});
       }
       
     });

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

@@ -173,7 +173,6 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
           this.tiao=true
         }
         else{
-          console.log(option.series[0].id)
           this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex]}});
         }
         

src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts

@@ -321,12 +321,12 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
       if (item.echart.containPixel('grid',pointInPixel)) {
         let xIndex=item.echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
         /*事件处理代码书写位置*/
-        if(this.data.level=='0'||this.data.level=='1'){
+        if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].organizations[xIndex].subOrganizations.length>=1){
           //总队，支队跳转
           this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_three_details'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'buildId':this.buildId,'organizationId':option.xAxis.id[xIndex]}})
         }
         else{
-          this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
+          this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex],'buildid':this.buildId}});
         }
         //this.router.navigate(['/statisticanalysis/delete_one/delete_four'],{queryParams:{'level':this.option.xAxis.data[xIndex]+headName}});
       }

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-12 10:05:29
+ * @LastEditTime: 2021-03-15 14:40:56
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -34,6 +34,7 @@ export class CompangInfoComponent  implements OnInit{
       this.titlename = params['name'];
       this.type = params['type'];
       this.jsId=params['jsid']
+      this.BuildingTypeId=params['buildid']
     });
     this.getAlltabledate()
   }
@@ -42,6 +43,7 @@ export class CompangInfoComponent  implements OnInit{
   titlename //上个页面传过来的名称
   type //上个页面传过来:1重点单位 2预案
   jsId //组织机构id
+  BuildingTypeId//建筑类型id
   //分页
   @ViewChild(MatPaginator, {static: true}) 
   pageEvent: PageEvent;
@@ -67,6 +69,7 @@ export class CompangInfoComponent  implements OnInit{
       //重点单位
       let paramsdata:any = {
         OrganizationId: this.jsId || '',
+        BuildingTypeId:this.BuildingTypeId|| '',
         PageNumber: this.PageNumber || '1',
         PageSize:  this.pageSizeOptions[0],
         IntegrityScoreMin:0,

src/app/statistic-analysis/echarts-data.service.ts

@@ -486,24 +486,66 @@ export class EchartsDataService {
   apidata=[]
   biaogeTishiyuan(datas){
     //localStorage.setItem('tishi',this.tishiData)
+    console.log(datas)
     let paramdata={
       planStatus:datas.type
     }
-    if(localStorage.getItem('tishi')==undefined){
+    if(datas.name=='预案新增'){
-      this.http.get(`/api/StatisticsAnalysis/Plans/Status`).subscribe((data:any)=>{
+      this.localData=''
+      if(localStorage.getItem('addtishi')==undefined){
+        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
+          this.tishiData=data.organizations
+          localStorage.setItem('addtishi',JSON.stringify(this.tishiData))
+        })
+      }
+      this.localData=localStorage.getItem('addtishi')
+    }else if(datas.name=='预案审核中'){
+      this.localData=''
+      if(localStorage.getItem('shenheingtishi')==undefined){
+        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
+          this.tishiData=data.organizations
+          localStorage.setItem('shenheingtishi',JSON.stringify(this.tishiData))
+        })
+      }
+      this.localData=localStorage.getItem('shenheingtishi')
+    }else if(datas.name=='预案审核退回'){
+      this.localData=''
+      if(localStorage.getItem('shenhetuitishi')==undefined){
+        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
+          this.tishiData=data.organizations
+          localStorage.setItem('shenhetuitishi',JSON.stringify(this.tishiData))
+        })
+      }
+      this.localData=localStorage.getItem('shenhetuitishi')
+    }else if(datas.name='预案审核通过'){
+      this.localData=''
+      if(localStorage.getItem('yuansuccesstishi')==undefined){
+        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
           this.tishiData=data.organizations
-        localStorage.setItem('tishi',JSON.stringify(this.tishiData))
+          localStorage.setItem('yuansuccesstishi',JSON.stringify(this.tishiData))
         })
       }
-    this.localData=localStorage.getItem('tishi')
+      this.localData=localStorage.getItem('yuansuccesstishi')
+    }else{
+      this.localData=''
+      if(localStorage.getItem('yuanbiantishi')==undefined){
+        this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{
+          this.tishiData=data.organizations
+          localStorage.setItem('yuanbiantishi',JSON.stringify(this.tishiData))
+        })
+      }
+      this.localData=localStorage.getItem('yuanbiantishi')
+    }
     
     
-    /* window.setTimeout(()=>{
+    console.log(JSON.parse(this.localData) )
+    this.localData=JSON.parse(this.localData)
+      window.setTimeout(()=>{
       var countall=0//总计
       var countbi=0//站比
       var allCountbi=0//总站比
-      for(var i=0;i<this.tishiData.length;i++){
+      for(var i=0;i<this.localData.length;i++){
-        countall+=this.tishiData[i].count
+        countall+=this.localData[i].count
       }
       this.res= '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:27px;text-align: center;display:block;">'+datas.name+'</span></div>'
       this.res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:16px;  color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >';
@@ -513,19 +555,19 @@ export class EchartsDataService {
       this.res+='<td style="text-align:center;width:30%;">总占比</td>'
       this.res+='</tr></thead>'
       this.res+='<tbody>';
-      for(var i=0;i<this.tishiData.length;i++){
+      for(var i=0;i<this.localData.length;i++){
-        countbi=Math.round(this.tishiData[i].count/countall* 10000)/ 100.00
+        countbi=Math.round(this.localData[i].count/countall* 10000)/ 100.00
         allCountbi=allCountbi+countbi
        this.res+='<tr>'
-       this.res+='<td style="text-align:center;">'+this.tishiData[i].organizationName+'</td>'
+       this.res+='<td style="text-align:center;">'+this.localData[i].organizationName+'</td>'
-       this.res+='<td style="text-align:center;">'+this.tishiData[i].count+'</td>'
+       this.res+='<td style="text-align:center;">'+this.localData[i].count+'</td>'
        this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>'
       }
       this.res+='</tbody>'
       this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">'+allCountbi.toFixed(2)+'%</td></tfoot>'
       this.res+='</table></div></div>'
       return this.res
-    },1000) */
+    },1000)
     
   }
 

src/app/statistic-analysis/state/page-one/page-one.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-01 15:24:39
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-12 16:25:28
+ * @LastEditTime: 2021-03-15 11:19:36
  */
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';

src/app/statistic-analysis/state/page-there/page-there.component.ts

@@ -24,6 +24,7 @@ export class PageThereComponent implements OnInit {
   type
   tabledata
   organizationId=[]
+  lastid
 
   ngOnDestroy():void{
     this.zhutu.clear()
@@ -35,6 +36,7 @@ export class PageThereComponent implements OnInit {
     let datayuex:string;
     let headName:string;
     this.activatedRoute.queryParams.subscribe(param=>{
+      this.lastid=param.id
       this.type=param.type
       this.headtext=param.headtext
       datayuex=param.level
@@ -44,16 +46,16 @@ export class PageThereComponent implements OnInit {
     }); 
     let paramdata={
       planStatus:this.type,
-      TrendType:this.echartsData.selectType
+      OrganizationId:this.lastid
     }
-    this.echartsData.getData(paramdata,`/api/StatisticsAnalysis`)
+    this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Plans/Status`)
     window.setTimeout(()=>{
       this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
       console.log(this.tabledata)
-      for(var i=0;i<this.tabledata[0].planStatistics.organizationStatistics.organizations.length;i++){
+      for(var i=0;i<this.tabledata[0].organizations.length;i++){
-        this.zhiNameData.push(this.tabledata[0].planStatistics.organizationStatistics.organizations[i].organizationName)
+      this.zhiNameData.push(this.tabledata[0].organizations[i].organizationName)
-        this.zhiNumData.push(this.tabledata[0].planStatistics.organizationStatistics.organizations[i].count)
+      this.zhiNumData.push(this.tabledata[0].organizations[i].count)
-        this.organizationId.push(this.tabledata[0].planStatistics.organizationStatistics.organizations[i].organizationId)
+      this.organizationId.push(this.tabledata[0].organizations[i].organizationId)
     }
       this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData)
       this.zhuzhuangtu(headName)
@@ -159,8 +161,8 @@ export class PageThereComponent implements OnInit {
         }
       },
       /* grid: {  
-        left: '5%',  
+        //left: '5%',  
-        bottom:'35%'  
+        bottom:'5%'  
         }, */
       xAxis: {
           id:this.organizationId,
@@ -210,9 +212,9 @@ export class PageThereComponent implements OnInit {
         let xIndex=this.zhutu.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
         /*事件处理代码书写位置*/
         if(this.echartsData.level=='0'||this.echartsData.level=='1'){
-          this.router.navigate(['/statisticanalysis/PageZhongDuiDetails'],{queryParams:{'level':this.option.xAxis.data[xIndex],'headtext':headName,'id':this.option.xAxis.id[xIndex],'type':this.type}});
+          this.router.navigate(['/statisticanalysis/PageZhongDuiDetails'],{queryParams:{'level':this.option.xAxis.data[xIndex],'id':this.option.xAxis.id[xIndex],'type':this.type}});
         }else{
-          this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
+          this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'type':1}});
         }
         
       }

src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts

@@ -142,7 +142,8 @@ export class PageTwoNameComponent implements OnInit {
       tooltip: {
         trigger: 'item',
         formatter:  (params)=>{
-          return this.data.biaogeTishi(params.name)
+          /* this.data.biaogeTishiyuan(params)
+          return this.data.res */
         },
         position: this.data.tableTooltipNoShow2 
       },
@@ -166,9 +167,9 @@ export class PageTwoNameComponent implements OnInit {
       let xIndex=this.addEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
         /*事件处理代码书写位置*/
         if(this.data.level=='0'||this.data.level=='1'){
-          this.router.navigate(['/statisticanalysis/PageZhongDuiDetails'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':_this.headname,'id':option.xAxis.id[xIndex],'type':this.type}});
+          this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':_this.headname,'id':option.xAxis.id[xIndex],'type':this.type}});
         }else{
-          this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
+          this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1,'jsid':option.xAxis.id[xIndex]}});
         }
         
     }

src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

@@ -347,7 +347,7 @@ export class echartsComponent implements OnInit {
             this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':this.headtext,'type':this.type}});
           } else if(this.echartsData.level=='3'){
             //中队跳转
-            this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
+            this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'type':1}});
           }
           
         }

src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-05 13:50:45
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-12 16:08:24
+ * @LastEditTime: 2021-03-15 14:17:36
  */
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
@@ -31,9 +31,9 @@ export class PageZhongDuiDetailsComponent implements OnInit {
   ngOnInit(): void {
     let level:string;
       this.route.queryParams.subscribe(param=>{
-        this.headtext=param.headtext
+        //this.headtext=param.headtext
         level=param.level
-        this.headName=level+''+this.headtext;
+        this.headName=level;
         this.type=param.type
         this.lastid=param.id
       }); 

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: 2021-03-06 09:50:16
+ * @LastEditTime: 2021-03-15 14:04:09
  */
 import { Component, NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
@@ -34,6 +34,7 @@ import { AddUnitThreeBarDetailsComponent } from './addUnit/add-unit-three-bar-de
 import { HomeComponent } from './home/home.component';
 import { yueDateComponent }from './scheduled-updates/scheduled-updates.component'
 import { CompangInfoComponent }from './compang-info/compang-info.component'
+import { AllPlanComponent } from './all-plan/all-plan.component'
 import { from } from 'rxjs';
 
 
@@ -67,7 +68,8 @@ const routes: Routes = [
   { path: 'scheduledUpdates/yueDate', component: yueDateComponent},
   { path: 'scheduledUpdates/PublicEcharts', component: publicEchartsComponent},
   { path: 'home', component: HomeComponent},
-  { path: 'CompangInfo',component:CompangInfoComponent}
+  { path: 'CompangInfo',component:CompangInfoComponent},
+  { path:'AllPlan',component:AllPlanComponent}
 ];
 
 @NgModule({

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

@@ -69,11 +69,12 @@ import { PageThereComponent } from './state/page-there/page-there.component';
 import { PageThereYearComponent } from './state/page-there-year/page-there-year.component';
 import { DeleteTwoNewaddComponent } from './deleteUnit/delete-two-newadd/delete-two-newadd.component';
 import { CompangInfoComponent } from './compang-info/compang-info.component';
+import { AllPlanComponent } from './all-plan/all-plan.component';
 
 
 
 @NgModule({
-  declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,yuebuildingDateComponent,indexConditionComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent, CompangInfoComponent],
+  declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,yuebuildingDateComponent,indexConditionComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent, CompangInfoComponent, AllPlanComponent],
   imports: [
     CommonModule,
     StatisticAnalysisRoutingModule,