Skip to content

W
wisdom-ces
Commit 9b7be414 authored by wangqinghua's avatar wangqinghua
Browse files
Options

notice

parent 06aa8d0a
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 132 deletions
src/pages/dutyALl/duty/duty.html
View file @ 9b7be414
...@@ -27,13 +27,24 @@ ...@@ -27,13 +27,24 @@
</ion-calendar> </ion-calendar>
<div> <div>
<ion-item> <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> </ion-item>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="changeType == 2"> <ng-container *ngIf="changeType == 2">
<div class="duty-content"> <div class="duty-content">
<ion-list> <ion-list *ngIf="nowDuty.length > 0">
<ion-item *ngFor="let item of nowDuty"> <ion-item *ngFor="let item of nowDuty">
<div > <div >
<span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span> <span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span>
...@@ -46,6 +57,9 @@ ...@@ -46,6 +57,9 @@
</div> </div>
</ion-item> </ion-item>
</ion-list> </ion-list>
<ion-list *ngIf="nowDuty.length == 0">
<p text-center>暂无数据</p>
</ion-list>
</div> </div>
</ng-container> </ng-container>
</ion-content> </ion-content>
......
src/pages/dutyALl/duty/duty.ts
View file @ 9b7be414
...@@ -22,8 +22,12 @@ export class DutyPage { ...@@ -22,8 +22,12 @@ export class DutyPage {
]; ];
swiperIndex; swiperIndex;
changeType = 1; changeType = 1;
dayObj; dayObj = {
nightObj; name:''
};
nightObj = {
name:''
};
nowDuty; nowDuty;
historyDuty; historyDuty;
options: CalendarComponentOptions = { options: CalendarComponentOptions = {
......
src/pages/tabs/home/home.ts
View file @ 9b7be414
...@@ -218,6 +218,9 @@ export class HomePage { ...@@ -218,6 +218,9 @@ export class HomePage {
this.isWait = false; this.isWait = false;
} }
onChange(e){
console.log(e);
}
go(item) { go(item) {
if (item.type == 1) { if (item.type == 1) {
......
src/pages/tabs/notice/notice.html
View file @ 9b7be414
...@@ -10,136 +10,137 @@ ...@@ -10,136 +10,137 @@
<ion-content padding> <ion-content padding>
<div class="notice"> <div class="notice">
<div class="notice-card"> <div class="notice-card" *ngFor="let item of noticeList;">
<div class="notice-type"> <div class="notice-type">
<div class="type-img" ></div> <div class="type-img"></div>
<div class="type-info" style="width:50%;">生日祝福</div> <div class="type-info" style="width:50%;">{{item.title}}</div>
<div class="type-time" style="width:30%;">2018-08-30</div> <div class="type-time" style="width:30%;">{{item.sendTime | date:'yyyy-MM-dd' }}</div>
</div> </div>
<div class="notice-content"> <div class="notice-content">
今天是 <span class="notice-key">张豆豆</span>同志的生日，祝他生日快乐! <!--今天是 <span class="notice-key">张豆豆</span>同志的生日，祝他生日快乐!-->
</div> {{item.content}}
</div> </div>
<div class="notice-card"> </div>
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">入职祝福</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">入职祝福</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
欢迎 <span class="notice-key">张豆豆</span>同志加入组织部大家。 <!--<div class="notice-content">-->
</div> <!--欢迎 <span class="notice-key">张豆豆</span>同志加入组织部大家。-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">新的外出报备提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">新的外出报备提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>已发布，请抓紧时间报备！ <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>已发布，请抓紧时间报备！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">新的活动提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">新的活动提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>已发布，请抓紧时间报名！ <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>已发布，请抓紧时间报名！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">新的问卷调查提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">新的问卷调查提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>已发布，请参与问卷调查！ <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>已发布，请参与问卷调查！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">新的值班排班提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">新的值班排班提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>已发布，请至值班排班情况中查看！ <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>已发布，请至值班排班情况中查看！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">换班提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">换班提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>,请至我的值班中查看！ <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>,请至我的值班中查看！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">替班提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">替班提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>,请至我的值班中查看！ <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>,请至我的值班中查看！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">换班申请忽略提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">换班申请忽略提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
你提交的换班申请已被<span class="notice-key">张豆豆</span>，请至值班排班情况中查看！ <!--<div class="notice-content">-->
</div> <!--你提交的换班申请已被<span class="notice-key">张豆豆</span>，请至值班排班情况中查看！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">换班申请忽略提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">换班申请忽略提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
用户<span class="notice-key">张豆豆</span>提交了换班申请，祝他生日快乐! <!--<div class="notice-content">-->
</div> <!--用户<span class="notice-key">张豆豆</span>提交了换班申请，祝他生日快乐!-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">新的通知公告提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">新的通知公告提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>已发布，请至通知公告中查看！ <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>已发布，请至通知公告中查看！-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">值班签到提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">值班签到提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
今天是你的 <span class="notice-key">张豆豆</span>，请记得签到 <!--<div class="notice-content">-->
</div> <!--今天是你的 <span class="notice-key">张豆豆</span>，请记得签到-->
</div> <!--</div>-->
<div class="notice-card"> <!--</div>-->
<div class="notice-type"> <!--<div class="notice-card">-->
<div class="type-img" ></div> <!--<div class="notice-type">-->
<div class="type-info" style="width:50%;">调查问卷过期提醒</div> <!--<div class="type-img" ></div>-->
<div class="type-time" style="width:30%;">2018-08-30</div> <!--<div class="type-info" style="width:50%;">调查问卷过期提醒</div>-->
</div> <!--<div class="type-time" style="width:30%;">2018-08-30</div>-->
<div class="notice-content"> <!--</div>-->
<span class="notice-key">张豆豆</span>已过期，无法在参与问卷调查。 <!--<div class="notice-content">-->
</div> <!--<span class="notice-key">张豆豆</span>已过期，无法在参与问卷调查。-->
</div> <!--</div>-->
<!--</div>-->
......
src/pages/tabs/notice/notice.ts
View file @ 9b7be414
...@@ -11,6 +11,7 @@ import {AppService} from "../../../service/appHttpService"; ...@@ -11,6 +11,7 @@ import {AppService} from "../../../service/appHttpService";
}) })
export class NoticePage { export class NoticePage {
noticeList = [];
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
public appService:AppService) { public appService:AppService) {
} }
...@@ -19,7 +20,7 @@ export class NoticePage { ...@@ -19,7 +20,7 @@ export class NoticePage {
this.appService.ObserverHttpPost("/wisdomgroup/modules/message/findAllActivityForAppWithXQ",null) this.appService.ObserverHttpPost("/wisdomgroup/modules/message/findAllActivityForAppWithXQ",null)
.subscribe((res: Response) => { .subscribe((res: Response) => {
let data = res.json(); let data = res.json();
this.noticeList = data;
}, error => { }, error => {
this.appService.alert('网络异常！'); this.appService.alert('网络异常！');
} }
......
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