Skip to content

R
regManage
Commit 84e92438 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent b7c48a38
Hide whitespace changes
Inline Side-by-side
Showing with 602 additions and 37 deletions
src/pages/home/report-info/info-detail/info-detail.html
View file @ 84e92438
...@@ -133,12 +133,44 @@ ...@@ -133,12 +133,44 @@
<span>根据{{infoObj.filenumber}}文事业单位建制撤销</span> <span>根据{{infoObj.filenumber}}文事业单位建制撤销</span>
</div> </div>
</div> </div>
<ion-item> <p>人员信息情况</p>
<ion-label class="item-left"> <div class="item-box">
人员信息情况 <div class="left">管理岗位(参公)</div>
</ion-label> <div (click)="openDetail('管理岗位(参公)')" class="choose right">
<ion-label (click)="openDetail()" class="choose">详情</ion-label> 详情
</ion-item> </div>
</div>
<div class="item-box">
<div class="left">管理岗位(非参公)</div>
<div (click)="openDetail('管理岗位(非参公)')" class="choose right">
详情
</div>
</div>
<div class="item-box">
<div class="left">专业技术岗位</div>
<div (click)="openDetail('专业技术岗位')" class="choose right">
详情
</div>
</div>
<div class="item-box">
<div class="left">工勤技能岗位</div>
<div (click)="openDetail('工勤技能岗位')" class="choose right">
详情
</div>
</div>
<div class="item-box">
<div class="left">按学历、年龄分布</div>
<div (click)="openDetail('按学历、年龄分布')" class="choose right">
详情
</div>
</div>
<div class="item-box">
<div class="left">工龄结构</div>
<div (click)="openDetail('工龄结构')" class="choose right">
详情
</div>
</div>
<p>年度报告情况</p> <p>年度报告情况</p>
<div> <div>
<ng-container *ngFor="let year of infoObj?.ndbgUnitList"> <ng-container *ngFor="let year of infoObj?.ndbgUnitList">
......
src/pages/home/report-info/info-detail/info-detail.ts
View file @ 84e92438
...@@ -51,8 +51,8 @@ export class InfoDetailPage { ...@@ -51,8 +51,8 @@ export class InfoDetailPage {
) )
} }
openDetail() { openDetail(title) {
let modalCtrl = this.modalCtrl.create(PersonInfoPage, {item: this.personInfo}, { let modalCtrl = this.modalCtrl.create(PersonInfoPage, {item: this.personInfo, title: title}, {
enterAnimation: 'modal-from-right-enter', enterAnimation: 'modal-from-right-enter',
leaveAnimation: 'modal-from-right-leave' leaveAnimation: 'modal-from-right-leave'
}); });
......
src/pages/home/report-info/person-info/person-info.html
View file @ 84e92438
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
<ion-title>人员信息情况</ion-title> <ion-title>{{title}}</ion-title>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="data"> <div class="data-list">
<div class="table" #table> <div *ngIf="title == '管理岗位(参公)'" class="table">
<p>按岗位分布</p>
<table border="1"> <table border="1">
<thead> <thead>
<tr> <tr>
<th>管理岗位(参公)</th> <th>岗位等级</th>
<th>管理岗位(非参公)</th> <th>人员数</th>
<th>专业技术岗位</th> <th>其中领导岗位</th>
<th>工勤技能岗位</th>
<th>其他岗位</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>岗位等级</td> <td>省部级正职</td>
<td>{{list.postLevel['省部级正职'] || 0}}</td>
<td>{{list.postLevel_Leader['省部级正职'] || 0}}</td>
</tr>
<tr>
<td>省部级副职</td>
<td>{{list.postLevel['省部级副职'] || 0}}</td>
<td>{{list.postLevel_Leader['省部级副职'] || 0}}</td>
</tr>
<tr>
<td>厅局级正职</td>
<td>{{list.postLevel['厅局级正职'] || 0}}</td>
<td>{{list.postLevel_Leader['厅局级正职'] || 0}}</td>
</tr>
<tr>
<td>厅局级副职</td>
<td>{{list.postLevel['厅局级副职'] || 0}}</td>
<td>{{list.postLevel_Leader['厅局级副职'] || 0}}</td>
</tr>
<tr>
<td>县处级正职</td>
<td>{{list.postLevel['县处级正职'] || 0}}</td>
<td>{{list.postLevel_Leader['县处级正职'] || 0}}</td>
</tr>
<tr>
<td>县处级副职</td>
<td>{{list.postLevel['县处级副职'] || 0}}</td>
<td>{{list.postLevel_Leader['县处级副职'] || 0}}</td>
</tr>
<tr>
<td>乡科级正职</td>
<td>{{list.postLevel['县处级副职'] || 0}}</td>
<td>{{list.postLevel_Leader['县处级副职'] || 0}}</td>
</tr>
<tr>
<td>乡科级副职</td>
<td>{{list.postLevel['乡科级副职'] || 0}}</td>
<td>{{list.postLevel_Leader['乡科级副职'] || 0}}</td>
</tr>
<tr>
<td>巡视员</td>
<td>{{list.postLevel['巡视员'] || 0}}</td>
<td>{{list.postLevel_Leader['巡视员'] || 0}}</td>
</tr>
<tr>
<td>副巡视员</td>
<td>{{list.postLevel['副巡视员'] || 0}}</td>
<td>{{list.postLevel_Leader['副巡视员'] || 0}}</td>
</tr>
<tr>
<td>调研员</td>
<td>{{list.postLevel['调研员'] || 0}}</td>
<td>{{list.postLevel_Leader['调研员'] || 0}}</td>
</tr>
<tr>
<td>副调研员</td>
<td>{{list.postLevel['副调研员'] || 0}}</td>
<td>{{list.postLevel_Leader['副调研员'] || 0}}</td>
</tr>
<tr>
<td>主任科员</td>
<td>{{list.postLevel['主任科员'] || 0}}</td>
<td>{{list.postLevel_Leader['主任科员'] || 0}}</td>
</tr>
<tr>
<td>副主任科员</td>
<td>{{list.postLevel['副主任科员'] || 0}}</td>
<td>{{list.postLevel_Leader['副主任科员'] || 0}}</td>
</tr>
<tr>
<td>科员</td>
<td>{{list.postLevel['科员'] || 0}}</td>
<td>{{list.postLevel_Leader['科员'] || 0}}</td>
</tr>
<tr>
<td>办事员</td>
<td>{{list.postLevel['办事员'] || 0}}</td>
<td>{{list.postLevel_Leader['办事员'] || 0}}</td>
</tr>
<tr>
<td>未定级</td>
<td>{{list.postLevel['未定级'] || 0}}</td>
<td>{{list.postLevel_Leader['未定级'] || 0}}</td>
</tr>
<tr>
<td>合计</td>
<td>{{(list.postLevel['省部级正职'] || 0) + (list.postLevel['省部级副职'] || 0) + (list.postLevel['厅局级正职'] || 0) +
(list.postLevel['厅局级副职'] || 0) + (list.postLevel['县处级正职'] || 0) + (list.postLevel['县处级副职'] || 0) +
(list.postLevel['县处级副职'] || 0) + (list.postLevel['乡科级副职'] || 0) + (list.postLevel['巡视员'] || 0) +
(list.postLevel['副巡视员'] || 0) + (list.postLevel['调研员'] || 0) + (list.postLevel['副调研员'] || 0) +
(list.postLevel['主任科员'] || 0) + (list.postLevel['副主任科员'] || 0) + (list.postLevel['科员'] || 0) +
(list.postLevel['办事员'] || 0) + (list.postLevel['未定级'] || 0)}}</td>
<td>{{(list.postLevel_Leader['省部级正职'] || 0) + (list.postLevel_Leader['省部级副职'] || 0) + (list.postLevel_Leader['厅局级正职'] || 0) +
(list.postLevel_Leader['厅局级副职'] || 0) + (list.postLevel_Leader['县处级正职'] || 0) + (list.postLevel_Leader['县处级副职'] || 0) +
(list.postLevel_Leader['县处级副职'] || 0) + (list.postLevel_Leader['乡科级副职'] || 0) + (list.postLevel_Leader['巡视员'] || 0) +
(list.postLevel_Leader['副巡视员'] || 0) + (list.postLevel_Leader['调研员'] || 0) + (list.postLevel_Leader['副调研员'] || 0) +
(list.postLevel_Leader['主任科员'] || 0) + (list.postLevel_Leader['副主任科员'] || 0) + (list.postLevel_Leader['科员'] || 0) +
(list.postLevel_Leader['办事员'] || 0) + (list.postLevel_Leader['未定级'] || 0)}}</td>
</tr>
</tbody>
</table>
</div>
<div *ngIf="title == '管理岗位(非参公)'" class="table">
<table border="1">
<thead>
<tr>
<th>岗位等级</th>
<th>人员数</th>
<th>其中领导岗位</th>
</tr>
</thead>
<tbody>
<tr>
<td>一级职员</td>
<td>{{list.postLevel['一级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['一级职员'] || 0}}</td>
</tr>
<tr>
<td>二级职员</td>
<td>{{list.postLevel['二级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['二级职员'] || 0}}</td>
</tr>
<tr>
<td>三级职员</td>
<td>{{list.postLevel['三级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['三级职员'] || 0}}</td>
</tr>
<tr>
<td>四级职员</td>
<td>{{list.postLevel['四级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['四级职员'] || 0}}</td>
</tr>
<tr>
<td>五级职员</td>
<td>{{list.postLevel['五级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['五级职员'] || 0}}</td>
</tr>
<tr>
<td>六级职员</td>
<td>{{list.postLevel['六级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['六级职员'] || 0}}</td>
</tr>
<tr>
<td>七级职员</td>
<td>{{list.postLevel['七级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['七级职员'] || 0}}</td>
</tr>
<tr>
<td>八级职员</td>
<td>{{list.postLevel['八级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['八级职员'] || 0}}</td>
</tr>
<tr>
<td>九级职员</td>
<td>{{list.postLevel['九级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['九级职员'] || 0}}</td>
</tr>
<tr>
<td>十级职员</td>
<td>{{list.postLevel['十级职员'] || 0}}</td>
<td>{{list.postLevel_Leader['十级职员'] || 0}}</td>
</tr>
<tr>
<td>合计</td>
<td>{{(list.postLevel['一级职员'] || 0) + (list.postLevel['二级职员'] || 0) + (list.postLevel['三级职员'] || 0) +
(list.postLevel['四级职员'] || 0) + (list.postLevel['五级职员'] || 0) + (list.postLevel['六级职员'] || 0) +
(list.postLevel['七级职员'] || 0) + (list.postLevel['八级职员'] || 0) + (list.postLevel['九级职员'] || 0) +
(list.postLevel['十级职员'] || 0)}}</td>
<td>{{(list.postLevel_Leader['一级职员'] || 0) + (list.postLevel_Leader['二级职员'] || 0) + (list.postLevel_Leader['三级职员'] || 0) +
(list.postLevel_Leader['四级职员'] || 0) + (list.postLevel_Leader['五级职员'] || 0) + (list.postLevel_Leader['六级职员'] || 0) +
(list.postLevel_Leader['七级职员'] || 0) + (list.postLevel_Leader['八级职员'] || 0) + (list.postLevel_Leader['九级职员'] || 0) +
(list.postLevel_Leader['十级职员'] || 0)}}</td>
</tr>
</tbody>
</table>
</div>
<div *ngIf="title == '专业技术岗位'" class="table">
<table border="1">
<tbody>
<tr>
<td>正高级(一级)</td>
<td>{{list.postLevel['正高级(一级)'] || 0}}</td>
</tr>
<tr>
<td>正高级(二级)</td>
<td>{{list.postLevel['正高级(二级)'] || 0}}</td>
</tr>
<tr>
<td>正高级(三级)</td>
<td>{{list.postLevel['正高级(三级)'] || 0}}</td>
</tr>
<tr>
<td>正高级(四级)</td>
<td>{{list.postLevel['正高级(四级)'] || 0}}</td>
</tr>
<tr>
<td>副高级(五级)</td>
<td>{{list.postLevel['副高级(五级)'] || 0}}</td>
</tr>
<tr>
<td>副高级(六级)</td>
<td>{{list.postLevel['副高级(六级)'] || 0}}</td>
</tr>
<tr>
<td>副高级(七级)</td>
<td>{{list.postLevel['副高级(七级)'] || 0}}</td>
</tr>
<tr>
<td>中级(八级)</td>
<td>{{list.postLevel['中级(八级)'] || 0}}</td>
</tr>
<tr>
<td>中级(九级)</td>
<td>{{list.postLevel['中级(九级)'] || 0}}</td>
</tr>
<tr>
<td>中级(十级)</td>
<td>{{list.postLevel['中级(十级)'] || 0}}</td>
</tr>
<tr>
<td>初级(十一级)</td>
<td>{{list.postLevel['初级(十一级)'] || 0}}</td>
</tr>
<tr>
<td>初级(十二级)</td>
<td>{{list.postLevel['初级(十二级)'] || 0}}</td>
</tr>
<tr>
<td>初级(十三级)</td>
<td>{{list.postLevel['初级(十三级)'] || 0}}</td>
</tr>
<tr>
<td>合计</td>
<td>{{(list.postLevel['正高级(一级)'] || 0) + (list.postLevel['正高级(二级)'] || 0) + (list.postLevel['正高级(三级)'] || 0) +
(list.postLevel['正高级(四级)'] || 0) + (list.postLevel['副高级(五级)'] || 0) + (list.postLevel['副高级(六级)'] || 0) +
(list.postLevel['副高级(七级)'] || 0) + (list.postLevel['中级(八级)'] || 0) + (list.postLevel['中级(九级)'] || 0) +
(list.postLevel['中级(十级)'] || 0) + (list.postLevel['初级(十一级)'] || 0) + (list.postLevel['初级(十二级)'] || 0) +
(list.postLevel['初级(十三级)'] || 0)}}</td>
</tr>
</tbody>
</table>
</div>
<div *ngIf="title == '工勤技能岗位'" class="table">
<table border="1">
<tbody>
<tr>
<td>技术工一级</td>
<td>{{list.postLevel['技术工一级'] || 0}}</td>
</tr>
<tr>
<td>技术工二级</td>
<td>{{list.postLevel['技术工二级'] || 0}}</td>
</tr>
<tr>
<td>技术工三级</td>
<td>{{list.postLevel['技术工三级'] || 0}}</td>
</tr>
<tr>
<td>技术工四级</td>
<td>{{list.postLevel['技术工四级'] || 0}}</td>
</tr>
<tr>
<td>技术工五级</td>
<td>{{list.postLevel['技术工五级'] || 0}}</td>
</tr>
<tr>
<td>普通工</td>
<td>{{list.postLevel['普通工'] || 0}}</td>
</tr>
<tr>
<td>合计</td>
<td>{{(list.postLevel['技术工一级'] || 0) + (list.postLevel['技术工二级'] || 0) + (list.postLevel['技术工三级'] || 0) +
(list.postLevel['技术工四级'] || 0) + (list.postLevel['技术工五级'] || 0) + (list.postLevel['普通工'] || 0)}}</td>
</tr>
</tbody>
</table>
</div>
<div *ngIf="title == '按学历、年龄分布'" class="table">
<table border="1">
<thead>
<tr>
<th></th>
<th>35岁以下</th>
<th>35岁至45岁</th>
<th>45岁至50岁</th>
<th>51岁以上</th>
<th>合计</th>
</tr>
</thead>
<tbody>
<tr>
<td>博士研究生</td>
<td>{{list.age_segment['博士研究生_35岁以下'] || 0}}</td>
<td>{{list.age_segment['博士研究生_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['博士研究生_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['博士研究生_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['博士研究生_35岁以下'] || 0) + (list.age_segment['博士研究生_35岁至45岁'] || 0) +
(list.age_segment['博士研究生_45岁至50岁'] || 0) + (list.age_segment['博士研究生_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>硕士研究生</td>
<td>{{list.age_segment['硕士研究生_35岁以下'] || 0}}</td>
<td>{{list.age_segment['硕士研究生_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['硕士研究生_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['硕士研究生_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['硕士研究生_35岁以下'] || 0) + (list.age_segment['硕士研究生_35岁至45岁'] || 0) +
(list.age_segment['硕士研究生_45岁至50岁'] || 0) + (list.age_segment['硕士研究生_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>本科</td>
<td>{{list.age_segment['本科_35岁以下'] || 0}}</td>
<td>{{list.age_segment['本科_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['本科_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['本科_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['本科_35岁以下'] || 0) + (list.age_segment['本科_35岁至45岁'] || 0) +
(list.age_segment['本科_45岁至50岁'] || 0) + (list.age_segment['本科_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>大专</td>
<td>{{list.age_segment['大专_35岁以下'] || 0}}</td>
<td>{{list.age_segment['大专_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['大专_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['大专_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['大专_35岁以下'] || 0) + (list.age_segment['大专_35岁至45岁'] || 0) +
(list.age_segment['大专_45岁至50岁'] || 0) + (list.age_segment['大专_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>中专</td>
<td>{{list.age_segment['中专_35岁以下'] || 0}}</td>
<td>{{list.age_segment['中专_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['中专_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['中专_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['中专_35岁以下'] || 0) + (list.age_segment['中专_35岁至45岁'] || 0) +
(list.age_segment['中专_45岁至50岁'] || 0) + (list.age_segment['中专_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>高中</td>
<td>{{list.age_segment['高中_35岁以下'] || 0}}</td>
<td>{{list.age_segment['高中_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['高中_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['高中_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['高中_35岁以下'] || 0) + (list.age_segment['高中_35岁至45岁'] || 0) +
(list.age_segment['高中_45岁至50岁'] || 0) + (list.age_segment['高中_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>初中</td>
<td>{{list.age_segment['初中_35岁以下'] || 0}}</td>
<td>{{list.age_segment['初中_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['初中_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['初中_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['初中_35岁以下'] || 0) + (list.age_segment['初中_35岁至45岁'] || 0) +
(list.age_segment['初中_45岁至50岁'] || 0) + (list.age_segment['初中_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>其他</td>
<td>{{list.age_segment['其他_35岁以下'] || 0}}</td>
<td>{{list.age_segment['其他_35岁至45岁'] || 0}}</td>
<td>{{list.age_segment['其他_45岁至50岁'] || 0}}</td>
<td>{{list.age_segment['其他_51岁以上'] || 0}}</td>
<td>{{(list.age_segment['其他_35岁以下'] || 0) + (list.age_segment['其他_35岁至45岁'] || 0) +
(list.age_segment['其他_45岁至50岁'] || 0) + (list.age_segment['其他_51岁以上'] || 0)}}</td>
</tr>
<tr>
<td>合计</td>
<td>{{(list.age_segment['博士研究生_35岁以下'] || 0) + (list.age_segment['硕士研究生_35岁以下'] || 0) +
(list.age_segment['本科_35岁以下'] || 0) + (list.age_segment['大专_35岁以下'] || 0) +
(list.age_segment['中专_35岁以下'] || 0) + (list.age_segment['高中_35岁以下'] || 0) +
(list.age_segment['初中_35岁以下'] || 0) + (list.age_segment['其他_35岁以下'] || 0)}}</td>
<td>{{(list.age_segment['博士研究生_35岁至45岁'] || 0) + (list.age_segment['硕士研究生_35岁至45岁'] || 0) +
(list.age_segment['本科_35岁至45岁'] || 0) + (list.age_segment['大专_35岁至45岁'] || 0) +
(list.age_segment['中专_35岁至45岁'] || 0) + (list.age_segment['高中_35岁至45岁'] || 0) +
(list.age_segment['初中_35岁至45岁'] || 0) + (list.age_segment['其他_35岁至45岁'] || 0)}}</td>
<td>{{(list.age_segment['博士研究生_45岁至50岁'] || 0) + (list.age_segment['硕士研究生_45岁至50岁'] || 0) +
(list.age_segment['本科_45岁至50岁'] || 0) + (list.age_segment['大专_45岁至50岁'] || 0) +
(list.age_segment['中专_45岁至50岁'] || 0) + (list.age_segment['高中_45岁至50岁'] || 0) +
(list.age_segment['初中_45岁至50岁'] || 0) + (list.age_segment['其他_45岁至50岁'] || 0)}}</td>
<td>{{(list.age_segment['博士研究生_51岁以上'] || 0) + (list.age_segment['硕士研究生_51岁以上'] || 0) +
(list.age_segment['本科_51岁以上'] || 0) + (list.age_segment['大专_51岁以上'] || 0) +
(list.age_segment['中专_51岁以上'] || 0) + (list.age_segment['高中_51岁以上'] || 0) +
(list.age_segment['初中_51岁以上'] || 0) + (list.age_segment['其他_51岁以上'] || 0)}}</td>
<td>{{(list.age_segment['博士研究生_35岁以下'] || 0) + (list.age_segment['硕士研究生_35岁以下'] || 0) +
(list.age_segment['本科_35岁以下'] || 0) + (list.age_segment['大专_35岁以下'] || 0) +
(list.age_segment['中专_35岁以下'] || 0) + (list.age_segment['高中_35岁以下'] || 0) +
(list.age_segment['初中_35岁以下'] || 0) + (list.age_segment['其他_35岁以下'] || 0) +
(list.age_segment['博士研究生_35岁至45岁'] || 0) + (list.age_segment['硕士研究生_35岁至45岁'] || 0) +
(list.age_segment['本科_35岁至45岁'] || 0) + (list.age_segment['大专_35岁至45岁'] || 0) +
(list.age_segment['中专_35岁至45岁'] || 0) + (list.age_segment['高中_35岁至45岁'] || 0) +
(list.age_segment['初中_35岁至45岁'] || 0) + (list.age_segment['其他_35岁至45岁'] || 0) +
(list.age_segment['博士研究生_45岁至50岁'] || 0) + (list.age_segment['硕士研究生_45岁至50岁'] || 0) +
(list.age_segment['本科_45岁至50岁'] || 0) + (list.age_segment['大专_45岁至50岁'] || 0) +
(list.age_segment['中专_45岁至50岁'] || 0) + (list.age_segment['高中_45岁至50岁'] || 0) +
(list.age_segment['初中_45岁至50岁'] || 0) + (list.age_segment['其他_45岁至50岁'] || 0) +
(list.age_segment['博士研究生_51岁以上'] || 0) + (list.age_segment['硕士研究生_51岁以上'] || 0) +
(list.age_segment['本科_51岁以上'] || 0) + (list.age_segment['大专_51岁以上'] || 0) +
(list.age_segment['中专_51岁以上'] || 0) + (list.age_segment['高中_51岁以上'] || 0) +
(list.age_segment['初中_51岁以上'] || 0) + (list.age_segment['其他_51岁以上'] || 0)}}</td>
</tr>
</tbody>
</table>
</div>
<div *ngIf="title == '工龄结构'" class="table">
<table border="1">
<thead>
<tr>
<th></th>
<th>25年以下</th>
<th>25年-30年</th>
<th>30年以上</th>
<th>合计</th>
</tr>
</thead>
<tbody>
<tr>
<td>博士研究生</td>
<td>{{list.workage_segment['博士研究生_25年以下'] || 0}}</td>
<td>{{list.workage_segment['博士研究生_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['博士研究生_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['博士研究生_25年以下'] || 0) + (list.workage_segment['博士研究生_25年-30年'] || 0) +
(list.workage_segment['博士研究生_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>硕士研究生</td>
<td>{{list.workage_segment['硕士研究生_25年以下'] || 0}}</td>
<td>{{list.workage_segment['硕士研究生_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['硕士研究生_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['硕士研究生_25年以下'] || 0) + (list.workage_segment['硕士研究生_25年-30年'] || 0) +
(list.workage_segment['硕士研究生_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>本科</td>
<td>{{list.workage_segment['本科_25年以下'] || 0}}</td>
<td>{{list.workage_segment['本科_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['本科_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['本科_25年以下'] || 0) + (list.workage_segment['本科_25年-30年'] || 0) +
(list.workage_segment['本科_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>大专</td>
<td>{{list.workage_segment['大专_25年以下'] || 0}}</td>
<td>{{list.workage_segment['大专_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['大专_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['大专_25年以下'] || 0) + (list.workage_segment['大专_25年-30年'] || 0) +
(list.workage_segment['大专_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>中专</td>
<td>{{list.workage_segment['中专_25年以下'] || 0}}</td>
<td>{{list.workage_segment['中专_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['中专_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['中专_25年以下'] || 0) + (list.workage_segment['中专_25年-30年'] || 0) +
(list.workage_segment['中专_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>高中</td>
<td>{{list.workage_segment['高中_25年以下'] || 0}}</td>
<td>{{list.workage_segment['高中_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['高中_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['高中_25年以下'] || 0) + (list.workage_segment['高中_25年-30年'] || 0) +
(list.workage_segment['高中_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>初中</td>
<td>{{list.workage_segment['初中_25年以下'] || 0}}</td>
<td>{{list.workage_segment['初中_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['初中_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['初中_25年以下'] || 0) + (list.workage_segment['初中_25年-30年'] || 0) +
(list.workage_segment['初中_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>其他</td>
<td>{{list.workage_segment['其他_25年以下'] || 0}}</td>
<td>{{list.workage_segment['其他_25年-30年'] || 0}}</td>
<td>{{list.workage_segment['其他_30年以上'] || 0}}</td>
<td>{{(list.workage_segment['其他_25年以下'] || 0) + (list.workage_segment['其他_25年-30年'] || 0) +
(list.workage_segment['其他_30年以上'] || 0)}}</td>
</tr>
<tr>
<td>合计</td>
<td>{{(list.workage_segment['博士研究生_25年以下'] || 0) + (list.workage_segment['硕士研究生_25年以下'] || 0) +
(list.workage_segment['本科_25年以下'] || 0) + (list.workage_segment['大专_25年以下'] || 0) +
(list.workage_segment['中专_25年以下'] || 0) + (list.workage_segment['高中_25年以下'] || 0) +
(list.workage_segment['初中_25年以下'] || 0) + (list.workage_segment['其他_25年以下'] || 0)}}</td>
<td>{{(list.workage_segment['博士研究生_25年-30年'] || 0) + (list.workage_segment['硕士研究生_25年-30年'] || 0) +
(list.workage_segment['本科_25年-30年'] || 0) + (list.workage_segment['大专_25年-30年'] || 0) +
(list.workage_segment['中专_25年-30年'] || 0) + (list.workage_segment['高中_25年-30年'] || 0) +
(list.workage_segment['初中_25年-30年'] || 0) + (list.workage_segment['其他_25年-30年'] || 0)}}</td>
<td>{{(list.workage_segment['博士研究生_30年以上'] || 0) + (list.workage_segment['硕士研究生_30年以上'] || 0) +
(list.workage_segment['本科_30年以上'] || 0) + (list.workage_segment['大专_30年以上'] || 0) +
(list.workage_segment['中专_30年以上'] || 0) + (list.workage_segment['高中_30年以上'] || 0) +
(list.workage_segment['初中_30年以上'] || 0) + (list.workage_segment['其他_30年以上'] || 0)}}</td>
<td>{{(list.workage_segment['博士研究生_25年以下'] || 0) + (list.workage_segment['硕士研究生_25年以下'] || 0) +
(list.workage_segment['本科_25年以下'] || 0) + (list.workage_segment['大专_25年以下'] || 0) +
(list.workage_segment['中专_25年以下'] || 0) + (list.workage_segment['高中_25年以下'] || 0) +
(list.workage_segment['初中_25年以下'] || 0) + (list.workage_segment['其他_25年以下'] || 0) +
(list.workage_segment['博士研究生_25年-30年'] || 0) + (list.workage_segment['硕士研究生_25年-30年'] || 0) +
(list.workage_segment['本科_25年-30年'] || 0) + (list.workage_segment['大专_25年-30年'] || 0) +
(list.workage_segment['中专_25年-30年'] || 0) + (list.workage_segment['高中_25年-30年'] || 0) +
(list.workage_segment['初中_25年-30年'] || 0) + (list.workage_segment['其他_25年-30年'] || 0) +
(list.workage_segment['博士研究生_30年以上'] || 0) + (list.workage_segment['硕士研究生_30年以上'] || 0) +
(list.workage_segment['本科_30年以上'] || 0) + (list.workage_segment['大专_30年以上'] || 0) +
(list.workage_segment['中专_30年以上'] || 0) + (list.workage_segment['高中_30年以上'] || 0) +
(list.workage_segment['初中_30年以上'] || 0) + (list.workage_segment['其他_30年以上'] || 0)}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/pages/home/report-info/person-info/person-info.scss
View file @ 84e92438
...@@ -4,6 +4,10 @@ page-person-info { ...@@ -4,6 +4,10 @@ page-person-info {
width: 80%; width: 80%;
} }
.data-list {
padding: 10px;
}
table { table {
width: 100%; width: 100%;
...@@ -15,7 +19,6 @@ page-person-info { ...@@ -15,7 +19,6 @@ page-person-info {
} }
.table { .table {
height: 177px;
overflow: hidden; overflow: hidden;
transition: all 1s; transition: all 1s;
} }
......
src/pages/home/report-info/person-info/person-info.ts
View file @ 84e92438
...@@ -7,26 +7,31 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular'; ...@@ -7,26 +7,31 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
}) })
export class PersonInfoPage { export class PersonInfoPage {
title;
personInfo; personInfo;
list = { list = {
age_segment: [ age_segment: {},
{POSTLEVEL_CN:"博士研究生",NUM:'0'}, postLevel: {},
{POSTLEVEL_CN:"硕士研究生",NUM:'0'}, postLevel_Leader: {},
{POSTLEVEL_CN:"本科",NUM:'0'}, workage_segment: {},
{POSTLEVEL_CN:"大专",NUM:'0'},
{POSTLEVEL_CN:"中专",NUM:'0'},
{POSTLEVEL_CN:"高中",NUM:'0'},
{POSTLEVEL_CN:"初中",NUM:'0'},
{POSTLEVEL_CN:"其他",NUM:'0'},
],
postLevel: [],
postLevel_Leader: [],
retiredPerson: [],
workage_segment: [],
} }
constructor(public navCtrl: NavController, public navParams: NavParams) { constructor(public navCtrl: NavController, public navParams: NavParams) {
this.personInfo = this.navParams.get('item'); this.personInfo = this.navParams.get('item');
this.title = this.navParams.get('title');
this.personInfo.postLevel.forEach(e => {
this.list.postLevel[e.POSTLEVEL_CN] = e.NUM;
})
this.personInfo.postLevel_Leader.forEach(e => {
this.list.postLevel_Leader[e.POSTLEVEL_LEADER_CN] = e.NUM;
})
this.personInfo.age_segment.forEach(e => {
this.list.age_segment[`${e.EDUCATION_CN}_${e.AGE_SEGMENT_CN}`] = e.NUM;
})
this.personInfo.workage_segment.forEach(e => {
this.list.workage_segment[`${e.EDUCATION_CN}_${e.WORKAGE_SEGMENT_CN}`] = e.NUM;
})
console.log(this.list);
} }
ionViewDidLoad() { ionViewDidLoad() {
......
src/pages/news/news.html
View file @ 84e92438
...@@ -91,4 +91,9 @@ ...@@ -91,4 +91,9 @@
</ng-container> </ng-container>
</ng-container> </ng-container>
</div> </div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
loadingText="加载中"></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content> </ion-content>
src/pages/news/news.ts
View file @ 84e92438
...@@ -17,6 +17,12 @@ export class NewsPage { ...@@ -17,6 +17,12 @@ export class NewsPage {
dqtxList = []; dqtxList = [];
rgtxList = []; rgtxList = [];
dbPage = {
page: 1,
limit: 10
};
total = 0;
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
private newSer: NewsService) { private newSer: NewsService) {
} }
...@@ -25,11 +31,12 @@ export class NewsPage { ...@@ -25,11 +31,12 @@ export class NewsPage {
this.getList(); this.getList();
const data = { const data = {
page: 1, page: 1,
limit: 10 limit: 1000
} }
this.newSer.dqtxList(data).subscribe( this.newSer.dqtxList(this.dbPage).subscribe(
(res) => { (res) => {
this.dqtxList = res.dqtxList; this.dqtxList = res.dqtxList;
this.total = res.pageable.totalSize;
} }
) )
this.newSer.rgtxList(data).subscribe( this.newSer.rgtxList(data).subscribe(
...@@ -63,8 +70,23 @@ export class NewsPage { ...@@ -63,8 +70,23 @@ export class NewsPage {
this.navCtrl.push(DealDetailPage, {"item": data}); this.navCtrl.push(DealDetailPage, {"item": data});
} }
switchType(){ switchType() {
}
doInfinite(event) {
if (this.total == this.dqtxList.length) {
event.enable(false);
return false;
}
this.dbPage.page++;
this.newSer.dqtxList(this.dbPage).subscribe(
(res) => {
if (event) event.complete();
this.dqtxList = this.dqtxList.concat(res.dqtxList);
this.total = res.pageable.totalSize;
}
)
} }
} }
src/pages/tabs/tabs.ts
View file @ 84e92438
...@@ -100,7 +100,7 @@ export class TabsPage { ...@@ -100,7 +100,7 @@ export class TabsPage {
"flow": "0", "flow": "0",
"areaCode": this.globle.userObj.area, "areaCode": this.globle.userObj.area,
"page": "1", "page": "1",
"limit": "10000" "limit": "10"
}; };
this.dealSer.searchSchedule(data).subscribe( this.dealSer.searchSchedule(data).subscribe(
(res) => { (res) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment