Skip to content

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

push

parent a3ae2e20
Show whitespace changes
Inline Side-by-side
Showing with 393 additions and 199 deletions
src/app/app.component.ts
View file @ 59faed0c
......@@ -45,7 +45,6 @@ export class MyApp {
console.log('getVersionNumber:' + err);
});
//log角标数目显示
badge.set(2);
});
}
}
src/app/app.module.ts
View file @ 59faed0c
......@@ -21,12 +21,14 @@ import { Keyboard } from '@ionic-native/keyboard';
import { Badge } from "@ionic-native/badge";
import {ContactModalPage} from "../pages/contact/contact-modal/contact-modal";
import { PersonPage } from "../pages/surveyManage/modal/person/person";
import {PersonListPage} from "../pages/contact/person-list/person-list";
@NgModule({
declarations: [
MyApp,
ContactModalPage,
PersonPage
PersonPage,
PersonListPage
],
imports: [
BrowserModule,
......@@ -49,7 +51,8 @@ import { PersonPage } from "../pages/surveyManage/modal/person/person";
entryComponents: [
MyApp,
ContactModalPage,
PersonPage
PersonPage,
PersonListPage
],
providers: [
StatusBar,
......
src/pages/activity/activityApply/activityApply.ts
View file @ 59faed0c
......@@ -6,6 +6,7 @@ import { Http, Response } from '@angular/http';
import { Storage } from '@ionic/storage';
import { AppService, AppGlobal } from '../../../service/appHttpService';
import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
import {MinePage} from "../../tabs/mine/mine";
@IonicPage()
@Component({
......@@ -203,10 +204,12 @@ export class ActivityApplyPage {
.subscribe((res: Response) => {
if (true) {
this.isSuccess = true;
setTimeout(() => {
this.navCtrl.setRoot("MyActivityListPage");
//清空 插入
const index = this.navCtrl.getActive().index;
this.navCtrl.remove(0, index);
this.navCtrl.setRoot(MinePage);
this.navCtrl.parent.select(3);
this.navCtrl.push("MyActivityListPage");
}, 1000);
} else {
}
......
src/pages/activity/activityDetail/activityDetail.html
View file @ 59faed0c
......@@ -48,16 +48,24 @@
<p>
<span class="color-666">批次名称:</span>
<span>{{batch.batchName}}</span>
<ng-container *ngIf="batch.signUp">
<span *ngIf=" batch.hasSignUpCount < batch.batchLimitNumber">
<!--是否报名 > 是否截止 > 是否满员 -->
<ng-container *ngIf="batch.order">
<span class="activity-btn2" *ngIf="batch.order" float-right>已报名</span>
<span class="activity-btn2" *ngIf="!batch.order" float-right>未报名</span>
</span>
<span *ngIf="batch.hasSignUpCount == batch.batchLimitNumber" class="activity-btn2" float-right>已满员</span>
</ng-container>
<ng-container *ngIf="!batch.order">
<ng-container *ngIf="batch.signUp">
<ng-container *ngIf=" batch.hasSignUpCount < batch.batchLimitNumber">
<span class="activity-btn2" float-right>未报名</span>
</ng-container>
<ng-container *ngIf="batch.hasSignUpCount == batch.batchLimitNumber">
<span class="activity-btn2" float-right>已满员</span>
</ng-container>
</ng-container>
<ng-container *ngIf="! batch.signUp">
<span class="activity-btn2" float-right>已截止</span>
</ng-container>
</ng-container>
</p>
<p>
......@@ -72,60 +80,6 @@
</p>
</ion-list>
</div>
<!--<div class="item4 item-margin">-->
<!--<ion-list class="item-list">-->
<!--<ion-item>-->
<!--<label class="item-label">-->
<!--<span class="item-title">-->
<!--活动说明-->
<!--</span>-->
<!--</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">时间</span>-->
<!--</label>-->
<!--<label class="item4-content">{{activity.time}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">地点</span>-->
<!--</label>-->
<!--<label class="item4-content">{{activity.location}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">交通</span>-->
<!--</label>-->
<!--<label class="item4-content">{{activity.musterTime}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">参与</span>-->
<!--</label>-->
<!--<label class="item4-content">{{activity.deadlineTime}}</label>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--</div>-->
<!--<div class="item5 item-margin">-->
<!--<ion-list class="item-list">-->
<!--<ion-item>-->
<!--<label class="item-label">-->
<!--<span class="item-title">-->
<!--活动须知-->
<!--</span>-->
<!--</label>-->
<!--</ion-item>-->
<!--<ion-item class="item5-content">-->
<!--<p>1.体检人员在体检服务窗口出示身份证即可；</p>-->
<!--<p>2.体检前三天注意清淡饮食，规律作息；</p>-->
<!--<p>3.体检前一天20:00后避免进食；</p>-->
<!--<p>4.体检当天完成抽血、彩超后方可进食。</p>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--</div>-->
<!--<button ion-button block (click)="goJoinDetail()">人员参与情况</button>-->
</ion-content>
<div class="cover" *ngIf="isCover">
......
src/pages/activity/activityDetail/activityDetail.ts
View file @ 59faed0c
......@@ -31,6 +31,10 @@ export class ActivityDetailPage {
public alertCtrl: AlertController,
public http: Http,
public appService: AppService, public toast: ToastController) {
}
ionViewDidEnter(){
let id = this.navParams.get('id');
this.findMyOrderByOrderId(id);
}
......
src/pages/activity/batch-detail/batch-detail.html
View file @ 59faed0c
......@@ -25,17 +25,17 @@
<div class="sign-info" *ngIf="batch.order">
<p class="info-title">报名信息</p>
<div class="content-item">
<p> <span>携带人数：</span><span>1</span> </p>
<p> <span>报名备注：</span><span>备注</span> </p>
</div>
</div>
<div class="feedback-info" *ngIf="batch.order">
<p class="info-title">出行反馈</p>
<div class="content-item">
<p> <span>出行结果：</span><span>1</span> </p>
<p> <span>评价反馈：</span><span>备注</span> </p>
<p> <span>携带人数：</span><span>{{order?.personnumber}}</span> </p>
<p> <span>报名备注：</span><span>{{order?.orderbz}}</span> </p>
</div>
</div>
<!--<div class="feedback-info" *ngIf="batch.order">-->
<!--<p class="info-title">出行反馈</p>-->
<!--<div class="content-item">-->
<!--<p> <span>出行结果：</span><span>1</span> </p>-->
<!--<p> <span>评价反馈：</span><span>备注</span> </p>-->
<!--</div>-->
<!--</div>-->
<div class="batch-info">
<div class="content-item">
<p> <span>报名截止：</span><span>{{this.batch.batchEndDate}}</span> </p>
......@@ -47,9 +47,14 @@
</div>
</div>
<div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">4/20</span></div>
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span></div>
<div class="button-right" >
<!--时间是否截止->人数是否满了->是否报名了-->
<!--是否报名了>时间是否截止->人数是否满了->-->
<ng-container *ngIf="batch.order">
<span class="button-btn button-btn2" (click)="sureCancelOrder()">取消报名</span>
</ng-container>
<ng-container *ngIf="!batch.order">
<!--时间截止-->
<ng-container *ngIf="batch.signUp">
<!--人数满-->
<ng-container *ngIf="batch.hasSignUpCount == batch.batchLimitNumber">
......@@ -57,13 +62,15 @@
</ng-container>
<!--人数未满-->
<ng-container *ngIf="batch.hasSignUpCount < batch.batchLimitNumber">
<span (click)="goApply()" *ngIf="!batch.order" class="button-btn button-btn1">立即报名</span>
<span *ngIf="batch.order" class="button-btn button-btn2" (click)="sureCancelOrder()">取消报名</span>
<span (click)="goApply()" class="button-btn button-btn1">立即报名</span>
</ng-container>
</ng-container>
<ng-container *ngIf="!batch.signUp">
<span class="button-btn button-btn3">报名截止</span>
</ng-container>
</ng-container>
</div>
</div>
</div>
......
src/pages/activity/batch-detail/batch-detail.ts
View file @ 59faed0c
......@@ -21,6 +21,7 @@ export class BatchDetailPage {
batchName:''
};
activity;
order;
swiper;
swiperIndex = 0;
constructor(public navCtrl: NavController, public navParams: NavParams,
......@@ -30,6 +31,9 @@ export class BatchDetailPage {
ionViewDidLoad() {
this.batch = this.navParams.get('batch');
this.activity = this.navParams.get('activity');
if( this.batch.order ){
this.order = this.batch.order;
}
}
initSwiper(){
......
src/pages/activity/order-edit/order-edit.html
View file @ 59faed0c
......@@ -10,9 +10,7 @@
</ion-item>
<ion-item>
<ion-label>选择批次</ion-label>
<ion-select [(ngModel)]="submitOrder.Batchid" cancelText="取消" okText="确认">
<ion-option *ngFor="let item of batchList" value="{{item.id}}">{{item.batchName}}</ion-option>
</ion-select>
<span float-right>{{submitOrder.Batchid}}</span>
</ion-item>
<ion-item class="margin-top-10">
<ion-label>报名用户</ion-label>
......@@ -28,7 +26,8 @@
</ion-item>
<ion-item class="margin-top-10">
<ion-label>报名备注</ion-label>
<ion-textarea [(ngModel)]="submitOrder.Orderbz" class="content-textarea"></ion-textarea>
<!--<ion-textarea [(ngModel)]="submitOrder.Orderbz" class="content-textarea"></ion-textarea>-->
</ion-item>
<button class="submit-btn submit" (click)="submit()">提交订单</button>
......
src/pages/activity/order-edit/order-edit.scss
View file @ 59faed0c
......@@ -96,4 +96,7 @@ page-order-edit {
height: 2rem;
width: 2rem;
}
.item-ios.item-block .item-inner {
border-bottom: 0.55px solid #c8c7cc;
}
}
src/pages/announcementView/announcementView.html
View file @ 59faed0c
......@@ -12,6 +12,6 @@
<span class="author">{{notice?.fbDept}}</span>
<span class="date">{{notice?.createTime}}</span>
</div>
<div class="content" [innerHTML]="notice?.noticeContent">
<div class="content" [innerHTML]="noticeContent">
</div>
</ion-content>
\ No newline at end of file
src/pages/announcementView/announcementView.ts
View file @ 59faed0c
......@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { Response } from '@angular/http';
import { AppService } from '../../service/appHttpService';
import { AppGlobal } from "../../service/appHttpService";
@IonicPage()
@Component({
......@@ -11,7 +12,10 @@ import { AppService } from '../../service/appHttpService';
export class AnnouncementViewPage {
notice: object;
notice = {
'noticeContent':''
};
noticeContent = '';
constructor(
public navCtrl: NavController,
public navParams: NavParams,
......@@ -26,6 +30,8 @@ export class AnnouncementViewPage {
this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/getNoticeById", { id: id })
.subscribe((res: Response) => {
this.notice = res.json().notice;
let src = this.notice.noticeContent.split('src="');
this.noticeContent = src.join('src="'+AppGlobal.pictureNotice);
}, error => {
this.appService.alert('网络异常！');
}
......
src/pages/contact/block-list/block-list.html 0 → 100644
View file @ 59faed0c
<ion-header>
<ion-navbar>
<ion-title text-center>
<span>{{orgName}}</span>
</ion-title>
</ion-navbar>
</ion-header>
<ion-content direction="y" scrollbar-y="true">
<div class="item" (click)="showPersonModal()">
<span class="icon-span">
<ion-icon ios="ios-add" class="add-icon-contact" md="md-add"></ion-icon>
</span>
<span class="contact-title color-999">添加联系人</span>
</div>
<ion-list>
<ion-item *ngFor="let contactPerson of contactPersons" >
<div class="contact-box">
<img src="./assets/imgs/man.png" class="contact-img" *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
<img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
<div class="contact-box-right">
<div>
<span class="contact-name">{{contactPerson.name}}</span>
<ion-icon name="male" class="contact-sex male" *ngIf="contactPerson.gender =='1'||contactPerson.gender==null"></ion-icon>
<ion-icon name="female" class="contact-sex female" *ngIf="contactPerson.gender =='0'"></ion-icon>
</div>
<div class="contact-organization">{{contactPerson.orgName}}</div>
<div>
<span class="contact-telphone">座机：{{contactPerson.telephone}}</span>
<span class="contact-handphone">手机：{{contactPerson.mobile}}</span>
</div>
</div>
</div>
</ion-item>
</ion-list>
</ion-content>
\ No newline at end of file
src/pages/contact/block-list/block-list.module.ts 0 → 100644
View file @ 59faed0c
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { BlockListPage } from './block-list';
@NgModule({
declarations: [
BlockListPage,
],
imports: [
IonicPageModule.forChild(BlockListPage),
],
})
export class BlockListPageModule {}
src/pages/contact/block-list/block-list.scss 0 → 100644
View file @ 59faed0c
page-block-list {
.item{
// height: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: left;
box-sizing: border-box;
padding: 10px 0 10px 15px;
}
.contact-icon{
font-size: 30px;
color: #81afe8;
margin-right: 15px;
}
.icon-span{
text-align: center;
background-color: #eeeeee;
display: inline-block;
width: 35px;
height: 35px;
margin-right: 10px;
border-radius: 2px;
}
.add-icon-contact{
font-weight: 600;
color: #fff;
font-size: 48px;
line-height: 35px;
}
.contact-title{
font-size: 18px;
}
.item-border{
border-bottom: 1px solid #cccccc;
padding-bottom: 10px;
}
.wait{
width: 100%;
height: 100%;
}
.back-btn{
width: 30px;
height: 30px;
}
.input{
height: 38px;
border: 1px solid #ddd;
width: 80%;
border-radius: 5px;
padding: 1px 5px;
}
}
src/pages/contact/block-list/block-list.ts 0 → 100644
View file @ 59faed0c
import { Component } from '@angular/core';
import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
import {AppService} from "../../../service/appHttpService";
import {ContactModalPage} from "../contact-modal/contact-modal";
import {PersonListPage} from "../person-list/person-list";
@IonicPage()
@Component({
selector: 'page-block-list',
templateUrl: 'block-list.html',
})
export class BlockListPage {
orgid;
orgName;
contactPersons;
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService:AppService,public modalCtrl: ModalController) {
}
ionViewDidLoad() {
this.orgid = this.navParams.get("orgid");
this.orgName = this.navParams.get("orgName");
this.initList();
console.log(this.orgid);
}
initList(){
const data = {
'groupId': this.orgid
}
this.appService.ObserverHttpGet('/wisdomgroup/modules/telpBookPerson',data)
.subscribe((res)=>{
if(res.json().data){
this.contactPersons = res.json().data;
}
})
}
showPersonModal(){
let peoModal = this.modalCtrl.create(PersonListPage);
peoModal.present();
}
}
src/pages/contact/contact-modal/contact-modal.html
View file @ 59faed0c
......@@ -6,8 +6,7 @@
</ion-title>
<ion-buttons start>
<button ion-button (click)="dismiss()">
<span ion-text color="primary" showWhen="ios">取消</span>
<ion-icon name="md-close" showWhen="android,windows"></ion-icon>
<span ion-text color="primary">取消</span>
</button>
</ion-buttons>
</ion-toolbar>
......
src/pages/contact/contactList/contactList.scss
View file @ 59faed0c
......@@ -6,7 +6,9 @@ page-contactList {
justify-content: left;
box-sizing: border-box;
}
.list-ios .item-block .item-inner {
border-bottom: 0.55px solid #c8c7cc;
}
.search{
float: right;
color: #72a4fe;
......
src/pages/contact/contract-personinfo/contract-personinfo.scss
View file @ 59faed0c
......@@ -6,7 +6,9 @@ page-contract-personinfo {
justify-content: left;
box-sizing: border-box;
}
.list-ios .item-block .item-inner {
border-bottom: 0.55px solid #c8c7cc;
}
.content{
background-color: #f5f5f5;
}
......
src/pages/contact/contract-personinfo/contract-personinfo.ts
View file @ 59faed0c
......@@ -93,7 +93,6 @@ export class ContractPersoninfoPage {
this.appService.ObserverHttpPost("/wisdomgroup/app/contact/deleteGeneralContactPersons",this.userRelEntity)
.subscribe((res: Response) => {
let data = res.json();
console.log("data:"+data);
this.navCtrl.push("ContactListPage");
}, error => {
this.appService.alert('网络异常！');
......@@ -125,7 +124,7 @@ export class ContractPersoninfoPage {
//跳转设置分组
usualContactSet(){
this.navCtrl.push('MyBlockPage');
this.navCtrl.push('MyBlockPage',{'item':this.contactPersonInfo});
}
editDone(){
......
src/pages/contact/my-block/my-block.html
View file @ 59faed0c
......@@ -8,13 +8,13 @@
</ion-header>
<ion-content>
<div class="item">
<span class="icon-span">
<ion-icon ios="ios-add" class="add-icon-contact" md="md-add"></ion-icon>
</span>
<span class="contact-title color-999">分组</span>
</div>
<div class="item item-border" *ngFor="let item of ownerList" (click)="usualContactBlockPersons(item)">
<!--<div class="item">-->
<!--<span class="icon-span">-->
<!--<ion-icon ios="ios-add" class="add-icon-contact" md="md-add"></ion-icon>-->
<!--</span>-->
<!--<span class="contact-title color-999">分组</span>-->
<!--</div>-->
<div class="item item-border" *ngFor="let item of ownerList" (click)="addBlock(item)">
<ion-icon name="folder" class="contact-icon"></ion-icon>
<span class="contact-title">{{item?.usergroupName}}</span>
<ion-item-options>
......
src/pages/contact/my-block/my-block.ts
View file @ 59faed0c
......@@ -11,11 +11,14 @@ import {AppService} from "../../../service/appHttpService";
})
export class MyBlockPage {
ownerList;
contactPersonInfo;
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService:AppService) {
}
ionViewDidLoad() {
this.contactPersonInfo = this.navParams.get('item');
console.log(this.contactPersonInfo);
this.initOwnerList();
}
......@@ -33,4 +36,16 @@ export class MyBlockPage {
}
);
}
addBlock(item){
const data = [{
'telpbookId':item.id,
'linkUserid':this.contactPersonInfo.id,
'linkUsername':this.contactPersonInfo.name
}];
this.appService.ObserverHttpGetData('/wisdomgroup/modules/telpBookPerson',data)
.subscribe((res)=>{
console.log(res.json());
})
}
}
src/pages/contact/person-list/person-list.html 0 → 100644
View file @ 59faed0c
<ion-header>
<ion-navbar>
<ion-title>联系人</ion-title>
<ion-buttons start>
<button ion-button (click)="dismiss()">
<span ion-text color="primary">取消</span>
</button>
</ion-buttons>
</ion-navbar>
</ion-header>
<ion-content padding>
<ion-searchbar (ionInput)="getItems($event)"></ion-searchbar>
<ion-list>
<!--<ion-item *ngFor="let item of perList">-->
<!--&lt;!&ndash;{{ item.name }}&ndash;&gt;-->
<!--</ion-item>-->
</ion-list>
</ion-content>
src/pages/contact/person-list/person-list.ts 0 → 100644
View file @ 59faed0c
import { Component } from '@angular/core';
import {IonicPage, NavController, NavParams, ViewController} from 'ionic-angular';
import {AppService} from "../../../service/appHttpService";
@Component({
selector: 'page-person-list',
templateUrl: 'person-list.html',
})
export class PersonListPage {
perList;
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService: AppService , public viewCtrl: ViewController) {
}
ionViewDidLoad() {
const data = {
name:'1',
pageSize:'1',
pageNumber:'1000'
};
this.appService.ObserverHttpPostData('/wisdomgroup/app/getUserByName',data)
.subscribe((res)=>{
this.perList = res.json();
})
}
dismiss() {
let data = { 'foo': 'bar' };
this.viewCtrl.dismiss(data);
}
}
src/pages/myActivityList/myActivityList.html
View file @ 59faed0c
<ion-header>
<ion-navbar>
<ion-title>我的活动</ion-title>
<ion-title>活动订单</ion-title>
</ion-navbar>
</ion-header>
<ion-content class="bgc-e7e8ed">
......@@ -60,8 +60,8 @@
</div>
</div>
<div class="right">
<button class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button>
<button class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">重选批次</button>
<button class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消订单</button>
<button class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">修改订单</button>
<button class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
<button class="cancel" *ngIf="item.orderstate == 2" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
......
src/pages/myActivityList/myActivityList.ts
View file @ 59faed0c
......@@ -10,6 +10,7 @@ import { JoinPersonsPage } from '../joinPersons/joinPersons';
import { ActivityStatisticService } from '../../service/activityStatisticService';
import {OrderDetailPage} from "../activity/order-detail/order-detail";
import {OrderEditPage} from "../activity/order-edit/order-edit";
import {ActivityDetailPage} from "../activity/activityDetail/activityDetail";
......@@ -47,7 +48,7 @@ export class MyActivityListPage {
//ViewChild传入一个字符串contentSlides，变量contentSlides接收。其它不变
@ViewChild('contentSlides') contentSlides: Slides;
menus: Array<string> = ['全部活动', '待进行', '待确认'];
menus: Array<string> = ['活动订单', '待进行', '待确认'];
waitgoOrderCount = 0;
waitsureOrderCount = 0;
......@@ -178,8 +179,7 @@ export class MyActivityListPage {
//重选批次（更新订单）
reelectBatch(item): void {
this.navCtrl.push('OrderEditPage',{item:item});
// this.navCtrl.push('ActivityApplyPage', { changeOrderInfo: order, item: order.activity });
this.navCtrl.push('ActivityDetailPage',{id:item.activityid});
}
//跳转人员参与情况列表页面
......
src/pages/myReport/myReport.ts
View file @ 59faed0c
......@@ -11,6 +11,7 @@ import { ActivityStatisticService } from '../../service/activityStatisticService
import { OutGoingReportViewPage } from '../report/outGoingReportView/outGoingReportView';
import { Storage } from '@ionic/storage';
import {MinePage} from "../tabs/mine/mine";
declare var Swiper;
@IonicPage()
......@@ -39,13 +40,12 @@ export class MyReportPage {
public storage:Storage
) {
console.log(this.navCtrl);
}
//初始化加载我的报备
ngOnInit(): void {
this.getAllMyReport();
//this.getAllMyProcessingReport();
//this.getAllMyEndReport();
}
//当页面加载的时候触发，只触发一次，当有缓存的的时候，打开页面时不在加载
......
src/pages/report/outGoingReportEdit/outGoingReportEdit.html
View file @ 59faed0c
......@@ -7,8 +7,6 @@
<ion-content class="content">
<div class="item1">
<div class="img-box">
<!-- <img class="item1-image" src="./assets/imgs/logo.png"> -->
<img class="item1-image" src="{{picture}}">
......
src/pages/report/outGoingReportEdit/outGoingReportEdit.ts
View file @ 59faed0c
......@@ -5,6 +5,7 @@ import { Storage } from '@ionic/storage';
import { AppService, AppGlobal } from "../../../service/appHttpService";
import { OutGoingReportDetailPage } from '../outGoingReportDetail/outGoingReportDetail';
import { MyReportPage } from "../../myReport/myReport";
import {MinePage} from "../../tabs/mine/mine";
@IonicPage()
@Component({
......@@ -285,8 +286,15 @@ export class OutGoingReportEditPage {
let resultback = result;
if(resultback.code == '200'){
//this.appService.popToastView(resultback.msg,'middle',1000);
this.navCtrl.push("MyReportPage");
//清空 插入
const index = this.navCtrl.getActive().index;
this.navCtrl.remove(0, index);
this.navCtrl.setRoot(MinePage);
this.navCtrl.parent.select(3);
this.navCtrl.push("MyReportPage");
}else{
//失败
this.appService.popToastView(resultback.msg,'middle',1000);
......
src/pages/surveyManage/item/edit/edit.html
View file @ 59faed0c
......@@ -18,17 +18,17 @@
<div class="item-content">
<p>{{i +1}}.{{item.title}}</p>
<ng-container *ngIf="item.quesType == 1">
<p><input type="radio">是</p>
<p><input type="radio">否</p>
<p><span class="input-radio"></span>是</p>
<p><span class="input-radio"></span>否</p>
</ng-container>
<ng-container *ngIf="item.quesType == 2">
<ng-container *ngFor=" let option1 of item.quesDesc">
<p>{{option1.option_title}}</p>
<p><span class="input-radio">{{option1.option_title}}</p>
</ng-container>
</ng-container>
<ng-container *ngIf="item.quesType == 3">
<ng-container *ngFor=" let option2 of item.quesDesc">
<p>{{option2.option_title}}</p>
<p><span class="input-check">{{option2.option_title}}</p>
</ng-container>
</ng-container>
<ng-container *ngIf="item.quesType == 4">
......
src/pages/surveyManage/item/edit/edit.scss
View file @ 59faed0c
......@@ -55,5 +55,15 @@ page-edit {
font-size: 1.3rem;
}
}
.input-radio{
border: 1px solid #ddd;
display: inline-block;
border-radius: 50%;
width: 1.2rem;
height: 1.2rem;
margin-right: 8px;
vertical-align: sub;
}
.input-check{}
}
src/pages/tabs/contact/contact.ts
View file @ 59faed0c
import {Component} from '@angular/core';
import {NavController, NavParams, ToastController} from 'ionic-angular';
import {Response} from '@angular/http';
import {Storage} from '@ionic/storage';
import {AppService} from '../../../service/appHttpService';
import { Component } from '@angular/core';
import { NavController, NavParams, ToastController } from 'ionic-angular';
import { Response } from '@angular/http';
import { Storage } from '@ionic/storage';
import { AppService } from '../../../service/appHttpService';
import { SearchPage } from '../../search/search';
import { ContactListPage } from '../../contact/contactList/contactList';
import {SearchPage} from '../../search/search';
import {ContactListPage} from '../../contact/contactList/contactList';
import {AddBlockPage} from "../../contact/add-block/add-block";
import {BlockListPage} from "../../contact/block-list/block-list";
@Component({
selector: 'page-contact',
......@@ -19,8 +19,7 @@ export class ContactPage {
organizations: Array<string> = [];
ownerList: Array<string> = [];
constructor(
public navCtrl: NavController,
constructor(public navCtrl: NavController,
public navParams: NavParams,
public storage: Storage,
public appService: AppService,
......@@ -29,40 +28,41 @@ export class ContactPage {
}
//ionViewWillEnter
ionViewDidEnter():void{
ionViewDidEnter(): void {
//加载组织列表：initOrganizeList
this.initOrganizeList();
this.initOwnerList();
}
initOrganizeList():void{
initOrganizeList(): void {
//this.appService.ObserverHttpGet("/wisdomgroup/app/getAllOrganization",null)
//隐藏显示
this.appService.ObserverHttpGetData("/wisdomgroup/sysmanagement/org/getAllOrganization",{order:0})
this.appService.ObserverHttpGetData("/wisdomgroup/sysmanagement/org/getAllOrganization", {order: 0})
.subscribe((res: Response) => {
let data = res.json();
console.log("data:"+data);
console.log("data:" + data);
this.organizations = data;
//移除父节点
for (let index = 0; index < this.organizations.length; index++) {
const element = this.organizations[index];
if(element["organizationLevel"] == '1' ) {
if (element["organizationLevel"] == '1') {
var flag = index;
}
}
this.organizations.splice(flag,1);
this.organizations.splice(flag, 1);
}, error => {
this.appService.alert('网络异常！');
}
);
}
initOwnerList(){
initOwnerList() {
const data = {
pageSize:'10',
pageNumber:'1'
pageSize: '10',
pageNumber: '1'
};
this.appService.ObserverHttpGetData("/wisdomgroup/modules/telpBook",data)
this.appService.ObserverHttpGetData("/wisdomgroup/modules/telpBook", data)
.subscribe((res: Response) => {
let data = res.json();
this.ownerList = data.data.list;
......@@ -73,29 +73,31 @@ export class ContactPage {
);
}
search(){
search() {
this.navCtrl.push("SearchPage");
}
//跳转至部门下联系人列表页面
usualContactOrgPersons(organization){
this.navCtrl.push("ContactListPage",{"orgid":organization.id,"orgName":organization.name});
usualContactOrgPersons(organization) {
this.navCtrl.push("ContactListPage", {"orgid": organization.id, "orgName": organization.name});
}
//跳转至部门下联系人列表页面
usualContactBlockPersons(organization){
this.navCtrl.push("ContactListPage",{"orgid":organization.id,"orgName":organization.usergroupName});
usualContactBlockPersons(organization) {
this.navCtrl.push("BlockListPage", {"orgid": organization.id, "orgName": organization.usergroupName});
}
//跳转至常用联系人列表
usualContactPersons(){
usualContactPersons() {
this.navCtrl.push("ContactListPage");
}
//添加分组
usualContactAdd(){
usualContactAdd() {
this.navCtrl.push('AddBlockPage');
}
deleteItem(item){
deleteItem(item) {
}
......
src/pages/tabs/home/home.scss
View file @ 59faed0c
......@@ -282,10 +282,14 @@ page-home {
}
.slides-title{
position: absolute;
bottom: 5px;
left: 15px;
bottom: 0;
left: 0;
font-size: 1.5rem;
color:#fff;
color: #fff;
width: 100%;
background-color: #999;
text-align: left;
padding: 3px 15px;
}
}
src/pages/tabs/home/home.ts
View file @ 59faed0c
......@@ -19,6 +19,7 @@ import {ReportTrackPage} from "../../report/reportTrack/reportTrack";
import { CalendarComponentOptions } from "ion2-calendar";
import {NoticePage} from "../notice/notice";
import {monthCh, weekDay} from "../../../app/main";
import { Badge } from "@ionic-native/badge";
declare var Swiper;
@IonicPage()
......@@ -73,46 +74,10 @@ export class HomePage {
//当前周日历展示
week: Week[] = [{
id: 0,
title: '日',
date: null,
isToday: false
}, {
id: 1,
title: '一',
date: null,
isToday: false
}, {
id: 2,
title: '二',
date: null,
isToday: false
}, {
id: 3,
title: '三',
date: null,
isToday: false
}, {
id: 4,
title: '四',
date: null,
isToday: false
}, {
id: 5,
title: '五',
date: null,
isToday: false
}, {
id: 6,
title: '六',
date: null,
isToday: false
}]
constructor(public navCtrl: NavController, public activityStatisticService: ActivityStatisticService,
public appService: AppService, public http: Http, private calendar: Calendar, public storage: Storage) {
public appService: AppService, public http: Http, private calendar: Calendar, public storage: Storage,
public badge:Badge) {
}
......@@ -141,7 +106,6 @@ export class HomePage {
}, error => {
this.appService.alert('系统错误！');
})
}
ionViewDidEnter() {
......@@ -356,6 +320,7 @@ export class HomePage {
this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/hasNewActivity", null)
.subscribe((res: Response) => {
let data = res.json();
this.badge.set(data.length);
console.log(data);
this.hasNewActivity = data;
}, error => {
......@@ -369,7 +334,7 @@ export class HomePage {
this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/hasNewNotice", null)
.subscribe((res: Response) => {
let data = res.json();
console.log(data);
this.badge.set(data.length);
this.hasNewNotice = data;
}, error => {
this.appService.alert('网络异常！');
......@@ -382,7 +347,7 @@ export class HomePage {
this.appService.ObserverHttpGet("/wisdomgroup/modules/premanager/hasNewPremanager", null)
.subscribe((res: Response) => {
let data = res.json();
console.log(data);
this.badge.set(data.length);
this.hasNewPremanager = data;
}, error => {
this.appService.alert('网络异常！');
......
src/pages/tabs/mine/mine.html
View file @ 59faed0c
......@@ -13,8 +13,6 @@
<div class="mine-header-right">
<img src="./assets/imgs/woman.png" *ngIf="gender == 0" class="head-photo">
<img src="./assets/imgs/man.png" *ngIf="gender == null || gender == '1'" class="head-photo">
<!-- <img class="head-photo" src="../../../assets/imgs/woman.png"> -->
<!-- <img class="head-photo" *ngIf="{{user.userDetail.user.gender != '女'}}" src="../../../assets/imgs/man.jpg"> -->
</div>
</div>
</div>
......@@ -38,17 +36,7 @@
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
</div>
</ion-item>
<!--<ion-item>-->
<!--<div class="group">-->
<!--<div class="group-box">-->
<!--<img src="./assets/imgs/mine/wdwj.png" class="group-img">-->
<!--<span>我的问卷</span>-->
<!--</div>-->
<!--<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>-->
<!--</div>-->
<!--</ion-item>-->
<ion-item (click)="myOperationList()" class="list-bottom-none">
<ion-item (click)="goDuty()" class="list-bottom-none">
<div class="group">
<div class="group-box">
<img src="./assets/imgs/mine/wdzb.png" class="group-img">
......@@ -81,5 +69,4 @@
</ion-item>
</ion-list>
<!--<button ion-button block class="logout" (click)="logout()">退出登录</button>-->
</ion-content>
\ No newline at end of file
src/pages/tabs/mine/mine.ts
View file @ 59faed0c
......@@ -149,4 +149,8 @@ export class MinePage {
goSet(){
this.navCtrl.push('VersionPage');
}
goDuty(){
this.navCtrl.push("DutyPage");
}
}
src/service/appHttpService.ts
View file @ 59faed0c
......@@ -27,6 +27,9 @@ export class AppGlobal {
// static picture = "http://180.153.158.250:3306/wisdomgroup/manager/getIcon/";
static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/";
//通知公告图片参数
static pictureNotice = "http://180.168.156.212:2931";
//接口地址
static API: any = {
getCategories: '/api/ionic3/getCategories',
......
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