Skip to content

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

增加已读和角标

parent 660470a3
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 79 deletions
config.xml
View file @ 72847151
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter" version="4.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>智汇19号</name>
<description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
src/app/app.scss
View file @ 72847151
......@@ -6,6 +6,9 @@ p {
.back-button.show-back-button {
margin-left: 5px;
}
.scroll-content {
padding-bottom: 0 !important;
}
//列表
.item-ios {
......
src/pages/home/activity/activityList/activityList.ts
View file @ 72847151
......@@ -6,6 +6,8 @@ import { ActivityApplyPage } from '../activityApply/activityApply'
import { ActivityConfirmPage } from '../activityConfirm/activityConfirm';
import {ActivityDetailPage} from "../activityDetail/activityDetail";
import {AppService} from "../../../../service/appHttpService";
import {TabsService} from "../../../tabs/tabs.service";
import {CommonService} from "../../../../service/common.service";
@IonicPage()
@Component({
......@@ -21,8 +23,8 @@ export class ActivityListPage {
activityFbObject:Array<String> = ['未知','全体人员','用户组','处事部门'];
constructor(public navCtrl: NavController,
public navParams: NavParams,
public alertCtrl: AlertController,
public http: Http,
public alertCtrl: AlertController,public commonSer:CommonService,
public http: Http,public tabSer:TabsService,
public appService: AppService) {
}
......@@ -66,12 +68,11 @@ export class ActivityListPage {
//增加阅读记录
addRecodings(){
this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/addRecodings", null)
.subscribe((res: Response) => {
}, error => {
}
);
this.tabSer.activityAddRecodings().subscribe(
(res)=>{
this.commonSer.log("活动：增加阅读记录成功")
}
)
}
}
src/pages/home/learning/learn.service.ts
View file @ 72847151
......@@ -33,4 +33,6 @@ export class LearnService{
viewAnswerDetail(data): Observable<any>{
return this.http.post(AppGlobal.domain+'/wisdomgroup/modules/learnTest/viewAnswerDetail',this.commonSer.toFormData(data));
}
//
}
\ No newline at end of file
src/pages/home/learning/learning-list/learning-list.ts
View file @ 72847151
......@@ -4,6 +4,8 @@ import {LearningExplainPage} from "../learning-explain/learning-explain";
import {LearnService} from "../learn.service";
import {DatePipe} from "@angular/common";
import {LearningResultPage} from "../learning-result/learning-result";
import {TabsService} from "../../../tabs/tabs.service";
import {CommonService} from "../../../../service/common.service";
@IonicPage()
......@@ -24,20 +26,30 @@ export class LearningListPage {
pageNumber = 1; //页码
pageSize = 25; //每页显示条数
constructor(public navCtrl: NavController, public navParams: NavParams,
public learnSer: LearnService, public datePipe: DatePipe) {
constructor(public navCtrl: NavController, public navParams: NavParams,public tabSer:TabsService,
public learnSer: LearnService, public datePipe: DatePipe,public commonSer:CommonService) {
}
ionViewDidLoad(){
let itemWidth = window.screen.width / 3;
this.tips.nativeElement.style.left = itemWidth / 2 - this.tips.nativeElement.offsetWidth / 2 + 'px';
this.readRecoding();
}
ionViewDidEnter() {
this.getList();
}
//测试问卷的阅读激励
readRecoding(){
this.tabSer.testAddRecodings().subscribe(
(res)=>{
this.commonSer.log("测试列表：增加阅读记录成功!")
}
)
}
getList() {
const nowDate = this.datePipe.transform(new Date(), 'yyyy/MM/dd HH:mm:ss')
const data = {
......
src/pages/tabs/home/home.html
View file @ 72847151
......@@ -18,17 +18,17 @@
<div class="card" (click)="goTo('ActivityListPage')">
<img src="./assets/imgs/home/icon-bm.png" alt="">
<label class="label2-2">活动报名</label>
<img class="new-logo" *ngIf="hasNewActivity==1" src="./assets/imgs/new.png">
<img class="new-logo" *ngIf="hasNew.activity==1" src="./assets/imgs/new.png">
</div>
<div class="card" (click)="goTo('AnnouncementPage')">
<img src="./assets/imgs/home/icon-tz.png" alt="">
<label class="label2-2">通知公告</label>
<img class="new-logo" *ngIf="hasNewNotice==1" src="./assets/imgs/new.png">
<img class="new-logo" *ngIf="hasNew.notice==1" src="./assets/imgs/new.png">
</div>
<div class="card" (click)="goOutGoingReportAboutAll()">
<img src="./assets/imgs/home/icon-lhbb.png" alt="">
<label class="label2-2">离沪报备</label>
<img class="new-logo" *ngIf="hasNewPremanager==1" src="./assets/imgs/new.png">
<img class="new-logo" *ngIf="hasNew.premanager==1" src="./assets/imgs/new.png">
</div>
<div class="card" (click)="goTo('DutyPage')">
<img src="./assets/imgs/home/icon-zb.png" alt="">
......@@ -51,7 +51,7 @@
<div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-xxcs.png" alt="">
<label class="label2-2 more2-2">学习测试</label>
<img class="new-logo" *ngIf="hasNewTest==1" src="./assets/imgs/new.png">
<img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png">
</div>
<!--<div class="card" (click)="goTo('LearnManagePage')">-->
<!--<img src="./assets/imgs/home/icon-ccgl.png" alt="">-->
......@@ -66,7 +66,7 @@
<div class="item3" style="padding-top: 0px;">
<div class="item3-2" style="background-color:#f8f8f8;" (click)="gotoNotice()">
<div class="card3" style="width: 15%;">
<span *ngIf="hasNewMessage == 1" class="img-tips"></span>
<span *ngIf="hasNew.message == 1" class="img-tips"></span>
<img src="./assets/imgs/home/icon-mail.png" >
</div>
<div class="card3" style="width: 75%;">
......
src/pages/tabs/home/home.ts
View file @ 72847151
......@@ -37,12 +37,8 @@ export class HomePage {
notice:0,
premanager:0,
message:0,
test:0,
};
hasNewActivity: number = 0;
hasNewNotice: number = 0;
hasNewPremanager: number = 0;
hasNewMessage: number = 0;
hasNewTest: number = 0;
//日历
date: string;
......@@ -104,11 +100,8 @@ export class HomePage {
ionViewWillEnter() {
this.slidersItems = [];
this.getHasNew();
//初始化日期
this.getHasNewActivity();
this.getHasNewNotice();
this.getHasNewMessage();
this.getHasNewPremanager();
//统计待进行和待确认活动数目
this.activityStatisticService.myActivityOrderCount((data) => {
this.waitgoCount = data.waitgoOrder;
......@@ -128,8 +121,6 @@ export class HomePage {
this.activityStatisticService.myNotdoPremanagerCount((data) => {
this.PremanagerNotdoCount = data;
});
//初始化操作记录
}
ionViewDidLeave() {
......@@ -218,56 +209,47 @@ export class HomePage {
this.navCtrl.push(page);
}
/**
* 获取是否有新的信息
*/
getHasNew(){
//获取是否有新活动
this.tabsSer.hasNewActivity().subscribe(
(res)=>{
this.hasNew.activity = res;
}
)
//获取是否有新的活动
getHasNewActivity() {
this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/hasNewActivity", null)
.subscribe((res: Response) => {
let data = res.json();
this.hasNewActivity = data;
}, error => {
}
);
}
//获取是否有新的公告
getHasNewNotice() {
this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/hasNewNotice", null)
.subscribe((res: Response) => {
let data = res.json();
this.hasNewNotice = data;
}, error => {
}
);
}
//获取是否有新消息
getHasNewMessage() {
this.appService.ObserverHttpGet("/wisdomgroup/modules/message/hasNewMessage", null)
.subscribe((res: Response) => {
let data = res.json();
this.hasNewMessage = data;
}, error => {
}
);
}
//获取是否有新通知
this.tabsSer.hasNewNotice().subscribe(
(res)=>{
this.hasNew.notice = res;
}
)
//获取是否有新的报备
getHasNewPremanager() {
this.appService.ObserverHttpGet("/wisdomgroup/modules/premanager/hasNewPremanager", null)
.subscribe((res: Response) => {
let data = res.json();
this.hasNewPremanager = data;
}, error => {
}
);
}
//获取是否有新通知
this.tabsSer.hasNewMessage().subscribe(
(res)=>{
this.hasNew.message = res;
}
)
//获取是否有新学习测试
getHasNewTest(){
//获取是否有新报备
this.tabsSer.hasNewPremanager().subscribe(
(res)=>{
this.hasNew.premanager = res;
}
)
//获取是否有新问卷
this.tabsSer.hasNewTest().subscribe(
(res)=>{
this.hasNew.test = res;
}
)
}
//获取所有未读消息的数量--->设置角标
getNewCount() {
this.appService.ObserverHttpGetData('/wisdomgroup/modules/activity/hasNewCount', null)
.subscribe((res) => {
......
src/pages/tabs/tabs.service.ts
View file @ 72847151
import {Injectable} from "@angular/core";
import {HttpClient} from "@angular/common/http";
import {Http} from "@angular/http";
import {Observable} from "rxjs/Observable";
import {AppGlobal} from "../../service/appHttpService";
import {CommonService} from "../../service/common.service";
@Injectable()
export class TabsService{
constructor(private http:HttpClient,private commonSer:CommonService){}
constructor(
private http:HttpClient, //该请求 将结果转为json
private commonSer:CommonService,
private https:Http, //该请求不转json
){}
//获取权限
getRoles(): Observable<any>{
......@@ -33,6 +38,41 @@ export class TabsService{
return this.http.get(AppGlobal.domain +'/wisdomgroup/workCalendar/getFestivalAboutMonth?'+this.commonSer.toQuery(data));
}
//获取是否有新的活动
hasNewActivity(): Observable<any>{
return this.http.get(AppGlobal.domain +'/wisdomgroup/modules/activity/hasNewActivity');
}
//获取是否有新的通知
hasNewNotice(): Observable<any>{
return this.http.get(AppGlobal.domain +'/wisdomgroup/modules/notice/hasNewNotice');
}
//获取是否有新信息
hasNewMessage(): Observable<any>{
return this.http.get(AppGlobal.domain +'/wisdomgroup/modules/message/hasNewMessage');
}
//获取是否有新信息
hasNewPremanager(): Observable<any>{
return this.http.get(AppGlobal.domain +'/wisdomgroup/modules/premanager/hasNewPremanager');
}
//获取是否有新的问卷
hasNewTest(): Observable<any>{
return this.http.get(AppGlobal.domain +'/wisdomgroup/modules/learnTest/hasNewTest');
}
//问卷已读
testAddRecodings(): Observable<any>{
return this.https.get(AppGlobal.domain +'/wisdomgroup/modules/learnTest/addRecodings');
}
//活动已读
activityAddRecodings(): Observable<any>{
return this.https.get(AppGlobal.domain +'/wisdomgroup/modules/activity/addRecodings');
}
//下载文件
downFile(data): Observable<any>{
return this.http.get(AppGlobal.domain +'/wisdomgroup/modules/common/file/download/'+data,{responseType: 'blob'});
......
src/service/appHttpService.ts
View file @ 72847151
......@@ -13,18 +13,18 @@ export class AppGlobal {
};
//接口基地址
// static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://180.168.156.212:2931"; //测试环境
static domain = ""; //本地环境
static domain = ""; //本地环境
//图片地址
static picture = "http://101.89.112.92:80/wisdomgroup/manager/getIcon/"; //正式地址
// static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/"; //测试
// static picture = "http://101.89.112.92:80/wisdomgroup/manager/getIcon/"; //正式地址
static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/"; //测试
//通知公告图片参数
static pictureNotice = "http://101.89.112.92:80"; //正式地址
// static pictureNotice = "http://180.168.156.212:2931"; //测试
// static pictureNotice = "http://101.89.112.92:80"; //正式地址
static pictureNotice = "http://180.168.156.212:2931"; //测试
//接口地址
static API: any = {
......
src/service/common.service.ts
View file @ 72847151
......@@ -7,7 +7,10 @@ import {FileOpener} from "@ionic-native/file-opener";
@Injectable()
export class CommonService{
constructor(public toastCtrl:ToastController,public alertCtrl:AlertController,private file: File, private fileOpener: FileOpener,){}
constructor(public toastCtrl:ToastController,public alertCtrl:AlertController,
private file: File, private fileOpener: FileOpener){}
/**
* JSON格式数据转化为字符串 接口调用
......@@ -180,4 +183,14 @@ export class CommonService{
return mimeType;
}
/**
* 定义全局的log日志 开发模式 打印log 生产环境 关闭
* @param message 日志信息
*/
log(message){
if(AppGlobal.domain === ""){ //开发环境时
console.log(message);
}
}
}
\ No newline at end of file
src/service/emit.service.ts
View file @ 72847151
......@@ -3,6 +3,7 @@ import {Injectable, EventEmitter, OnInit} from "@angular/core";
export class EmitService implements OnInit {
public eventEmit: any;
//全局的监听事件
constructor() {
// 定义发射事件
this.eventEmit = new EventEmitter();
......
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