Browse Source

[修改]美工pad和华为pad分开

zhuzhou
chenjingyu 4 years ago
parent
commit
874f7581fa
  1. 21
      src/app/key-unit/key-unit-management/key-unit-management.component.html
  2. 16
      src/app/key-unit/key-unit-management/key-unit-management.component.scss
  3. 74
      src/app/plan-audit/plan-record/plan-record.component.scss
  4. 45
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  5. 16
      src/app/plan-management/entry-plan/entry-plan.component.scss
  6. 16
      src/app/plan-management/maintain-up/maintain-up.component.scss
  7. 37
      src/app/plan-management/meet-plan/meet-plan.component.html
  8. 18
      src/app/plan-management/meet-plan/meet-plan.component.scss
  9. 67
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  10. 18
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
  11. 32
      src/app/plan-management/open-plan/open-plan.component.html
  12. 20
      src/app/plan-management/open-plan/open-plan.component.scss
  13. 22
      src/app/plan-management/pass-plan/pass-plan.component.scss
  14. 11
      src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
  15. 60
      src/app/plan-management/type-plan/type-plan.component.html
  16. 18
      src/app/plan-management/type-plan/type-plan.component.scss
  17. 84
      src/app/statistic-analysis/echarts-data.service.ts
  18. 39
      src/app/statistic-analysis/state/page-one/page-one.component.ts
  19. 2
      src/app/statistic-analysis/state/page-two-time/page-two-time.component.html

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

@ -8,27 +8,28 @@
<input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off"> <input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" > <div class="queryField" >
<label style="margin-right: 10px;">关注单位:</label> <label style="margin-right: 10px;">统一社会信用代码:</label>
<mat-form-field> <mat-form-field class="example-full-width">
<mat-select placeholder='请选择单位是否关注' [(ngModel)]="follow" name="follow"> <input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off">
<mat-option value="0">未关注</mat-option>
<mat-option value="1">已关注</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span> <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span> <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
</div> </div>
<div class="queryField" *ngIf="!pcfind"> <div class="queryField" *ngIf="!pcfind">
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">统一社会信用代码:</label> <label style="margin-right: 10px;">关注单位:</label>
<mat-form-field class="example-full-width"> <mat-form-field>
<input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off"> <mat-select placeholder='请选择单位是否关注' [(ngModel)]="follow" name="follow">
<mat-option value="0">未关注</mat-option>
<mat-option value="1">已关注</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">单位类型:</label> <label style="margin-right: 10px;">单位类型:</label>

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

@ -14,16 +14,26 @@
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 3px 10px; //margin: 3px 10px;
input { input {
//width: 180px; //width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px;} border-radius: 3px;}
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 3px 20px;
}
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 150px; width: 140px;
} }
} }
} }

74
src/app/plan-audit/plan-record/plan-record.component.scss

@ -16,9 +16,12 @@
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 30px 0 0 28px; margin: 30px 0 0 28px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-top: 10px; margin-top: 10px;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin: 20px 0 0 15px;
}
height: 40px; height: 40px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -26,9 +29,12 @@
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
font-size: 16px; font-size: 16px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 13px; font-size: 13px;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
font-size: 16px;
}
margin-left: 3px; margin-left: 3px;
} }
input{ input{
@ -36,10 +42,14 @@
margin-left: 50px; margin-left: 50px;
top: 6px; top: 6px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-left: 12px; margin-left: 12px;
top: 3px; top: 3px;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 12px;
top: 6px;
}
position: relative; position: relative;
} }
@ -47,30 +57,37 @@
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
margin-left: 110px; margin-left: 110px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-left: 20px; margin-left: 20px;
position: relative; position: relative;
bottom: 4px; bottom: 4px;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 20px;
}
} }
} }
.headdivtwo{ .headdivtwo{
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 0 0 0 28px; margin: 0 0 0 28px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-left: 0; margin-left: 0;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin: 0 0 0 15px;
}
//height: 40px; //height: 40px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
span{ span{
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1200px){
font-size: 16px; font-size: 16px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 13px; font-size: 13px;
} }
margin-left: 3px; margin-left: 3px;
} }
input{ input{
@ -78,10 +95,14 @@
margin-left: 50px; margin-left: 50px;
top: 5px; top: 5px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-left: 0; margin-left: 0;
top: 3px; top: 3px;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 0;
top: 5px;
}
position: relative; position: relative;
@ -101,21 +122,32 @@
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
margin-left: 30px; margin-left: 30px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 13px; font-size: 13px;
mat-form-field{ mat-form-field{
width: 120px; width: 120px;
} }
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 15px;
mat-form-field{
width: 120px;
}
}
} }
.headfour{ .headfour{
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 13px; font-size: 13px;
mat-form-field{ mat-form-field{
width: 150px; width: 150px;
} }
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 15px;
mat-form-field{
width: 150px;
}
}
span{ span{
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
margin-left: 30px; margin-left: 30px;
@ -128,16 +160,23 @@
width: 80px; width: 80px;
height: 36px; height: 36px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-left: 80px;
}
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 80px; margin-left: 80px;
} }
} }
img{ img{
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
height: 14px;
width: 14px;
}
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
height: 14px; height: 14px;
width: 14px; width: 14px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
height: 12px; height: 12px;
width: 12px; width: 12px;
} }
@ -174,12 +213,13 @@
//font-size: 16px; //font-size: 16px;
th{ th{
font-weight:10; font-weight:10;
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1200px){
font-size: 16px; font-size: 16px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 13px; font-size: 13px;
} }
} }
} }
@ -234,10 +274,10 @@
} }
th,td{ th,td{
height:48px; height:48px;
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1200px){
font-size: 16px; font-size: 16px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 13px; font-size: 13px;
} }
text-align: center; text-align: center;

45
src/app/plan-audit/wait-examineer/wait-examineer.component.scss

@ -13,10 +13,13 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.headdiv{ .headdiv{
@media screen and (min-device-width:1300px){ @media screen and (min-device-width:1400px){
margin: 0 0 0 28px; margin: 0 0 0 28px;
} }
@media screen and (max-device-width:1300px){ @media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 15px;
}
@media screen and (max-device-width:1200px){
margin-left: 5px; margin-left: 5px;
} }
height: 40px; height: 40px;
@ -29,10 +32,12 @@
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
font-size: 16px; font-size: 16px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1400px) and (min-device-width:1200px){
font-size: 16px;
}
@media screen and (max-device-width:1200px){
font-size: 14px; font-size: 14px;
} }
margin-left: 3px; margin-left: 3px;
} }
input{ input{
@ -41,34 +46,50 @@
margin-left: 50px; margin-left: 50px;
top: 6px; top: 6px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-left: 8px; margin-left: 8px;
top: 4px; top: 4px;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 8px;
top: 6px;
}
} }
.count{ .count{
@media screen and (min-device-width:1300px){ @media screen and (min-device-width:1400px){
margin-left: 110px; margin-left: 110px;
} }
@media screen and (max-device-width:1300px){ @media screen and (max-device-width:1200px){
margin-left: 20px; margin-left: 20px;
position: relative; position: relative;
bottom: 3px; bottom: 3px;
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 20px;
/* position: relative;
bottom: 3px; */
}
} }
} }
.headthree{ .headthree{
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
margin-left: 30px; margin-left: 30px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
margin-left: 7px; margin-left: 7px;
font-size: 14px; font-size: 14px;
mat-form-field{ mat-form-field{
width: 120px; width: 120px;
} }
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 15px;
//font-size: 14px;
mat-form-field{
width: 140px;
}
}
button{ button{
@ -113,10 +134,10 @@
} }
td{ td{
font-weight:10; font-weight:10;
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1200px){
font-size: 16px; font-size: 16px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 14px; font-size: 14px;
} }
} }
@ -133,10 +154,10 @@
//font-size: 10px; //font-size: 10px;
th{ th{
font-weight:10; font-weight:10;
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1200px){
font-size: 16px; font-size: 16px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1200px){
font-size: 14px; font-size: 14px;
} }
} }

16
src/app/plan-management/entry-plan/entry-plan.component.scss

@ -6,20 +6,30 @@
// border-bottom: 1px solid black; // border-bottom: 1px solid black;
.queryBox { .queryBox {
box-sizing: border-box; box-sizing: border-box;
padding: 5px 5px 0 10px; padding: 5px 0 0 10px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 0 10px; //margin: 0 10px;
input { input {
width: 180px; width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px;} border-radius: 3px;}
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 3px 20px;
}
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 160px; width: 160px;
} }

16
src/app/plan-management/maintain-up/maintain-up.component.scss

@ -16,15 +16,25 @@
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 3px 10px; // margin: 3px 10px;
input { input {
width: 180px; width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px;} border-radius: 3px;}
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 3px 10px;
}
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 15px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 130px; width: 120px;
} }
} }
} }

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

@ -9,35 +9,36 @@
<input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname"> <input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" >
<label style="margin-right: 10px;">编制级别:</label>
<div class="queryField">
<label style="margin-right: 10px;">预案级别:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择预案级别' name="level" [(ngModel)]="level"> <mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">
<mat-option value="6">国家级</mat-option> <!-- <mat-option value="1">总队</mat-option>
<mat-option value="7">市级</mat-option> <mat-option value="2">支队</mat-option>
</mat-select> <mat-option value="4">大队</mat-option>
<mat-option value="8">中队</mat-option> -->
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
<span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span> <span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span> <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
</div> </div>
<div class="queryField" *ngIf="!pcfind"> <div class="queryField" *ngIf="!pcfind">
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label> <label style="margin-right: 10px;">预案级别:</label>
<mat-form-field> <mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel"> <mat-select placeholder='请选择预案级别' name="level" [(ngModel)]="level">
<!-- <mat-option value="1">总队</mat-option> <mat-option value="6">国家级</mat-option>
<mat-option value="2">支队</mat-option> <mat-option value="7">市级</mat-option>
<mat-option value="4">大队</mat-option> </mat-select>
<mat-option value="8">中队</mat-option> -->
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加人:</label> <label style="margin-right: 10px;">添加人:</label>

18
src/app/plan-management/meet-plan/meet-plan.component.scss

@ -6,23 +6,33 @@
// border-bottom: 1px solid black; // border-bottom: 1px solid black;
.queryBox { .queryBox {
box-sizing: border-box; box-sizing: border-box;
padding: 5px 25px 0 15px; padding: 5px 0 0 15px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 3px 10px;
input { input {
width: 180px; width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px; border-radius: 3px;
} }
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 3px 20px;
}
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 140px; width: 120px;
} }
} }
} }

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

@ -4,32 +4,58 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-12-24 14:15:10 * @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-03-30 15:54:25 * @LastEditTime: 2021-04-01 14:35:30
--> -->
<div style="height: 100%;overflow-y: auto;"> <div style="height: 100%;overflow-y: auto;">
<div class="header" > <div class="header" >
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm"> <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="queryBox"> <div class="queryBox">
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">预案名称:</label> <label style="margin-right: 10px;">预案名称:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname"> <input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField"> <div class="queryField" >
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">
<!-- <mat-option value="1">总队</mat-option>
<mat-option value="2">支队</mat-option>
<mat-option value="4">大队</mat-option>
<mat-option value="8">中队</mat-option> -->
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select>
</mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</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>
<div class="queryField" *ngIf="!pcfind">
<button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div>
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加人:</label> <label style="margin-right: 10px;">添加人:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input matInput placeholder="请输入添加人" name="addname" autocomplete="off" [(ngModel)]="addname"> <input matInput placeholder="请输入添加人" name="addname" autocomplete="off" [(ngModel)]="addname">
</mat-form-field> </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" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label>
<mat-form-field>
<input matInput placeholder="请输入预案类型" name="reservePlanType" autocomplete="off" [(ngModel)]="typePlan">
</mat-form-field>
<span *ngIf="pcMore" style="margin-left: 15px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
</div> </div>
<div class="queryField" *ngIf="!pcfind">
<div class="queryField" *ngIf="pcfind" >
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">添加时间:</label> <label style="margin-right: 10px;">添加时间:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime"> <input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime">
@ -41,18 +67,7 @@
<input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime"> <input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label>
<mat-form-field>
<input matInput placeholder="请输入预案类型" name="reservePlanType" autocomplete="off" [(ngModel)]="typePlan">
</mat-form-field>
<span *ngIf="pcMore" style="margin-left: 15px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
</div>
<div class="queryField" *ngIf="pcfind" >
<button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">审核状态:</label> <label style="margin-right: 10px;">审核状态:</label>
<mat-form-field> <mat-form-field>
@ -64,19 +79,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">编制级别:</label>
<mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">
<!-- <mat-option value="1">总队</mat-option>
<mat-option value="2">支队</mat-option>
<mat-option value="4">大队</mat-option>
<mat-option value="8">中队</mat-option> -->
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select>
</mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div>
</div> </div>

18
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss

@ -6,23 +6,33 @@
// border-bottom: 1px solid black; // border-bottom: 1px solid black;
.queryBox { .queryBox {
box-sizing: border-box; box-sizing: border-box;
padding: 5px 5px 0 15px; padding: 5px 0 0 15px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 0 10px; //margin: 0 10px;
input { input {
width: 180px; width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px; border-radius: 3px;
} }
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 3px 20px;
}
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 160px; width: 120px;
} }
} }
} }

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

@ -8,33 +8,33 @@
<input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off"> <input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" >
<label style="margin-right: 10px;">编制级别:</label>
<div class="queryField">
<label style="margin-right: 10px;">单位类型:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype"> <mat-select [(ngModel)]="preparelevel" name="preparelevel" placeholder='请选择编制级别'>
<mat-option *ngFor="let unit of allunittype" [value]="unit.id" > <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
{{unit.name}} </mat-select>
</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
<span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span> <span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span> <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
</div> </div>
<div class="queryField" *ngIf="!pcfind"> <div class="queryField" *ngIf="!pcfind">
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label> <label style="margin-right: 10px;">单位类型:</label>
<mat-form-field> <mat-form-field>
<mat-select [(ngModel)]="preparelevel" name="preparelevel" placeholder='请选择编制级别'> <mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option> <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
</mat-select> {{unit.name}}
</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label> <label style="margin-right: 10px;">预案类型:</label>
<mat-form-field> <mat-form-field>

20
src/app/plan-management/open-plan/open-plan.component.scss

@ -1,28 +1,38 @@
.header { .header {
width: 100%; width: 100%;
padding: 12px 10px; padding: 12px 5px;
// margin-bottom: 10px; // margin-bottom: 10px;
box-sizing: border-box; box-sizing: border-box;
// border-bottom: 1px solid black; // border-bottom: 1px solid black;
.queryBox { .queryBox {
box-sizing: border-box; box-sizing: border-box;
padding: 5px 15px; padding: 5px 0 0 15px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 3px 10px; //margin: 3px 10px;
input { input {
width: 180px; width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px; border-radius: 3px;
} }
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 3px 20px;
}
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 140px; width: 130px;
} }
} }
} }

22
src/app/plan-management/pass-plan/pass-plan.component.scss

@ -4,7 +4,7 @@
box-sizing: border-box; box-sizing: border-box;
.queryBox { .queryBox {
box-sizing: border-box; box-sizing: border-box;
padding: 5px 5px 0 5px; padding: 5px 0 0 5px;
// margin-left: 50px; // margin-left: 50px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -12,18 +12,28 @@
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 0 10px; //margin: 0 10px;
input { input {
width: 180px; width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px; border-radius: 3px;
} }
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
mat-form-field{ margin: 3px 20px;
width: 110px; }
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{
width: 120px;
}
} }
}
} }

11
src/app/plan-management/reinforce-plan/reinforce-plan.component.scss

@ -4,7 +4,7 @@
box-sizing: border-box; box-sizing: border-box;
.queryBox { .queryBox {
box-sizing: border-box; box-sizing: border-box;
padding:5px 5px 0 5px; padding:5px 0 0 5px;
// margin-left: 50px; // margin-left: 50px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -19,7 +19,14 @@
line-height: 22px; line-height: 22px;
border-radius: 3px; border-radius: 3px;
} }
@media screen and (max-device-width:1400px){ @media screen and (max-device-width:1400px)and (min-device-width:1200px){
//margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
//margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 110px; width: 110px;
} }

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

@ -9,30 +9,32 @@
<input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname"> <input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" >
<div class="queryField"> <label style="margin-right: 10px;">编制级别:</label>
<label style="margin-right: 10px;">添加人:</label> <mat-form-field>
<mat-form-field class="example-full-width"> <mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">
<input matInput placeholder="请输入添加人" name="addname" autocomplete="off" [(ngModel)]="addname"> <!-- <mat-option value="1">总队</mat-option>
</mat-form-field> <mat-option value="2">支队</mat-option>
<span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span> <mat-option value="4">大队</mat-option>
<mat-option value="8">中队</mat-option> -->
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select>
</mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
<span *ngIf="padMore" style="margin-left: 20px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span> <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
</div> </div>
<div class="queryField" *ngIf="!pcfind"> <div class="queryField" *ngIf="!pcfind">
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">添加时间:</label> <label style="margin-right: 10px;">添加:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime"> <input matInput placeholder="请输入添加人" name="addname" autocomplete="off" [(ngModel)]="addname">
</mat-form-field>
<!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
<mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
<span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
<mat-form-field class="example-full-width" style="margin-left: 10px;">
<input type="date" matInput autocomplete="off" name="endtime" [(ngModel)]="endtime">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
@ -52,19 +54,19 @@
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">编制级别:</label> <label style="margin-right: 10px;">添加时间:</label>
<mat-form-field> <mat-form-field class="example-full-width">
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel"> <input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime">
<!-- <mat-option value="1">总队</mat-option> </mat-form-field>
<mat-option value="2">支队</mat-option> <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
<mat-option value="4">大队</mat-option> <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
<mat-option value="8">中队</mat-option> --> <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option> <mat-form-field class="example-full-width" style="margin-left: 10px;">
</mat-select> <input type="date" matInput autocomplete="off" name="endtime" [(ngModel)]="endtime">
</mat-form-field> </mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox> </div>
</div>
</div> </div>
</form> </form>

18
src/app/plan-management/type-plan/type-plan.component.scss

@ -6,23 +6,33 @@
// border-bottom: 1px solid black; // border-bottom: 1px solid black;
.queryBox { .queryBox {
box-sizing: border-box; box-sizing: border-box;
padding: 5px 25px 0 15px; padding: 5px 0 0 15px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
align-items:center; align-items:center;
// justify-content:center; // justify-content:center;
.queryField { .queryField {
margin: 3px 10px; // margin: 3px 10px;
input { input {
width: 180px; width: 180px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
border-radius: 3px; border-radius: 3px;
} }
@media screen and (max-device-width:1400px){ @media screen and (min-device-width:1400px){
margin: 3px 20px;
}
@media screen and (max-device-width:1400px)and (min-device-width:1200px){
margin: 3px 10px;
mat-form-field{
width: 180px;
}
}
@media screen and (max-device-width:1200px){
margin: 3px 0 3px 10px;
mat-form-field{ mat-form-field{
width: 150px; width: 120px;
} }
} }
} }

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

@ -439,7 +439,7 @@ export class EchartsDataService {
this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>' this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>'
} }
this.res+='</tbody>' 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+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">100%</td></tfoot>'
this.res+='</table></div></div>' this.res+='</table></div></div>'
return this.res return this.res
@ -479,7 +479,7 @@ export class EchartsDataService {
} }
this.res+='</tbody>' 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+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">100%</td></tfoot>'
this.res+='</table></div></div>' this.res+='</table></div></div>'
return this.res return this.res
} }
@ -487,66 +487,17 @@ export class EchartsDataService {
apidata=[] apidata=[]
biaogeTishiyuan(datas){ biaogeTishiyuan(datas){
//localStorage.setItem('tishi',this.tishiData) //localStorage.setItem('tishi',this.tishiData)
console.log(datas) this.tishiData=''
let paramdata={ for(var a in this.obdata[0].plansStatuses){
planStatus:datas.type if(this.obdata[0].plansStatuses[a].planStatusName==datas.planStatusName){
} this.tishiData=this.obdata[0].plansStatuses[a].organizations
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 if(datas.name='预案编制'){
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')
} }
var countall=0//总计
var countbi=0//站比
console.log(JSON.parse(this.localData) ) var allCountbi=0//总站比
this.localData=JSON.parse(this.localData) for(var i=0;i<this.tishiData.length;i++){
window.setTimeout(()=>{ countall+=this.tishiData[i].count
var countall=0//总计
var countbi=0//站比
var allCountbi=0//总站比
for(var i=0;i<this.localData.length;i++){
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= '<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"; >'; 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"; >';
@ -556,20 +507,19 @@ export class EchartsDataService {
this.res+='<td style="text-align:center;width:30%;">总占比</td>' this.res+='<td style="text-align:center;width:30%;">总占比</td>'
this.res+='</tr></thead>' this.res+='</tr></thead>'
this.res+='<tbody>'; this.res+='<tbody>';
for(var i=0;i<this.localData.length;i++){ for(var i=0;i<this.tishiData.length;i++){
countbi=Math.round(this.localData[i].count/countall* 10000)/ 100.00 countbi=Math.round(this.tishiData[i].count/countall* 10000)/ 100.00
allCountbi=allCountbi+countbi allCountbi=allCountbi+countbi
this.res+='<tr>' this.res+='<tr>'
this.res+='<td style="text-align:center;">'+this.localData[i].organizationName+'</td>' this.res+='<td style="text-align:center;">'+this.tishiData[i].organizationName+'</td>'
this.res+='<td style="text-align:center;">'+this.localData[i].count+'</td>' this.res+='<td style="text-align:center;">'+this.tishiData[i].count+'</td>'
this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>' this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>'
} }
this.res+='</tbody>' 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+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">100%</td></tfoot>'
this.res+='</table></div></div>' this.res+='</table></div></div>'
return this.res return this.res
})
} }

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

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-01 15:24:39 * @Date: 2020-09-01 15:24:39
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-04-01 09:46:00 * @LastEditTime: 2021-04-01 14:22:36
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@ -109,11 +109,11 @@ export class PageOneComponent implements OnInit {
}, },
data: [ data: [
{value: this.tabledata[0].planningStatistics.newCount, name: '预案新增',type:1}, {value: this.tabledata[0].plansStatuses[0].count, name: '预案新增',type:1,planStatusName:this.tabledata[0].plansStatuses[0].planStatusName},
{value: this.tabledata[0].planningStatistics.approvedCount, name: '预案审核通过',itemStyle:{color:'#02A7F0'},type:3}, {value: this.tabledata[0].plansStatuses[2].count, name: '预案审核通过',itemStyle:{color:'#02A7F0'},type:3,planStatusName:this.tabledata[0].plansStatuses[2].planStatusName},
{value: this.tabledata[0].planningStatistics.editingCount, name: '预案编制',type:5}, {value: this.tabledata[0].plansStatuses[4].count, name: '预案编制',type:5,planStatusName:this.tabledata[0].plansStatuses[4].planStatusName},
{value: this.tabledata[0].planningStatistics.rejectedCount, name: '预案审核退回',type:4}, {value: this.tabledata[0].plansStatuses[3].count, name: '预案审核退回',type:4,planStatusName:this.tabledata[0].plansStatuses[3].planStatusName},
{value: this.tabledata[0].planningStatistics.auditingCount, name: '预案审核中',type:2} {value: this.tabledata[0].plansStatuses[1].count, name: '预案审核中',type:2,planStatusName:this.tabledata[0].plansStatuses[1].planStatusName}
], ],
emphasis: { emphasis: {
itemStyle: { itemStyle: {
@ -126,19 +126,22 @@ export class PageOneComponent implements OnInit {
] ]
}; };
this.indexBzt.on('click', (params) => { this.indexBzt.on('click', (params) => {
/* let jwt = sessionStorage.getItem("token"); console.log(params)
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); for(var i=0;i<this.tabledata[0].plansStatuses.length;i++){
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); if(this.tabledata[0].plansStatuses[i].planStatusName==params.data.planStatusName){
let identityJsonparse=JSON.parse(identityJson) */ if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.tabledata[0].plansStatuses[i].organizations.length>0){
if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.echartsData.localData.length>0){ window.setTimeout(()=>{
window.setTimeout(()=>{ this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':params.name,'type':params.data.type}});
this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':params.name,'type':params.data.type}}); })
}) }
} else if(this.echartsData.level=='3'){
else if(this.echartsData.level=='3'){ //中队跳转
//中队跳转 this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'id':null,'type':params.data.type}});
this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'id':null,'type':params.data.type}}); }
}
} }
}); });
this.indexBzt.setOption(options); this.indexBzt.setOption(options);
} }

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

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-05 08:59:24 * @Date: 2020-09-05 08:59:24
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-03-17 08:49:56 * @LastEditTime: 2021-04-01 15:54:10
--> -->
<div class="content"> <div class="content">

Loading…
Cancel
Save