邵佳豪 4 years ago
parent
commit
37fa0ec3be
  1. 1
      src/app/key-unit/key-site-look/key-site.component.scss
  2. 16
      src/app/key-unit/key-unit-management/key-unit-management.component.html
  3. 13
      src/app/key-unit/key-unit-management/key-unit-management.component.scss
  4. 27
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  5. 17
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  6. 2
      src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
  7. 14
      src/app/plan-management/entry-plan/entry-plan.component.html
  8. 13
      src/app/plan-management/entry-plan/entry-plan.component.ts
  9. 16
      src/app/plan-management/meet-plan/meet-plan.component.html
  10. 16
      src/app/plan-management/meet-plan/meet-plan.component.ts
  11. 19
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  12. 15
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  13. 5
      src/app/plan-management/open-plan/open-plan.component.html
  14. 18
      src/app/plan-management/pass-plan/pass-plan.component.html
  15. 13
      src/app/plan-management/pass-plan/pass-plan.component.ts
  16. 12
      src/app/plan-management/reinforce-plan/reinforce-plan.component.html
  17. 13
      src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
  18. 12
      src/app/plan-management/type-plan/type-plan.component.html
  19. 15
      src/app/plan-management/type-plan/type-plan.component.ts
  20. 9
      src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts
  21. 7
      src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts
  22. 2
      src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts
  23. 8
      src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts
  24. 5
      src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts
  25. 6
      src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts
  26. 4
      src/app/statistic-analysis/all-plan/all-plan.component.ts
  27. 6
      src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts
  28. 7
      src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts
  29. 3
      src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts

1
src/app/key-unit/key-site-look/key-site.component.scss

@ -1,3 +1,4 @@
.content {
width: 100%;
height: 100%;

16
src/app/key-unit/key-unit-management/key-unit-management.component.html

@ -15,6 +15,8 @@
<input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js" (focus)="openorganizationbox()">
</mat-form-field>
<mat-checkbox color="primary" 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="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>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@ -36,15 +38,16 @@
</mat-tree-node>
</mat-tree>
</div>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">统一社会信用代码:</label>
<mat-form-field class="example-full-width">
<input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off">
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">单位类型:</label>
<mat-form-field>
<mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
@ -53,8 +56,9 @@
</mat-option>
</mat-select>
</mat-form-field>
<!-- <span style="margin-left: 2%;">更多筛选条件</span> -->
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">关注单位:</label>
<mat-form-field>
<mat-select placeholder='请选择单位是否关注' [(ngModel)]="follow" name="follow">
@ -63,7 +67,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">信息完整度排序:</label>
<mat-form-field>
<mat-select placeholder='请选择排序方式' [(ngModel)]="integritySort" name="integritySort">
@ -72,12 +76,12 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField" style="margin-left: 100px;">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">完整度查询:</label>
<mat-form-field class="example-full-width">
<input type="number" oninput="if(value>100)value=100;if(value<0)value=0" matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
</mat-form-field>
🠊
<mat-icon aria-hidden="false" style="position: relative;right: 125px;top: 5px;">arrow forward</mat-icon>
<mat-form-field class="example-full-width" style="margin-left: 5px;">
<input type="number" oninput="if(value>100)value=100;if(value<0)value=0" matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
</mat-form-field>

13
src/app/key-unit/key-unit-management/key-unit-management.component.scss

@ -1,4 +1,10 @@
@media screen and (min-device-width:1280px){
}
//margin: 3px 40px;
@media screen and (max-device-width:1290px){
}
.header {
@ -16,7 +22,14 @@
align-items:center;
// justify-content:center;
.queryField {
@media screen and (min-device-width:1280px){
margin: 3px 40px;
}
//margin: 3px 40px;
@media screen and (max-device-width:1280px){
margin-left: 20px;
}
input {
width: 180px;
height: 22px;

27
src/app/key-unit/key-unit-management/key-unit-management.component.ts

@ -21,6 +21,16 @@ export class KeyUnitManagementComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
padMore=true//pad收缩控制
padput=false//pad收起按钮
open="更多筛选条件"
down="收起"
imgsrcopen="../../../assets/images/routdown2.png"
imgsrcdown="../../../assets/images/routup2.png"
padInfo(){
this.padMore=!this.padMore
this.padput=!this.padput
}
private _transformer = (node, level: number) => { //初始化tree
return {
expandable: !!node.children && node.children.length > 0,
@ -59,7 +69,7 @@ export class KeyUnitManagementComponent implements OnInit {
//表头排序
sortData (e) {
let data = this.tabledataSource.filteredData;
console.log(data.filteredData)
//console.log(data.filteredData)
// data.filteredData.forEach(element => {
// if(element.key.indexOf(".") != -1){
// let typeArr = element.key.split('.')
@ -208,6 +218,11 @@ export class KeyUnitManagementComponent implements OnInit {
this.getOrganizations();
this.getUnittype();
this.getAllKeyUnit();
if(window.matchMedia("(max-width: 1290px)").matches){
this.padMore=true
}else{
this.padMore=false
}
}
//获得所有重点单位
@ -431,8 +446,6 @@ export class KeyUnitManagementComponent implements OnInit {
//勾选框事件
verifyState //判断是否可以修改
checkChange(e,element){
console.log(e)
console.log(element)
if(element.contentVerify!=null){
this.verifyState=element.contentVerify.verifyState
@ -534,7 +547,7 @@ export class KeyUnitManagementComponent implements OnInit {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
console.log(this.deleteAll)
//console.log(this.deleteAll)
if(this.verifyState==0||this.verifyState==3){
this.snackBar.open('审核中,不能删除','确定',config);
}else{
@ -574,7 +587,7 @@ export class KeyUnitManagementComponent implements OnInit {
}
}else if(this.deleteAll.length > 1){
let isTrue = confirm('您确定要提交删除审核吗')
let isTrue = confirm('重点单位删除需审核员审核,审核通过方可删除')
if(isTrue){
for(var i=0;i<this.deleteAll.length;i++ ){
let body:any = {
@ -586,7 +599,7 @@ export class KeyUnitManagementComponent implements OnInit {
}
this.deleteAudia.push(body)
}
console.log(this.deleteAudia)
this.http.post(`/api/ContentVerifies/Batch`,this.deleteAudia).subscribe(data=>{
this.snackBar.open('操作成功','确定',config);
this.getAllKeyUnit()
@ -748,7 +761,6 @@ export class KeyUnitManagementComponent implements OnInit {
}
//审核结果
auditResult(element){
// console.log(element)
const dialogRef = this.dialog.open(companyAuditResult, {
width:"400px",
//height:"300px",
@ -866,7 +878,6 @@ export class upname{
id:this.oldid,
name: this.unitname
}
console.log(paramsdata)
this.http.put(`/api/Companies/${this.oldid}/UpdateName`,paramsdata).subscribe((data:any)=>{
this.snackBar.open("修改名字成功",'确定',config);
},err => {

17
src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@ -4,10 +4,11 @@
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-20 16:29:51
* @LastEditTime: 2021-03-23 15:09:09
-->
<!-- <p>录入预案</p> -->
<div class="header" style="position: relative;">
<div style="overflow: auto;height: 100%;">
<div class="header" style="position: relative;">
<div>
<span>单位名称:{{unitdata.unitname == "null" ? "无" : unitdata.unitname}}</span>
</div>
@ -22,9 +23,9 @@
</div>
<span style="position: absolute;right:60px;bottom:15px;font-size: 13px;color: cornflowerblue;cursor: pointer;" (click)="lookUnitData()">查看详情</span>
</div>
<mat-divider style="margin-bottom: 15px;"></mat-divider>
<div class="body">
</div>
<mat-divider style="margin-bottom: 15px;"></mat-divider>
<div class="body">
<div class="btn" style="display: flex;">
<button *ngIf="isoperation == 'true'" mat-raised-button color="primary" (click)="addplan()">新建</button>
<!-- *ngIf="downloadisLoading" {{downloadFileName}}下载中...-->
@ -74,13 +75,13 @@
<ng-container *ngIf="isoperation == 'true'" matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef>操作</th>
<td mat-cell *matCellDef="let element">
<span (click)="changeName(element)" *ngIf="element.auditStatus == !0||element.auditStatus == !3">改名</span>
<span (click)="changeName(element)" *ngIf="element.auditStatus!=0||element.auditStatus!=3">改名</span>
<span (click)="editPlan(element)" [ngClass]="{'grey': element.planMode == '0' || element.planMode == '3' || element.auditStatus == '1' || element.auditStatus == '2'}">编辑</span>
<span (click)="lookPlan(element)">查看</span>
<span (click)="readFile(element)" [ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">下载</span>
<span (click)="deletePlan(element)">删除</span>
<span (click)="auditResult(element)">审批结果</span>
<span (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4" [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
<span (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4" >提交审核</span>
<span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
</td>
</ng-container>
@ -100,4 +101,4 @@
(page)="changePage($event)">
</mat-paginator>
</div>
</div>
</div></div>

2
src/app/plan-management/entry-plan-look/entry-plan-look.component.scss

@ -15,6 +15,7 @@
// margin-bottom: 30px;
}
.body{
overflow: auto;
.btn{
button{
width: 80px;
@ -23,6 +24,7 @@
}
}
.tablebox{
overflow: auto;
table{
width: 100%;
margin-left: 0%;

14
src/app/plan-management/entry-plan/entry-plan.component.html

@ -16,6 +16,8 @@
<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="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>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@ -39,7 +41,7 @@
</div>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">单位类型:</label>
<mat-form-field>
<mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="unittype">
@ -49,7 +51,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label>
<mat-form-field>
<mat-select name="reservePlanType" [(ngModel)]="reservePlanType" placeholder='请选择预案类型' [multiple]="true">
@ -60,7 +62,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">审核状态:</label>
<mat-form-field>
<mat-select name="toExamine" [(ngModel)]="toExamine" placeholder='请选择审核状态'>
@ -71,7 +73,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select name="preparelevel" [(ngModel)]="preparelevel" placeholder='请选择编制级别'>
@ -85,7 +87,7 @@
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">信息完整度排序:</label>
<mat-form-field>
<mat-select placeholder='请选择排序方式' [(ngModel)]="integritySort" name="integritySort">
@ -94,7 +96,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">制作情况:</label>
<mat-form-field>
<mat-select placeholder='请选择预案制作情况' [(ngModel)]="haveyuan" name="haveyuan">

13
src/app/plan-management/entry-plan/entry-plan.component.ts

@ -170,6 +170,11 @@ export class EntryPlanComponent implements OnInit {
}
level
ngOnInit(): void {
if(window.matchMedia("(max-width: 1300px)").matches){
this.padMore=true
}else{
this.padMore=false
}
this.getunitdata();
this.getOrganizations();
this.getUnittype();
@ -202,6 +207,14 @@ export class EntryPlanComponent implements OnInit {
]
}
}
padMore=true//pad收缩控制
padput=false//pad收起按钮
imgsrcopen="../../../assets/images/routdown2.png"
imgsrcdown="../../../assets/images/routup2.png"
padInfo(){
this.padMore=!this.padMore
this.padput=!this.padput
}

16
src/app/plan-management/meet-plan/meet-plan.component.html

@ -19,24 +19,26 @@
<mat-option value="7">市级</mat-option>
</mat-select>
</mat-form-field>
<span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加人:</label>
<mat-form-field class="example-full-width">
<input matInput placeholder="请输入添加人" name="addname" autocomplete="off" [(ngModel)]="addname">
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加时间:</label>
<mat-form-field class="example-full-width">
<input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime">
</mat-form-field>
🠊
<mat-form-field class="example-full-width">
<mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
<mat-form-field class="example-full-width" style="margin-left: 10px;">
<input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label>
<mat-form-field>
<!-- <mat-select name="reservePlanType" [(ngModel)]="reservePlanType" placeholder='请选择预案类型' [multiple]="true">
@ -48,7 +50,7 @@
<input matInput placeholder="请输入预案类型" name="reservePlanType" autocomplete="off" [(ngModel)]="typePlan">
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">审核状态:</label>
<mat-form-field>
<mat-select name="toExamine" placeholder='请选择审核状态' [(ngModel)]="unitstate">
@ -59,7 +61,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">

16
src/app/plan-management/meet-plan/meet-plan.component.ts

@ -20,6 +20,11 @@ export class MeetPlanComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
ngOnInit(): void {
if(window.matchMedia("(max-width: 1300px)").matches){
this.padMore=true
}else{
this.padMore=false
}
this.levels = sessionStorage.getItem("level");
if(this.levels == "0"){//如果是总队
this.preparelevels = [
@ -74,7 +79,16 @@ export class MeetPlanComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any; //第几页
padMore=true//pad收缩控制
padput=false//pad收起按钮
open="更多筛选条件"
down="收起"
imgsrcopen="../../../assets/images/routdown2.png"
imgsrcdown="../../../assets/images/routup2.png"
padInfo(){
this.padMore=!this.padMore
this.padput=!this.padput
}
//获取表格数据
getAlltabledate(){

19
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn
* @LastEditTime: 2021-02-05 15:09:48
* @LastEditTime: 2021-03-23 14:24:41
-->
<div style="height: 100%;overflow-y: auto;">
<div class="header" >
@ -17,26 +17,25 @@
<input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field>
</div>
<div class="queryField">
<label style="margin-right: 10px;">添加人:</label>
<mat-form-field class="example-full-width">
<input matInput placeholder="请输入添加人" name="addname" autocomplete="off" [(ngModel)]="addname">
</mat-form-field>
<span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加时间:</label>
<mat-form-field class="example-full-width">
<input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime">
</mat-form-field>
🠊
<mat-form-field class="example-full-width">
<mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
<mat-form-field class="example-full-width" style="margin-left: 10px;">
<input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label>
<mat-form-field>
<!-- <mat-select name="reservePlanType" [(ngModel)]="reservePlanType" placeholder='请选择预案类型' [multiple]="true">
@ -48,7 +47,7 @@
<input matInput placeholder="请输入预案类型" name="reservePlanType" autocomplete="off" [(ngModel)]="typePlan">
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">审核状态:</label>
<mat-form-field>
<mat-select name="toExamine" placeholder='请选择审核状态' [(ngModel)]="unitstate">
@ -59,7 +58,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">

15
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-06 09:14:22
* @LastEditTime: 2021-03-23 15:18:08
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@ -33,6 +33,11 @@ export class OnetwoEntryPlanComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
ngOnInit(): void {
if(window.matchMedia("(max-width: 1300px)").matches){
this.padMore=true
}else{
this.padMore=false
}
this.levels = sessionStorage.getItem("level");
if(this.levels == "0"){//如果是总队
this.preparelevels = [
@ -63,6 +68,14 @@ export class OnetwoEntryPlanComponent implements OnInit {
this.url=window.location.href.substring(window.location.href.length-1,window.location.href.length)
this.getAlltabledate()
}
padMore=true//pad收缩控制
padput=false//pad收起按钮
imgsrcopen="../../../assets/images/routdown2.png"
imgsrcdown="../../../assets/images/routup2.png"
padInfo(){
this.padMore=!this.padMore
this.padput=!this.padput
}
levels
url

5
src/app/plan-management/open-plan/open-plan.component.html

@ -1,4 +1,5 @@
<div class="header">
<div style="height: 100%;overflow: auto;">
<div class="header">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="queryBox">
<div class="queryField">
@ -106,4 +107,6 @@
</div>
</div>
</div>

18
src/app/plan-management/pass-plan/pass-plan.component.html

@ -1,4 +1,5 @@
<div class="header">
<div style="height: 100%;overflow: auto;">
<div class="header">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="queryBox">
@ -15,6 +16,8 @@
<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="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>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@ -38,7 +41,7 @@
</div>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">单位类型:</label>
<mat-form-field>
<mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
@ -48,7 +51,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label>
<mat-form-field>
<mat-select [(ngModel)]="reservePlanType" name="reservePlanType" placeholder='请选择预案类型'>
@ -60,7 +63,7 @@
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select [(ngModel)]="preparelevel" name="preparelevel" placeholder='请选择编制级别'>
@ -73,13 +76,13 @@
</mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加时间:</label>
<mat-form-field class="example-full-width">
<input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime">
</mat-form-field>
🠊
<mat-form-field class="example-full-width">
<mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
<mat-form-field class="example-full-width" style="margin-left: 10px;">
<input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field>
</div>
@ -156,3 +159,4 @@
</div>
</div>
</div>

13
src/app/plan-management/pass-plan/pass-plan.component.ts

@ -52,6 +52,11 @@ export class PassPlanComponent implements OnInit {
preparelevels:any
ngOnInit(): void {
if(window.matchMedia("(max-width: 1300px)").matches){
this.padMore=true
}else{
this.padMore=false
}
this.getunitdata();
this.getOrganizations();
this.getUnittype();
@ -86,6 +91,14 @@ export class PassPlanComponent implements OnInit {
this.url=window.location.href.substring(window.location.href.length-1,window.location.href.length)
//console.log(this.url)
}
padMore=true//pad收缩控制
padput=false//pad收起按钮
imgsrcopen="../../../assets/images/routdown2.png"
imgsrcdown="../../../assets/images/routup2.png"
padInfo(){
this.padMore=!this.padMore
this.padput=!this.padput
}
allPlanInfo:any //存储所有预案信息
//获得所有预案信息

12
src/app/plan-management/reinforce-plan/reinforce-plan.component.html

@ -1,4 +1,5 @@
<div class="header">
<div style="height: 100%;overflow: auto;">
<div class="header">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="queryBox">
@ -15,6 +16,8 @@
<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="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>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@ -38,7 +41,7 @@
</div>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">单位类型:</label>
<mat-form-field>
<mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
@ -48,7 +51,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label>
<mat-form-field>
<mat-select [(ngModel)]="reservePlanType" name="reservePlanType" placeholder='请选择预案类型'>
@ -60,7 +63,7 @@
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select [(ngModel)]="preparelevel" name="preparelevel" placeholder='请选择编制级别'>
@ -151,3 +154,4 @@
</div>
</div>
</div>

13
src/app/plan-management/reinforce-plan/reinforce-plan.component.ts

@ -51,6 +51,11 @@ export class ReinforcePlanComponent implements OnInit {
preparelevels:any
ngOnInit(): void {
if(window.matchMedia("(max-width: 1300px)").matches){
this.padMore=true
}else{
this.padMore=false
}
this.getunitdata();
this.getOrganizations();
this.getUnittype();
@ -83,6 +88,14 @@ export class ReinforcePlanComponent implements OnInit {
]
}
}
padMore=true//pad收缩控制
padput=false//pad收起按钮
imgsrcopen="../../../assets/images/routdown2.png"
imgsrcdown="../../../assets/images/routup2.png"
padInfo(){
this.padMore=!this.padMore
this.padput=!this.padput
}
allPlanInfo:any //存储所有预案信息
//获得所有预案信息

12
src/app/plan-management/type-plan/type-plan.component.html

@ -15,19 +15,21 @@
<mat-form-field class="example-full-width">
<input matInput placeholder="请输入添加人" name="addname" autocomplete="off" [(ngModel)]="addname">
</mat-form-field>
<span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加时间:</label>
<mat-form-field class="example-full-width">
<input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime">
</mat-form-field>
🠊
<mat-form-field class="example-full-width">
<mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
<mat-form-field class="example-full-width" style="margin-left: 10px;">
<input type="date" matInput autocomplete="off" name="endtime" [(ngModel)]="endtime">
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">审核状态:</label>
<mat-form-field>
<mat-select name="toExamine" placeholder='请选择审核状态' [(ngModel)]="unitstate">
@ -38,7 +40,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField">
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">

15
src/app/plan-management/type-plan/type-plan.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-01-06 09:47:43
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-06 09:12:59
* @LastEditTime: 2021-03-23 14:22:18
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@ -29,6 +29,11 @@ export class TypePlanComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
ngOnInit(): void {
if(window.matchMedia("(max-width: 1290px)").matches){
this.padMore=true
}else{
this.padMore=false
}
this.levels = sessionStorage.getItem("level");
if(this.levels == "0"){//如果是总队
this.preparelevels = [
@ -58,6 +63,14 @@ export class TypePlanComponent implements OnInit {
}
this.getAlltabledate()
}
padMore=true//pad收缩控制
padput=false//pad收起按钮
imgsrcopen="../../../assets/images/routdown2.png"
imgsrcdown="../../../assets/images/routup2.png"
padInfo(){
this.padMore=!this.padMore
this.padput=!this.padput
}
levels
preparelevels:any

9
src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts

@ -20,7 +20,7 @@ export class AddUnitOneComponent implements OnInit {
this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies`)
this.setTimeoutObj = window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
this.initCharts("pieone")
this.initCharts("pietwo")
},1000)
@ -80,7 +80,6 @@ export class AddUnitOneComponent implements OnInit {
tooltip: {
trigger: 'item',
formatter: (params)=>{
console.log(params)
return tid=="pieone"?this.biaogeTishi(params.data,'one'):this.biaogeTishi(params.data,'two')
//return this.echartsData.tableTooltip(tid=="pieone"?this.echartsData.buildingType:this.echartsData.tableDataZhi,params.name)
},
@ -136,7 +135,7 @@ export class AddUnitOneComponent implements OnInit {
this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':params.name,'id':params.data.id}});
}else{
//中队跳转
this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1,'buildid':tid!="pieone"?params.data.id:'','jsid':tid=="pieone"?params.data.id:''}});
}
@ -146,7 +145,7 @@ export class AddUnitOneComponent implements OnInit {
res
tishiData
biaogeTishi(datas,type){
console.log(datas)
//console.log(datas)
this.res=''
this.tishiData=''
if(type=='two'){
@ -163,7 +162,7 @@ export class AddUnitOneComponent implements OnInit {
}
}
console.log(this.tishiData)
//console.log(this.tishiData)
var countall=0//总计
var countbi=0//站比
var allCountbi=0//总站比

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

@ -38,7 +38,7 @@ export class AddUnitThreeBarDetailsComponent implements OnInit {
this.serviceData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildId}`)
this.setTimeoutObj = window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhiNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhiNumData.push(this.tabledata[0].organizations[i].count)
@ -172,10 +172,8 @@ export class AddUnitThreeBarDetailsComponent 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];
console.log(this.organizationId,this.option.xAxis.id)
if(this.serviceData.level=="0"&&this.tiao==false&&this.tabledata[0].organizations[xIndex].subOrganizations.length>=1){
//总队不跳
console.log(params)
this.zhiNameData=[]
this.zhiNumData=[]
this.organizationId=[]
@ -187,7 +185,7 @@ export class AddUnitThreeBarDetailsComponent implements OnInit {
this.serviceData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildId}`)
this.setTimeoutObj = window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhiNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhiNumData.push(this.tabledata[0].organizations[i].count)
@ -204,7 +202,6 @@ export class AddUnitThreeBarDetailsComponent implements OnInit {
},1000)
this.tiao=true
}else{
console.log(this.organizationId,this.option.xAxis.id)
this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':this.option.xAxis.data[xIndex],'type':1,'jsid':this.option.xAxis.id[xIndex],'buildid':this.buildId}});
}
}

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

@ -53,7 +53,7 @@ export class AddUnitThreeLineDetailsComponent implements OnInit {
this.serviceData.getData(this.serviceData.zuzhiorBuilding=='zhi'?parbuild:parzhi,`/api/StatisticsAnalysis`)
this.setTimeoutObj = window.setTimeout(() => {
this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].companyStatistics.trendStatistics.added.length;i++){
if(this.tabledata[0].companyStatistics.trendStatistics.added[i].month>=this.serviceData.selectStartMonth||this.tabledata[0].companyStatistics.trendStatistics.added[i].month<=this.serviceData.selectEndMonth){
this.date.push(this.tabledata[0].companyStatistics.trendStatistics.added[i].month)

8
src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts

@ -19,7 +19,6 @@ export class AddUnitTwoTimeComponent implements OnInit {
tabledata
zongcount=0
ngOnInit(): void {
console.log(this.serviceData.zuzhiorBuilding)
this.serviceData.selectType=0
this.dateInit ()
this.route.queryParams.subscribe(param=>{
@ -53,7 +52,7 @@ export class AddUnitTwoTimeComponent implements OnInit {
this.serviceData.getData(this.serviceData.zuzhiorBuilding=='zhi'?parbuild:parzhi,`/api/StatisticsAnalysis`)
this.setTimeoutObj = window.setTimeout(() => {
this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].companyStatistics.trendStatistics.added.length;i++){
if(this.tabledata[0].companyStatistics.trendStatistics.added[i].month>=this.serviceData.selectStartMonth||this.tabledata[0].companyStatistics.trendStatistics.added[i].month<=this.serviceData.selectEndMonth){
this.date.push(this.tabledata[0].companyStatistics.trendStatistics.added[i].month)
@ -95,7 +94,7 @@ export class AddUnitTwoTimeComponent implements OnInit {
monthSubmit (e) {
this.serviceData.selectStartMonth=this.selectStartMonth
this.serviceData.selectEndMonth=this.selectEndMonth
console.log(this.selectStartMonth,this.selectEndMonth)
//console.log(this.selectStartMonth,this.selectEndMonth)
this.date=[]
this.dateNum=[]
this.zongcount=0
@ -109,7 +108,6 @@ export class AddUnitTwoTimeComponent implements OnInit {
this.zongcount=this.zongcount+this.tabledata[0].companyStatistics.trendStatistics.added[i].count
}
}
console.log(this.dateNum)
//this.oneInit (this.date,this.dateNum)
this.tiaoshiPao=this.serviceData.qipao(this.tiaoshiPao,this.dateNum,this.date)
this.twoInit (this.date,this.dateNum,'month')
@ -153,7 +151,7 @@ export class AddUnitTwoTimeComponent implements OnInit {
this.serviceData.getData(paramdata,`/api/StatisticsAnalysis`)
this.setTimeoutObj = window.setTimeout(() => {
this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].companyStatistics.trendStatistics.added.length;i++){
this.dateNum2.push(this.tabledata[0].companyStatistics.trendStatistics.added[0].count)
this.zongcount=this.zongcount+this.tabledata[0].companyStatistics.trendStatistics.added[i].count

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

@ -46,7 +46,7 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit {
this.echartsData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.echartsData.zuzhiorBuilding=='zhi'?this.canshuId:this.lastId}`)
this.setTimeoutObj = window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhongNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhongNumData.push(this.tabledata[0].organizations[i].count)
@ -76,7 +76,6 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit {
tiaoshiPao:any
//气泡提示数据获取
bianli(){
console.log(this.zhongNumData)
if(this.zhongNumData.length>=1){
var arrshuzu='[';
for(var i=0;i<this.zhongNumData.length;i++){
@ -160,7 +159,7 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit {
//总队和支队跳转
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':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex],'buildid':this.lastId}});
this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex],'buildid':this.echartsData.zuzhiorBuilding=='zhi'?this.canshuId:this.lastId}});
}
}

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

@ -36,7 +36,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
this.data.getData(this.data.zuzhiorBuilding=="zhi"?paramsdata:null,this.data.zuzhiorBuilding=="zhi"?`/api/StatisticsAnalysis/Companies/Organizations/${this.lastId}`:`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.lastId}`)
this.setTimeoutObj = window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.data.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
if(this.data.zuzhiorBuilding=="zhi"){
for(var i=0;i<this.tabledata[0].buildingTypes.length;i++){
this.buildingData.push(this.tabledata[0].buildingTypes[i].buildingTypeName)
@ -302,6 +302,10 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
textStyle: {
fontSize: 30
}
},
grid: {
top: 90,
bottom: 30
},
xAxis: {
id:this.data.zuzhiorBuilding=="zhi"?this.buildingTypeId:this.organizationId,

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-03-15 11:32:30
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-20 15:56:38
* @LastEditTime: 2021-03-22 10:44:47
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@ -79,7 +79,6 @@ export class AllPlanComponent implements OnInit {
//查看详情
lookPlan(e){
if(e.planMode == 0){
console.log(e.attachmentUrls)
var index=e.attachmentUrls[0].indexOf("\/")
if(e.attachmentUrls[0].substr(0,index)=='psw'){
const dialogRef = this.dialog.open(PsViewer, {
@ -156,7 +155,6 @@ export class AllPlanComponent implements OnInit {
export class PsViewer{
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<PsViewer>,@Inject(MAT_DIALOG_DATA) public data: any) {}
ngOnInit(): void {
console.log(this.data)
const viewer = new Viewer({
container: document.querySelector('#viewer'),
panorama:'/api/Objects/PlanPlatform/'+ this.data,

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

@ -32,7 +32,7 @@ export class BuildingTypeOneComponent implements OnInit {
tabledata
initCharts(){
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].buildingTypes.length;i++){
this.lengthdata.push(this.tabledata[0].buildingTypes[i].buildingTypeName)
this.count=this.count+this.tabledata[0].buildingTypes[i].count
@ -40,7 +40,7 @@ export class BuildingTypeOneComponent implements OnInit {
}
//JSON.parse(JSON.stringify(this.indexData).replace(/buildingTypeName/g, 'name'))
this.indexData=this.indexData.map(v=>{return {name: v.buildingTypeName,value:v.count,id:v.buildingTypeId}})
console.log(this.indexData)
//console.log(this.indexData)
this.indexBzt = echarts.init(document.getElementById('indexBzt'),'walden');
let options={
title: {
@ -123,13 +123,11 @@ export class BuildingTypeOneComponent implements OnInit {
tishiData
res:string
biaogeTishiZhi(datas){
console.log(datas,this.tabledata)
for(var a in this.tabledata.buildingTypes){
if(this.tabledata.buildingTypes[a].buildingTypeId==datas.id){
this.tishiData=this.tabledata.buildingTypes[a].organizations
}
}
console.log(this.tishiData)
var countall=0//总计
var countbi=0//站比
var allCountbi=0//总站比

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

@ -43,7 +43,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
this.echartsData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildingTypeId}`)
window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhongNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhongNumData.push(this.tabledata[0].organizations[i].count)
@ -140,7 +140,6 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
/*事件处理代码书写位置*/
if(this.echartsData.level=="0"&&this.tiao==false&&this.tabledata[0].organizations[xIndex].subOrganizations.length>=1){
//总队不跳转
console.log(params)
this.zhongNameData=[]
this.zhongNumData=[]
this.organizationId=[]
@ -152,7 +151,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
this.echartsData.getData(paramsdatee,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildingTypeId}`)
window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata)
//console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhongNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhongNumData.push(this.tabledata[0].organizations[i].count)
@ -184,13 +183,11 @@ export class BuildingTypeThreeDetailsComponent implements OnInit {
tishiData
res
tableTooltip(datas:any){
console.log(datas)
for(var a in this.echartsData.obdata[0].organizations){
if(this.echartsData.obdata[0].organizations[a].organizationName==datas.name){
this.tishiData=this.echartsData.obdata[0].organizations[a].subOrganizations
}
}
console.log(this.tishiData)
var countall=0//总计
var countbi=0//站比
var allCountbi=0//总站比

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

@ -296,7 +296,6 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
tooltip: {
trigger: 'item',
formatter: (params)=>{
console.log(params)
return this.tableTooltip(params)
},
position: this.data.tableTooltipNoShow2
@ -341,13 +340,11 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
res
tishiData
tableTooltip(datas){
console.log(datas)
for(var a in this.data.obdata[0].organizations){
if(this.data.obdata[0].organizations[a].organizationName==datas.name){
this.tishiData=this.data.obdata[0].organizations[a].subOrganizations
}
}
console.log(this.tishiData)
var countall=0//总计
var countbi=0//站比
var allCountbi=0//总站比

Loading…
Cancel
Save