notice

src/pages/dutyALl/duty/duty.html

@@ -27,13 +27,24 @@
             </ion-calendar>
             <div>
                 <ion-item>
-                    <span></span>
+                    <p>
+                        <span>白班</span>
+                        <span *ngIf="dayObj.name" float-right>{{dayObj.name}}</span>
+                        <span *ngIf="!dayObj.name" float-right>暂无</span>
+                    </p>
+                </ion-item>
+                <ion-item>
+                    <p>
+                        <span>夜班</span>
+                        <span *ngIf="nightObj.name" float-right>{{nightObj.name}}</span>
+                        <span *ngIf="!nightObj.name" float-right>暂无</span>
+                    </p>
                 </ion-item>
             </div>
         </ng-container>
        <ng-container *ngIf="changeType == 2">
             <div class="duty-content">
-                <ion-list>
+                <ion-list *ngIf="nowDuty.length > 0">
                     <ion-item *ngFor="let item of nowDuty">
                         <div >
                             <span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span>
@@ -46,6 +57,9 @@
                         </div>
                     </ion-item>
                 </ion-list>
+                <ion-list *ngIf="nowDuty.length == 0">
+                    <p text-center>暂无数据</p>
+                </ion-list>
             </div>
        </ng-container>
     </ion-content>

src/pages/dutyALl/duty/duty.ts

@@ -22,8 +22,12 @@ export class DutyPage {
     ];
     swiperIndex;
     changeType = 1;
-    dayObj;
-    nightObj;
+    dayObj = {
+            name:''
+        };
+    nightObj = {
+        name:''
+    };
     nowDuty;
     historyDuty;
     options: CalendarComponentOptions = {

src/pages/tabs/home/home.ts

@@ -218,6 +218,9 @@ export class HomePage {
     this.isWait = false;
   }
 
+    onChange(e){
+      console.log(e);
+    }
 
   go(item) {
     if (item.type == 1) {

src/pages/tabs/notice/notice.ts

@@ -11,6 +11,7 @@ import {AppService} from "../../../service/appHttpService";
 })
 export class NoticePage {
 
+    noticeList = [];
   constructor(public navCtrl: NavController, public navParams: NavParams,
               public appService:AppService) {
   }
@@ -19,7 +20,7 @@ export class NoticePage {
       this.appService.ObserverHttpPost("/wisdomgroup/modules/message/findAllActivityForAppWithXQ",null)
           .subscribe((res: Response) => {
                   let data = res.json();
-
+                    this.noticeList = data;
               }, error => {
                   this.appService.alert('网络异常！');
               }