Browse Source

[修改]预案管理模块区分维护更新还是新增

tangshan
陈敬瑜 3 years ago
parent
commit
a342241749
  1. 13
      src/app/key-unit/key-unit-management/key-unit-management.component.html
  2. 19
      src/app/key-unit/key-unit-management/key-unit-management.component.scss
  3. 5
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  4. 7
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  5. 19
      src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
  6. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  7. 13
      src/app/plan-management/entry-plan/entry-plan.component.html
  8. 19
      src/app/plan-management/entry-plan/entry-plan.component.scss
  9. 7
      src/app/plan-management/entry-plan/entry-plan.component.ts
  10. 13
      src/app/plan-management/meet-plan/meet-plan.component.html
  11. 19
      src/app/plan-management/meet-plan/meet-plan.component.scss
  12. 5
      src/app/plan-management/meet-plan/meet-plan.component.ts
  13. 14
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  14. 20
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
  15. 5
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  16. 14
      src/app/plan-management/open-plan/open-plan.component.html
  17. 19
      src/app/plan-management/open-plan/open-plan.component.scss
  18. 6
      src/app/plan-management/open-plan/open-plan.component.ts
  19. 17
      src/app/plan-management/pass-plan/pass-plan.component.html
  20. 19
      src/app/plan-management/pass-plan/pass-plan.component.scss
  21. 6
      src/app/plan-management/pass-plan/pass-plan.component.ts
  22. 22
      src/app/plan-management/reinforce-plan/reinforce-plan.component.html
  23. 19
      src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
  24. 6
      src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
  25. 14
      src/app/plan-management/type-plan/type-plan.component.html
  26. 19
      src/app/plan-management/type-plan/type-plan.component.scss
  27. 5
      src/app/plan-management/type-plan/type-plan.component.ts
  28. 10
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
  29. 4
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
  30. 41
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

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

@ -111,6 +111,12 @@
autocomplete="off">
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<input type="radio" [(ngModel)]="IsNewData" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true'>
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" [(ngModel)]="IsNewData" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false'>
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
</div>
@ -146,6 +152,13 @@
</td>
</ng-container>
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">

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

@ -92,6 +92,25 @@
}
}
.tablebox{
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
margin-top: 15px;

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

@ -67,7 +67,7 @@ export class KeyUnitManagementComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any //第几页
displayedColumns: string[] = ['checked','Follow','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation'];
displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation'];
tabledataSource:any
allorganizations:any
oldDataSource:any; //原始表格数据
@ -354,6 +354,7 @@ export class KeyUnitManagementComponent implements OnInit {
]
allKeyUnitInfo:any //所有的重点单位
IsNewData=true//是否是新增或者维护更新
getAllKeyUnit(){
// console.log(Boolean(Number(this.follow)))
let follow
@ -378,7 +379,7 @@ export class KeyUnitManagementComponent implements OnInit {
PageSize: this.pageSizeOptions[0],
Sort: this.integritySort ? 'integrityscore' : '',
SortType: this.integritySort || '',
IsNewData:true,
IsNewData:this.IsNewData,
IntegrityScoreMin:this.integrityScoreMin/100||0,
IntegrityScoreMax:this.integrityScoreMax/100||1
}

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

@ -43,6 +43,13 @@
</div>
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="planname">
<th mat-header-cell *matHeaderCellDef>预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>

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

@ -25,6 +25,25 @@
}
.tablebox{
overflow: auto;
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
margin-left: 0%;

4
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@ -39,8 +39,8 @@ export class EntryPlanLookComponent implements OnInit {
dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
myControl = new FormControl();
hasChild = (_: number, node: any) => node.expandable;
displayedColumns: string[] = ['planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation'];
IsNewData=true //维护更新活新增
displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation'];
tabledataSource: any
//分页
@ViewChild(MatPaginator, { static: true })

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

@ -125,6 +125,12 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
</div>
</form>
</div>
@ -133,6 +139,13 @@
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.company.isNewData">新增</span>
<span class="weihu" *ngIf="!element.company.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">{{element.company.name}}</td>

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

@ -100,6 +100,25 @@
}
}
.tablebox{
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
margin-left: 0%;

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

@ -42,10 +42,10 @@ export class EntryPlanComponent implements OnInit {
pageSize:any; //每页条数
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any; //第几页
IsNewData=true //维护更新活新增
displayedColumns: string[] = ['unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation'];
displayedColumns: string[] = ['state','unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation'];
allorganizations:any //所有组织机构
allunittype:any //所有单位类型
tabledataSource:any //表格数据
@ -333,7 +333,8 @@ export class EntryPlanComponent implements OnInit {
Sort: this.integritySort ? 'integrityscore' : '',
SortType: this.integritySort || '',
HasPlanComponents:this.haveyuan||'',
PlanCategories:this.planCategory
PlanCategories:this.planCategory,
IsNewData:this.IsNewData,
}
this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{

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

@ -84,6 +84,12 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
</div>
<!-- <div class="butclass" style="width: 100%;text-align: center;">
@ -110,6 +116,13 @@
<div class="body">
<div class="tablebox" id="table">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>

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

@ -111,6 +111,25 @@
}
}
.tablebox{
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
margin-left: 0%;

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

@ -82,7 +82,8 @@ export class MeetPlanComponent implements OnInit {
preparelevels: any
plcheck: boolean //编制级别勾选框
displayedColumns: string[] = ['unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
IsNewData=true //维护更新活新增
displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
tabledataSource
typePlan//新预案类型
unitname//预案名称
@ -140,7 +141,7 @@ export class MeetPlanComponent implements OnInit {
HasChildrenPlanLevel: this.plcheck || '',
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
IsNewData:this.IsNewData,
}
this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
this.length = data.totalCount

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

@ -79,7 +79,12 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
</div>
@ -102,6 +107,13 @@
<div class="body">
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>

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

@ -119,6 +119,26 @@
text-align: center;
font-size: 15px;
color: #000000;
}
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
}
mat-paginator{

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

@ -95,7 +95,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
url
preparelevels: any
plcheck: boolean //编制级别勾选框
displayedColumns: string[] = ['unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
tabledataSource
unitname//预案名称
level//预案级别
@ -114,6 +114,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
pageSize: any; //每页条数
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber: any; //第几页
IsNewData=true //维护更新活新增
//获取表格数据
getAlltabledate() {
@ -135,7 +136,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
HasChildrenPlanLevel: this.plcheck || '',
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
IsNewData:this.IsNewData,
}
this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
this.length = data.totalCount

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

@ -46,7 +46,12 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
<div class="queryField" *ngIf="pcfind" >
<button mat-raised-button color="primary">查询</button>
@ -60,6 +65,13 @@
<div class="body">
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">{{element.companyName}}</td>

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

@ -89,6 +89,25 @@
}
}
.tablebox{
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
margin-top: 15px;

6
src/app/plan-management/open-plan/open-plan.component.ts

@ -43,8 +43,9 @@ export class OpenPlanComponent implements OnInit {
pageSize: any; //每页条数
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber: any; //第几页
IsNewData=true //维护更新活新增
displayedColumns: string[] = ['unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation'];
displayedColumns: string[] = ['state','unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation'];
allorganizations: any //所有组织机构
allunittype: any //所有单位类型
@ -126,7 +127,8 @@ export class OpenPlanComponent implements OnInit {
HasChildrenPlanLevel: this.plcheck || '',
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
Sort: ''
Sort: '',
IsNewData:this.IsNewData,
}
this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => {
// console.log(111,data)

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

@ -109,6 +109,12 @@
<input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
</div>
@ -119,10 +125,13 @@
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<!-- <ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">{{element.companyName}}</td>
</ng-container> -->
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="planname">
<th mat-header-cell *matHeaderCellDef>预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>

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

@ -95,6 +95,25 @@
}
}
.tablebox{
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
// margin-left: 2%;

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

@ -44,10 +44,11 @@ export class PassPlanComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber: any; //第几页
displayedColumns: string[] = ['planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation'];
displayedColumns: string[] = ['state','planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation'];
allorganizations: any //所有组织机构
allunittype: any //所有单位类型
tabledataSource: any //表格数据
IsNewData=true //维护更新活新增
url
preparelevels: any
@ -136,7 +137,8 @@ export class PassPlanComponent implements OnInit {
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
Sort: '',
PlanCategories: this.planCategory
PlanCategories: this.planCategory,
IsNewData:this.IsNewData,
}
this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => {
this.length = data.totalCount

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

@ -78,14 +78,19 @@
</mat-select>
</mat-form-field>
</div>
</div>
<div class="butclass" style="width: 100%;text-align: center;" *ngIf="pcfind">
<div class="queryField" *ngIf="!padMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
<div class="queryField" style="width: 100%;text-align: center;" *ngIf="pcfind">
<button mat-raised-button color="primary" type="submit">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div>
</div>
</form>
</div>
<mat-divider></mat-divider>
@ -93,6 +98,13 @@
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">{{element.companyName}}</td>

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

@ -90,6 +90,25 @@
}
}
.tablebox{
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
// margin-left: 2%;

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

@ -44,10 +44,11 @@ export class ReinforcePlanComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any; //第几页
displayedColumns: string[] = ['unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
displayedColumns: string[] = ['state','unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
allorganizations:any //所有组织机构
allunittype:any //所有单位类型
tabledataSource:any //表格数据
IsNewData=true //维护更新活新增
preparelevels:any
ngOnInit(): void {
@ -127,7 +128,8 @@ export class ReinforcePlanComponent implements OnInit {
CreationTimeRangeEnd:this.endtime||'',
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
Sort: ''
Sort: '',
IsNewData:this.IsNewData,
}
this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{
// console.log('增援预案列表',data)

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

@ -66,7 +66,12 @@
<input type="date" matInput autocomplete="off" name="endtime" [(ngModel)]="endtime">
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">新增</label>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
</div>
</div>
</form>
@ -89,6 +94,13 @@
<div class="body">
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef style="width: 20%;">预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>

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

@ -111,6 +111,25 @@
}
}
.tablebox{
.add{
display: block;
width: 40px;
height: 20px;
background: #1AE2AC;
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
margin-left: 40px;
}
.weihu{
//display: block;
width: 64px;
height: 20px;
background: #2196F3;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
}
table{
width: 100%;
margin-left: 0%;

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

@ -89,7 +89,8 @@ export class TypePlanComponent implements OnInit {
levels
preparelevels: any
plcheck: boolean //编制级别勾选框
displayedColumns: string[] = ['unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
IsNewData=true //维护更新活新增
displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
tabledataSource
unitname//预案名称
level//预案级别
@ -121,7 +122,7 @@ export class TypePlanComponent implements OnInit {
HasChildrenPlanLevel: this.plcheck || '',
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
IsNewData:this.IsNewData,
}
this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
this.length = data.totalCount

10
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html

@ -32,15 +32,17 @@
<div class="echartsbox" >
<div id="pie">
</div>
<span style="position: relative;top: 3%;right: 15%;cursor: pointer;" >
<!-- <span style="position: relative;top: 3%;right: 15%;cursor: pointer;" >
<mat-icon >autorenew</mat-icon>
</span>
</span> -->
<button mat-raised-button (click)='danweiClick()' [ngClass]="{'selectedBtn': dwOryuan=='danwei'}" style="margin:0 10px;">单位信息</button>
<button mat-raised-button (click)='yuanClick()' [ngClass]="{'selectedBtn': dwOryuan=='yuan'}">预案信息</button>
<div id="pieTwo">
</div>
<span style="position: relative;top: 3%;right: 15%;cursor: pointer;" >
<!-- <span style="position: relative;top: 3%;right: 15%;cursor: pointer;" >
<mat-icon >autorenew</mat-icon>
</span>
</span> -->
</div>
</div>

4
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss

@ -75,6 +75,10 @@
flex-direction: row;
margin-top: 80px;
//justify-content:center;
button{
width: 88px;
height: 36px;
}
}
#pie{
width: 50%;

41
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

@ -18,8 +18,8 @@ export class ScheduledUpdatesComponent implements OnInit {
ngOnInit(): void {
window.setTimeout(()=>{
this.initCharts("pie")
this.initCharts("pieTwo")
this.getechartsdata()
})
}
@ -52,13 +52,25 @@ export class ScheduledUpdatesComponent implements OnInit {
this.echartsData.buildingName=this.chaxun
this.echartsData.tableShow=true
}
}
async getechartsdata(){
await this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies/Maintained`)
this.tabledata1=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata1)
this.initCharts("pie")
await this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies/Maintaining`)
this.tabledata2=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata2)
this.initCharts("pieTwo")
}
/* 首页饼状图 */
tabledata1
tabledata2
initCharts(pieid){
this.example= echarts.init(document.getElementById(pieid),'walden');
var options={
title: {
text: pieid=="pie"?'已维护统计(0家)':'计划维护统计(0家)',
text: pieid=="pie"?`已维护统计(${this.tabledata1[0].totalCount}家)`:`计划维护统计(${this.tabledata2[0].totalCount}家)`,
top: "3%",
left: 'center',
textStyle:{
@ -103,13 +115,13 @@ export class ScheduledUpdatesComponent implements OnInit {
},
}},
data:pieid=="pie"? [
{value: 0, name: '维护无需修改'},
{value: 0, name: '维护修改',itemStyle:{color:'#02A7F0'}},
{value: 0, name: '维护删除',itemStyle:{color:'#87cebb'}},
{value: this.tabledata1[0].preservedCount.totalCount, name: '维护无需修改'},
{value: this.tabledata1[0].updatedCount.totalCount, name: '维护修改',itemStyle:{color:'#02A7F0'}},
{value: this.tabledata1[0].deletedCount.totalCount, name: '维护删除',itemStyle:{color:'#87cebb'}},
]:[
{value: 0, name: '未维护'},
{value: 0, name: '维护通过审核',itemStyle:{color:'#02A7F0'}},
{value: 0, name: '维护中',itemStyle:{color:'#87cebb'}},
{value: this.tabledata2[0].unMaintainCount.totalCount, name: '未维护'},
{value: this.tabledata2[0].maintainedCount.totalCount, name: '维护通过审核',itemStyle:{color:'#02A7F0'}},
{value: this.tabledata2[0].maintainingCount.totalCount, name: '维护中',itemStyle:{color:'#87cebb'}},
],
emphasis: {
itemStyle: {
@ -150,8 +162,15 @@ export class ScheduledUpdatesComponent implements OnInit {
//console.log(this.echartsData.scheduledUpdatesToggle)
});
}
dwOryuan='danwei'
//点击单位按钮
danweiClick(){
this.dwOryuan='danwei'
}
//点击预案按钮
yuanClick(){
this.dwOryuan='yuan'
}
}
//首页条件查询

Loading…
Cancel
Save