update

src/pages/home/report-info/info-detail/info-detail.html

@@ -133,12 +133,44 @@
                     <span>根据{{infoObj.filenumber}}文事业单位建制撤销</span>
                 </div>
             </div>
-            <ion-item>
-                <ion-label class="item-left">
-                    人员信息情况
-                </ion-label>
-                <ion-label (click)="openDetail()" class="choose">详情</ion-label>
-            </ion-item>
+            <p>人员信息情况</p>
+            <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>
+            <div class="item-box">
+                <div class="left">工龄结构</div>
+                <div (click)="openDetail('工龄结构')" class="choose right">
+                    详情
+                </div>
+            </div>
+
             <p>年度报告情况</p>
             <div>
                 <ng-container *ngFor="let year of infoObj?.ndbgUnitList">

src/pages/home/report-info/info-detail/info-detail.ts

@@ -51,8 +51,8 @@ export class InfoDetailPage {
         )
     }
 
-    openDetail() {
-        let modalCtrl = this.modalCtrl.create(PersonInfoPage, {item: this.personInfo}, {
+    openDetail(title) {
+        let modalCtrl = this.modalCtrl.create(PersonInfoPage, {item: this.personInfo, title: title}, {
             enterAnimation: 'modal-from-right-enter',
             leaveAnimation: 'modal-from-right-leave'
         });

src/pages/home/report-info/person-info/person-info.scss

@@ -4,6 +4,10 @@ page-person-info {
     width: 80%;
   }
 
+  .data-list {
+    padding: 10px;
+  }
+
   table {
     width: 100%;
 
@@ -15,7 +19,6 @@ page-person-info {
   }
 
   .table {
-    height: 177px;
     overflow: hidden;
     transition: all 1s;
   }

src/pages/home/report-info/person-info/person-info.ts

@@ -7,26 +7,31 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 })
 export class PersonInfoPage {
 
+    title;
     personInfo;
     list = {
-        age_segment: [
-          {POSTLEVEL_CN:"博士研究生",NUM:'0'},
-          {POSTLEVEL_CN:"硕士研究生",NUM:'0'},
-          {POSTLEVEL_CN:"本科",NUM:'0'},
-          {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: [],
+        age_segment: {},
+        postLevel: {},
+        postLevel_Leader: {},
+        workage_segment: {},
     }
 
     constructor(public navCtrl: NavController, public navParams: NavParams) {
         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() {

src/pages/news/news.html

@@ -91,4 +91,9 @@
             </ng-container>
         </ng-container>
     </div>
+    <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
+        <ion-infinite-scroll-content
+                loadingSpinner="bubbles"
+                loadingText="加载中"></ion-infinite-scroll-content>
+    </ion-infinite-scroll>
 </ion-content>

src/pages/news/news.ts

@@ -17,6 +17,12 @@ export class NewsPage {
     dqtxList = [];
     rgtxList = [];
 
+    dbPage = {
+        page: 1,
+        limit: 10
+    };
+    total = 0;
+
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private newSer: NewsService) {
     }
@@ -25,11 +31,12 @@ export class NewsPage {
         this.getList();
         const data = {
             page: 1,
-            limit: 10
+            limit: 1000
         }
-        this.newSer.dqtxList(data).subscribe(
+        this.newSer.dqtxList(this.dbPage).subscribe(
             (res) => {
                 this.dqtxList = res.dqtxList;
+                this.total = res.pageable.totalSize;
             }
         )
         this.newSer.rgtxList(data).subscribe(
@@ -63,8 +70,23 @@ export class NewsPage {
         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

@@ -100,7 +100,7 @@ export class TabsPage {
             "flow": "0",
             "areaCode": this.globle.userObj.area,
             "page": "1",
-            "limit": "10000"
+            "limit": "10"
         };
         this.dealSer.searchSchedule(data).subscribe(
             (res) => {