楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}
| {{header}} | -{{body[header]? body[header] : '暂无数据'}} | +{{body[header]? body[header] : '暂无数据'}} |
|---|
@@ -45,9 +45,9 @@
-
diff --git a/src/app/plan-audit/plan-audit-routing.module.ts b/src/app/plan-audit/plan-audit-routing.module.ts
index b217fd5..312c7fe 100644
--- a/src/app/plan-audit/plan-audit-routing.module.ts
+++ b/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({
diff --git a/src/app/plan-audit/plan-list/plan-list.component.ts b/src/app/plan-audit/plan-list/plan-list.component.ts
index 8dc7ae8..6bfcd72 100644
--- a/src/app/plan-audit/plan-list/plan-list.component.ts
+++ b/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)
})
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
index 70a6a62..c93f4cd 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/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 = [
diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts
index ba4f526..59da13e 100644
--- a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts
+++ b/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]}});
}
}
diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.html b/src/app/statistic-analysis/all-plan/all-plan.component.html
new file mode 100644
index 0000000..c60fb08
--- /dev/null
+++ b/src/app/statistic-analysis/all-plan/all-plan.component.html
@@ -0,0 +1,54 @@
+
+;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ AllPlanComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AllPlanComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.ts b/src/app/statistic-analysis/all-plan/all-plan.component.ts
new file mode 100644
index 0000000..89f0fe4
--- /dev/null
+++ b/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
+ }
+
+}
diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts
index 1145a2f..4c88ae9 100644
--- a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts
+++ b/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}});
}
});
diff --git a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts
index 24a98d4..6edb22d 100644
--- a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts
+++ b/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]}});
}
diff --git a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
index 4cbd064..092d9a5 100644
--- a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
+++ b/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}});
}
diff --git a/src/app/statistic-analysis/compang-info/compang-info.component.ts b/src/app/statistic-analysis/compang-info/compang-info.component.ts
index fe03854..b68ff07 100644
--- a/src/app/statistic-analysis/compang-info/compang-info.component.ts
+++ b/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,
diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts
index 2119436..87b7d79 100644
--- a/src/app/statistic-analysis/echarts-data.service.ts
+++ b/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){
- this.http.get(`/api/StatisticsAnalysis/Plans/Status`).subscribe((data:any)=>{
- this.tishiData=data.organizations
- localStorage.setItem('tishi',JSON.stringify(this.tishiData))
- })
+ if(datas.name=='预案新增'){
+ 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('yuansuccesstishi',JSON.stringify(this.tishiData))
+ })
+ }
+ 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')
}
- this.localData=localStorage.getItem('tishi')
-
- /* 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.res+='楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}
| {{header}} | -{{body[header]? body[header] : '暂无数据'}} | +{{body[header]? body[header] : '暂无数据'}} |
|---|
+
+
diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.scss b/src/app/statistic-analysis/all-plan/all-plan.component.scss
new file mode 100644
index 0000000..dceb5cf
--- /dev/null
+++ b/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
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.spec.ts b/src/app/statistic-analysis/all-plan/all-plan.component.spec.ts
new file mode 100644
index 0000000..d383a7d
--- /dev/null
+++ b/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
+
+
+
+
+
+ {{titlename}}
+
+
+
+
+
+
+
+
+
+| 名称 | +{{element.name}} | +修改时间 | +{{element.modifiedTime|date:'yyyy-MM-dd'}} | +消防救援站 | +{{element.organizationName}} | +类型 | +{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}} | +操作 | ++ 详情 + | +
|---|
| 总占比 | ' this.res+='' this.res+=''; - for(var i=0;i'+this.tishiData[i].count+' | ' + this.res+=''+this.localData[i].organizationName+' | ' + this.res+=''+this.localData[i].count+' | ' this.res+=''+countbi+'% | ' } this.res+='总计 | '+countall+' | '+allCountbi.toFixed(2)+'% | ' this.res+='