Skip to content

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

报备

parent 80919d79
Show whitespace changes
Inline Side-by-side
Showing with 459 additions and 200 deletions
src/pages/activityTrack/activityTrack.html → src/pages/activity-track/activityTrack/activityTrack.html
View file @ f348b923
<ion-header>
<ion-toolbar>
<div class="searchToolBar">
<button ion-button clear small navPop style="padding: 0;" (click)="goBack()">
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-navbar>
<ion-title text-center>活动跟踪</ion-title>
</div>
</ion-toolbar>
</ion-navbar>
</ion-header>
<ion-content>
<ion-content class="bgc-e7e8ed">
<ion-list>
<ion-item *ngFor="let item of activityList" (click)="goDetail(item)">
<div class="item">
......@@ -37,7 +32,7 @@
</div>
</div>
<div class="right">
<button class="participation">人员参与情况</button>
<span class="color-24bafc">人员参与情况 ></span>
</div>
</div>
</div>
......
src/pages/activityTrack/activityTrack.scss → src/pages/activity-track/activityTrack/activityTrack.scss
View file @ f348b923
......@@ -7,19 +7,27 @@ page-activityTrack {
justify-content: left;
box-sizing: border-box;
}
.list-ios .item-block .item-inner{
border-bottom: none;
}
.item-ios{
margin-bottom:10px;
}
.item-header{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
font-size: 2rem;
padding: 10px 0;
border-bottom: 1px solid #ddd;
}
.item-content{
display: flex;
flex-direction: row;
align-items: flex-end;
align-items: flex-start;
justify-content: space-between;
box-sizing: border-box;
}
......@@ -31,14 +39,20 @@ page-activityTrack {
color: #90da91;
margin: 0 0;
font-size: 6px;
border-radius: 3px;
}
.left{
color: #8f8e8e;
font-size: 12px;
// height: 70px;
// display: inline-block;
color: #333333;
margin-left: 25px;
font-size: 1.5rem;
div{
margin: 5px 0;
}
}
.right{
margin: 5px 0;
font-size: 1.4rem;
}
.data{
......
src/pages/activityTrack/activityTrack.ts → src/pages/activity-track/activityTrack/activityTrack.ts
View file @ f348b923
......@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import { IonicPage, NavController } from 'ionic-angular';
import { Response } from '@angular/http';
import { JoinDetailPage } from '../joinDetail/joinDetail';
import { AppService } from '../../service/appHttpService';
import { AppService } from '../../../service/appHttpService';
@IonicPage()
@Component({
......
src/pages/joinDetail/joinDetail.html → src/pages/activity-track/joinDetail/joinDetail.html
View file @ f348b923
<ion-header>
<ion-toolbar>
<div class="searchToolBar">
<button ion-button clear small navPop style="padding: 0;">
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center>
处室可报名人员参与情况
</ion-title>
</div>
</ion-toolbar>
<ion-navbar>
<ion-title text-center>处室可报名人员参与情况</ion-title>
</ion-navbar>
</ion-header>
<ion-content class="content">
<div class="activity-title">
......
src/pages/joinDetail/joinDetail.scss → src/pages/activity-track/joinDetail/joinDetail.scss
View file @ f348b923
......@@ -9,11 +9,11 @@ page-joinDetail {
.activity-title{
background-color: #f5f5f5;
font-size: 12px;
color: #b2b2b2;
font-size: 1.6rem;
color: #333;
padding-left: 10px;
padding-top: 5px;
padding-bottom: 5px;
padding-top: 15px;
padding-bottom: 15px;
}
.content-box{
......@@ -27,7 +27,7 @@ page-joinDetail {
.content-box-item{
width: 105px;
height: 45px;
height: 80px;
margin: 8px 7px;
display: flex;
flex-direction: column;
......
src/pages/joinDetail/joinDetail.ts → src/pages/activity-track/joinDetail/joinDetail.ts
View file @ f348b923
......@@ -3,8 +3,8 @@ import { IonicPage, NavController, NavParams, AlertController, ToastController }
import { Http, Response, } from '@angular/http';
import { AppService } from '../../service/appHttpService';
import { ActivityStatisticService } from '../../service/activityStatisticService';
import { AppService } from '../../../service/appHttpService';
import { ActivityStatisticService } from '../../../service/activityStatisticService';
@IonicPage()
@Component({
......
src/pages/activity/activityApply/activityApply.html
View file @ f348b923
......@@ -5,13 +5,13 @@
</ion-header>
<ion-content class="content">
<ion-item class="content-title">
<ion-label>活动名称</ion-label>
<span>活动名称</span>
<span float-right>{{activity.activityName}}</span>
</ion-item>
<ion-item>
<ion-label>选择批次</ion-label>
<ion-select [(ngModel)]="gender">
<ion-option value="f">Female</ion-option>
<ion-option value="m">Male</ion-option>
<ion-select [(ngModel)]="order.Batchid">
<ion-option value="{{item.id}}" *ngFor="let item of activity.batchList">{{item.batchName}}</ion-option>
</ion-select>
</ion-item>
<ion-item class="margin-top-10">
......@@ -19,12 +19,22 @@
<span class="lettr-space-1" item-right></span>
</ion-item>
<ion-item class="margin-top-10">
<ion-label>携带人数</ion-label>
<span class="lettr-space-1" item-right></span>
<span>携带人数</span>
<span>
<span>
<button type="button" class="input_left" (tap)="next()">-</button>
</span>
<span>
<input type="text" readonly="readonly" [(ngModel)]='order.Personnumber' name="num" />
</span>
<span>
<button type="button" style="margin-left: -2px" class="input_right" (tap)="add()">+</button>
</span>
</span>
</ion-item>
<ion-item class="margin-top-10">
<ion-label>报名备注</ion-label>
<ion-textarea class="content-textarea"></ion-textarea>
<ion-textarea [(ngModel)]="order.Orderbz" class="content-textarea"></ion-textarea>
</ion-item>
<button class="submit-btn submit" (click)="submitOrder()">提交订单</button>
......
src/pages/activity/activityApply/activityApply.ts
View file @ f348b923
......@@ -29,7 +29,6 @@ export class ActivityApplyPage {
Orderbz: '', //报名备注
Activityid: '', //关联活动id
Batchid: '', //关联批次id
orderbz_end:''
};
//页面报名保存展示
......@@ -71,7 +70,9 @@ export class ActivityApplyPage {
//初始化显示活动列表
ngOnInit(): void {
// this.activity = this.navParams.get("item");
this.activity = this.navParams.get("activity");
this.order.Activityid = this.activity.id;
console.log(this.activity);
//
// if (this.activity.activityIMG) {
// this.picture = AppGlobal.picture + this.activity.activityIMG;
......@@ -80,7 +81,6 @@ export class ActivityApplyPage {
//
// this.subIntroduce(this.activity.activityIntro); //处理活动详情字数显示问题
// //订单的活动id
// this.order.Activityid = this.activity.id;
// this.initBatchList(this.navParams.get("changeOrderInfo"));
}
......@@ -191,12 +191,11 @@ export class ActivityApplyPage {
//携带人数 数字加减
add() {
console.log("1:"+this.order.Personnumber);
console.log("2:"+this.onebatch["batchPerNumber"]);
if(this.order.Personnumber<this.onebatch["batchPerNumber"]){
// if(this.order.Personnumber < this.onebatch["batchPerNumber"]){
this.order.Personnumber++;
// }
}
}
next() {
if (this.order.Personnumber >= 1) {
this.order.Personnumber--;
......@@ -211,7 +210,7 @@ export class ActivityApplyPage {
}
//报名
confirmOrder(orderId) {
confirmOrder(orderId) {
console.log(this.order.Personnumber + ":" + this.order.Activityid + ":" + this.order.Batchid);
//验证信息：
/**0.对于暂未有批次的。
......@@ -306,7 +305,33 @@ confirmOrder(orderId) {
}
submitOrder(){
this.navCtrl.push('ActivityConfirmPage');
console.log('报名操作');
this.order.Orderbz = this.order.orderbz_end;
let temp_Orderbz = encodeURIComponent(this.order.Orderbz) ;
this.order.Orderbz = temp_Orderbz;
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/create", this.order)
.subscribe((res: Response) => {
if (true) {
this.isSuccess = true;
setTimeout(() => {
console.log("报名成功");
this.isSuccess = false;
//this.navCtrl.setRoot("MyActivityListPage");
this.navCtrl.push("MyActivityListPage");
}, 1000);
} else {
}
}, error => {
this.appService.alert('网络异常！');
}
);
// this.navCtrl.push('ActivityConfirmPage',{
// order:this.order,
// activity:this.activity
// });
}
}
src/pages/activity/activityConfirm/activityConfirm.html
View file @ f348b923
......@@ -9,25 +9,30 @@
<ion-label>活动名称</ion-label>
</ion-item>
<ion-item>
<ion-label>选择批次</ion-label>
<ion-select [(ngModel)]="gender">
<ion-option value="f">Female</ion-option>
<ion-option value="m">Male</ion-option>
</ion-select>
<span>选择批次</span>
<span float-right></span>
</ion-item>
<div class="confirm-item margin-top-10">
<ion-label>出行结果</ion-label>
<div class="confirm-type">
<span>成功出行</span>
<span>未出行</span>
<span class="{{order.orderstate == 1? 'selected':''}}" (click)="changeType(1)">成功出行</span>
<span class="{{order.orderstate == 2? 'selected':''}}" (click)="changeType(2)">未出行</span>
</div>
</div>
<div class="margin-top-10 confirm-item">
<ion-label>评价反馈</ion-label>
<button class="submit-btn submit1" (click)="submitOrder()">非常满意</button>
<button class="submit-btn submit2" (click)="submitOrder()">满意</button>
<button class="submit-btn submit3" (click)="submitOrder()">一般</button>
<button class="submit-btn submit4" (click)="submitOrder()">不满意</button>
<button class="submit-btn submit1">非常满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button class="submit-btn submit2">满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button class="submit-btn submit3">一般
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button class="submit-btn submit4">不满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
</div>
</div>
......
src/pages/activity/activityConfirm/activityConfirm.scss
View file @ f348b923
......@@ -529,11 +529,11 @@ page-activityConfirm {
}
.confirm-type {
font-size: 0;
span:first-child {
span.selected{
background-color: #24bafc;
color: #fff;
}
span:last-child{
span{
background-color: #ececec;
}
}
......
src/pages/activity/activityConfirm/activityConfirm.ts
View file @ f348b923
......@@ -22,6 +22,7 @@ export class ActivityConfirmPage {
orderInfo:any;
order = {
orderfgconent:'',
orderstate:1
};
//页面按钮为默认取消报名和重选批次
modelflag = 1;
......@@ -40,7 +41,7 @@ export class ActivityConfirmPage {
isError: boolean = false; //是否提交失败
activityTypeFlag:Array<String> = ['未知','体检','疗休养','培训','工会活动'];
orderStatisfyLevel: Array<String> = ['未知', '非常满意', '满意', '一般','不满意'];
orderStatisfyLevel;
noticeArry: object[];
......@@ -63,17 +64,10 @@ export class ActivityConfirmPage {
}
//活动介绍限定一行17个字符串，两行57个字符串，多余以省略号代替
subIntroduce(str: string) {
if (!str) this.introduce = '';
if (str.length <=17) this.introduce = str;
if (str.length >17 && str.length <=25) this.introduce = str.substr(0, 17) + "...";
if(str.length>25 && str.length <=42) this.introduce = str;
if (str.length > 42) this.introduce = str.substr(0, 42) + "...";
}
ngOnInit():void{
this.activity = this.navParams.get('activity');
this.order = this.navParams.get('order');
console.log(this.order);
// this.orderInfo = this.navParams.get("lookOrderDetails");
// console.log("order:"+this.orderInfo);
// this.activity = this.orderInfo["activity"];
......@@ -129,26 +123,6 @@ export class ActivityConfirmPage {
this.isIntroduce = true;
}
//取消报名（订单）
sureCancelOrder(orderid): void {
this.appService.alert('确定取消报名么？', res => {
this.cancelOrder(orderid);
});
}
cancelOrder(orderid): void {
this.appService.ObserverHttpGet("/wisdomgroup/modules/order/deleteOrder", { "id": orderid })
.subscribe((res: Response) => {
//let data = res.json();
this.appService.alert('报名已取消！');
this.navCtrl.push("MyActivityListPage");
}, error => {
this.appService.alert('网络异常！');
}
);
}
//重选批次（更新订单）
reelectBatch(order): void {
......@@ -163,13 +137,16 @@ export class ActivityConfirmPage {
this.order["orderid"] = item["orderid"];
this.order["batchid"] = item["batchid"];
this.order["activityid"] = item["activityid"];
this.order["orderstate"] = '2'; //确认状态
// this.order["orderstate"] = '2'; //确认状态
this.order["personnumber"] = item["personnumber"]==null?0:item["personnumber"]; //携带人数
this.order["orderbz"] = item["orderbz"]; //备注说明
}
changeType(type){
this.order.orderstate = type;
}
//第二层弹框，参加
yes() {
......@@ -188,7 +165,7 @@ export class ActivityConfirmPage {
this.third = false;
this.isCover = false;
//未出行（更改订单状态为：报名未出行；确认方式为app）
this.order["orderstate"] = '3'; //报名未出行
// this.order["orderstate"] = '3'; //报名未出行
this.order["orderconfirm"] = '1' ; //手机app确认
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/confirmEvaluationOrder",this.order)
......@@ -227,7 +204,7 @@ export class ActivityConfirmPage {
//提交建议 (确认出行)
commit(orderfgconent: HTMLInputElement){
//确认出行：更改订单状态为完成，订单满意度评价，意见，确认方式
this.order["orderstate"] = '4'; //已完成
// this.order["orderstate"] = '4'; //已完成
this.order["orderconfirm"] = '1' ; //手机app确认
let temp_Orderbz = encodeURIComponent(this.order["orderbz"]) ;
......
src/pages/activity/activityDetail/activityDetail.ts
View file @ f348b923
......@@ -4,7 +4,7 @@ import { IonicPage, NavController, NavParams, AlertController, ToastController }
import {Http, Response} from '@angular/http';
import { AppService } from '../../../service/appHttpService';
import { JoinDetailPage } from '../../joinDetail/joinDetail';
import { JoinDetailPage } from '../../activity-track/joinDetail/joinDetail';
import {BatchDetailPage} from "../batch-detail/batch-detail";
@IonicPage()
......@@ -64,7 +64,7 @@ export class ActivityDetailPage {
//批次详情
goBatchDetail(item){
this.navCtrl.push('BatchDetailPage',{batch:item});
this.navCtrl.push('BatchDetailPage',{batch:item,activity:this.activity});
}
//活动介绍限定65个字符串，多余以省略号代替
......
src/pages/activity/batch-detail/batch-detail.html
View file @ f348b923
......@@ -39,16 +39,16 @@
<div class="batch-info">
<div class="content-item">
<p> <span>报名截止：</span><span>{{this.batch.batchEndDate}}</span> </p>
<p> <span>出行日期：</span><span>备注</span> </p>
<p> <span>可携带人数：</span><span>备注</span> </p>
<p> <span>集合时间：</span><span>备注</span> </p>
<p> <span>集合地点：</span><span>备注</span> </p>
<p> <span>活动须知：</span><span>备注</span> </p>
<p> <span>出行日期：</span><span>{{batch.batchGoDate}}</span> </p>
<p> <span>可携带人数：</span><span>{{batch.batchPerNumber}}</span> </p>
<p> <span>集合时间：</span><span>{{batch.batchSetTime}}</span> </p>
<p> <span>集合地点：</span><span>{{batch.batchSetAddress}}</span> </p>
<p> <span>活动须知：</span><span>{{batch.batchNotice}}</span> </p>
</div>
</div>
<div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc">4/20</span></div>
<div class="button-right" (click)="goApply()">
<div class="button-right" >
<!--时间是否截止->人数是否满了->是否报名了-->
<ng-container *ngIf="batch.signUp">
<!--人数满-->
......@@ -57,8 +57,8 @@
</ng-container>
<!--人数未满-->
<ng-container *ngIf="batch.hasSignUpCount < batch.batchLimitNumber">
<span *ngIf="!batch.order" class="button-btn button-btn1">立即报名</span>
<span *ngIf="batch.order" class="button-btn button-btn2">取消报名</span>
<span (click)="goApply()" *ngIf="!batch.order" class="button-btn button-btn1">立即报名</span>
<span *ngIf="batch.order" class="button-btn button-btn2" (click)="sureCancelOrder()">取消报名</span>
</ng-container>
</ng-container>
<ng-container *ngIf="!batch.signUp">
......
src/pages/activity/batch-detail/batch-detail.ts
View file @ f348b923
import {Component, ViewChild} from '@angular/core';
import {IonicPage, NavController, NavParams, Slides} from 'ionic-angular';
import {ActivityApplyPage} from "../activityApply/activityApply";
import {Response} from "@angular/http";
import {AppService} from "../../../service/appHttpService";
declare var Swiper;
......@@ -18,16 +20,18 @@ export class BatchDetailPage {
order:null,
batchName:''
};
activity;
swiper;
swiperIndex = 0;
constructor(public navCtrl: NavController, public navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService:AppService) {
}
ionViewDidLoad() {
// this.initSwiper();
let now = new Date().getTime();
this.batch = this.navParams.get('batch');
console.log(this.batch);
this.activity = this.navParams.get('activity');
console.log(this.activity);
let endDate = this.batch.batchEndDate + " 24:00:00";
endDate = new Date(endDate) +""; //判断是否过截止日期
if( now > Number(endDate) ){
......@@ -85,6 +89,26 @@ export class BatchDetailPage {
}
goApply(){
this.navCtrl.push('ActivityApplyPage');
this.navCtrl.push('ActivityApplyPage',{activity:this.activity});
}
//取消报名（订单）
sureCancelOrder(): void {
this.appService.alert('确定取消报名么？', res => {
this.cancelOrder();
});
}
cancelOrder(): void {
this.appService.ObserverHttpGet("/wisdomgroup/modules/order/deleteOrder", { "id": this.batch.order.orderid })
.subscribe((res: Response) => {
//let data = res.json();
this.appService.alert('报名已取消！');
this.navCtrl.push("MyActivityListPage");
}, error => {
this.appService.alert('网络异常！');
}
);
}
}
src/pages/chooseAddress/chooseAddress.ts
View file @ f348b923
......@@ -4,7 +4,7 @@ import { Response } from '@angular/http';
import { Storage } from '@ionic/storage';
import { AppService } from '../../service/appHttpService';
import { OutGoingReportDetailPage } from '../outGoingReportDetail/outGoingReportDetail';
import { OutGoingReportDetailPage } from '../report/outGoingReportDetail/outGoingReportDetail';
declare var Swiper;
@IonicPage()
......
src/pages/contact/add-block/add-block.html
View file @ f348b923
......@@ -3,7 +3,7 @@
<ion-navbar>
<ion-title>添加分组</ion-title>
<span float-right class="margin-right-10 color-999">完成</span>
<span (click)="done()" float-right class="margin-right-10 color-999">完成</span>
</ion-navbar>
</ion-header>
......@@ -13,7 +13,7 @@
分组名称
</div>
<div class="item">
<input class="input" type="text" placeholder="分组名称">
<input class="input" type="text" [(ngModel)]="groupName" placeholder="分组名称">
</div>
<div class="common">
组内成员
......
src/pages/contact/add-block/add-block.ts
View file @ f348b923
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, ModalController } from 'ionic-angular';
import {IonicPage, NavController, NavParams, ModalController, App} from 'ionic-angular';
import {SelectBlockPage} from "../select-block/select-block";
import {Response} from "@angular/http";
import { AppService } from "../../../service/appHttpService";
@IonicPage()
@Component({
......@@ -10,8 +11,9 @@ import {SelectBlockPage} from "../select-block/select-block";
})
export class AddBlockPage {
groupName;
constructor(public navCtrl: NavController, public navParams: NavParams,
public modalCtrl: ModalController) {
public modalCtrl: ModalController, public appService: AppService) {
}
ionViewDidLoad() {
......@@ -22,4 +24,20 @@ export class AddBlockPage {
this.navCtrl.push('SelectBlockPage');
}
//创建分组
done(){
const data = {
groupName:this.groupName
};
this.appService.ObserverHttpPostData("/wisdomgroup/modules/telpBook/",data)
.subscribe((res: Response) => {
let data = res.json();
console.log("data:"+data);
this.navCtrl.push("ContactListPage");
}, error => {
this.appService.alert('网络异常！');
}
);
}
}
src/pages/contact/contactList/contactList.html
View file @ f348b923
......@@ -28,5 +28,7 @@
</div>
</div>
</ion-item>
</ion-list>
</ion-content>
\ No newline at end of file
src/pages/contact/contract-personinfo/contract-personinfo.html
View file @ f348b923
<ion-header>
<ion-navbar>
<ion-title>个人信息</ion-title>
<span (click)="editEmail()" float-right class="margin-right-10 color-999">完成</span>
</ion-navbar>
</ion-header>
<ion-content class="content">
<!--<ion-list class="list-item">-->
<!--<ion-item>-->
<!--<div class="info-item">-->
<!--<div>-->
<!--<div>-->
<!--<span class="info-span">{{contactPersonInfo.name}}</span>-->
<!--<ion-icon name="male" class="contact-sex male" *ngIf="contactPersonInfo.gender == '1' || contactPersonInfo.gender == null"></ion-icon>-->
<!--<ion-icon name="female" class="contact-sex female" *ngIf="contactPersonInfo.gender == 0"></ion-icon>-->
<!--</div>-->
<!--<span class="info-span">{{contactPersonInfo.orgName}}</span>-->
<!--</div>-->
<!--<div>-->
<!--<img src="./assets/imgs/woman.png" *ngIf="contactPersonInfo.gender == 0" class="contact-img">-->
<!--<img src="./assets/imgs/man.png" *ngIf="contactPersonInfo.gender == '1' || contactPersonInfo.gender == null " class="contact-img">-->
<!--</div>-->
<!--</div>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--<div class="content-gap"></div>-->
<ion-list>
<p class="person-tips">基础信息(如需修改，请联系人事处)</p>
......@@ -88,7 +69,7 @@
<div class="info-item">
<span class="info-span">邮箱</span>
<div class="info-item-content">
<span class="info">{{contactPersonInfo.email}}</span>
<input type="text" [(ngModel)]="email">
</div>
</div>
</ion-item>
......
src/pages/contact/contract-personinfo/contract-personinfo.ts
View file @ f348b923
......@@ -18,7 +18,8 @@ export class ContractPersoninfoPage {
userRelEntity = {
relUserId:'',
moduleName:'appcontact',
}
};
email;
constructor(
public navCtrl: NavController,
......@@ -75,4 +76,20 @@ export class ContractPersoninfoPage {
usualContactSet(){
this.navCtrl.push('MyBlockPage');
}
editEmail(){
const params = {
email:this.email
};
this.appService.ObserverHttpPut("/wisdomgroup//modules/telpBookPerson/email/",params,this.userRelEntity.relUserId)
.subscribe((res: Response) => {
let data = res.json();
console.log("data:"+data);
this.navCtrl.push("ContactListPage");
}, error => {
this.appService.alert('网络异常！');
}
);
}
}
src/pages/contact/select-block/select-block.ts
View file @ f348b923
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, ModalController } from 'ionic-angular';
import {ContactModalPage} from "../contact-modal/contact-modal";
/**
* Generated class for the SelectBlockPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
import {Response} from "@angular/http";
import { AppService } from "../../../service/appHttpService";
@IonicPage()
@Component({
......@@ -17,11 +12,21 @@ import {ContactModalPage} from "../contact-modal/contact-modal";
export class SelectBlockPage {
constructor(public navCtrl: NavController, public navParams: NavParams,
public modalCtrl: ModalController) {
public modalCtrl: ModalController, public appService: AppService) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad SelectBlockPage');
const data = {
pageSize:'10',
pageNumber:'1'
};
this.appService.ObserverHttpGet("/wisdomgroup/modules/telpBook", data)
.subscribe((res: Response) => {
}, error => {
this.appService.alert('网络异常！');
}
);
}
showPeoModal(){
......
src/pages/home/more-app/more-app.html
View file @ f348b923
......@@ -38,11 +38,11 @@
<label class="label2-2">问卷调查</label>
</div>
<div class="card" (click)="goToSurveyManage()">
<img src="./assets/imgs/home/icon-more.png" alt="">
<img src="./assets/imgs/home/icon-wjgl.png" alt="">
<label class="label2-2 more2-2">问卷管理</label>
</div>
<div class="card" (click)="wait()">
<img src="./assets/imgs/home/icon-more.png" alt="">
<img src="./assets/imgs/home/icon-zbhb.png" alt="">
<label class="label2-2 more2-2">值班换班</label>
</div>
</div>
......
src/pages/myReport/myReport.ts
View file @ f348b923
......@@ -4,11 +4,11 @@ import { IonicPage, NavController, NavParams, Slides } from 'ionic-angular';
import { Response } from '@angular/http';
import { AppService } from '../../service/appHttpService';
import { OutGoingReportEditPage } from '../outGoingReportEdit/outGoingReportEdit';
import { OutGoingReportEditPage } from '../report/outGoingReportEdit/outGoingReportEdit';
import { ActivityStatisticService } from '../../service/activityStatisticService';
import { OutGoingReportViewPage } from '../outGoingReportView/outGoingReportView';
import { OutGoingReportViewPage } from '../report/outGoingReportView/outGoingReportView';
import { Storage } from '@ionic/storage';
......
src/pages/outGoingReport/outGoingReport.html → src/pages/report/outGoingReport/outGoingReport.html
View file @ f348b923
<ion-header>
<ion-toolbar>
<div class="searchToolBar">
<button ion-button clear small navPop style="padding: 0;" (click)="goBack()">
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-navbar>
<ion-title text-center>外出报备</ion-title>
</div>
</ion-toolbar>
</ion-navbar>
</ion-header>
<ion-content scrollbar-y="true" direction="y">
......
src/pages/outGoingReport/outGoingReport.module.ts → src/pages/report/outGoingReport/outGoingReport.module.ts
View file @ f348b923
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { OutGoingReportPage } from '../outGoingReport/outGoingReport';
import { OutGoingReportPage } from './/outGoingReport';
@NgModule({
declarations: [
......
src/pages/outGoingReport/outGoingReport.ts → src/pages/report/outGoingReport/outGoingReport.ts
View file @ f348b923
......@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { Response } from '@angular/http';
import { Storage } from '@ionic/storage';
import { AppService } from '../../service/appHttpService';
import { AppService } from '../../../service/appHttpService';
import { OutGoingReportEditPage } from '../outGoingReportEdit/outGoingReportEdit';
@IonicPage()
......
src/pages/outGoingReportDetail/outGoingReportDetail.module.ts → src/pages/report/outGoingReportDetail/outGoingReportDetail.module.ts
View file @ f348b923
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { OutGoingReportDetailPage } from '../outGoingReportDetail/outGoingReportDetail';
import { OutGoingReportDetailPage } from './/outGoingReportDetail';
@NgModule({
declarations: [
......
src/pages/outGoingReportEdit/outGoingReportEdit.module.ts → src/pages/report/outGoingReportEdit/outGoingReportEdit.module.ts
View file @ f348b923
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { OutGoingReportEditPage } from '../outGoingReportEdit/outGoingReportEdit';
import { OutGoingReportEditPage } from './outGoingReportEdit';
@NgModule({
declarations: [
......
src/pages/outGoingReportView/outGoingReportView.module.ts → src/pages/report/outGoingReportView/outGoingReportView.module.ts
View file @ f348b923
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { OutGoingReportViewPage } from '../outGoingReportView/outGoingReportView';
import { OutGoingReportViewPage } from './outGoingReportView';
@NgModule({
declarations: [
......
src/pages/outGoingReportView/outGoingReportView.ts → src/pages/report/outGoingReportView/outGoingReportView.ts
View file @ f348b923
......@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams} from 'ionic-angular';
import { Response } from '@angular/http';
import { Storage } from '@ionic/storage';
import { AppService, AppGlobal } from '../../service/appHttpService';
import { AppService, AppGlobal } from '../../../service/appHttpService';
@IonicPage()
......
src/pages/reportDetail/reportDetail.ts → src/pages/report/reportDetail/reportDetail.ts
View file @ f348b923
......@@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams, AlertController, ToastController }
import { Http, Response} from '@angular/http';
import { AppService } from '../../service/appHttpService';
import { AppService } from '../../../service/appHttpService';
@IonicPage()
@Component({
......
src/pages/reportTrack/reportTrack.ts → src/pages/report/reportTrack/reportTrack.ts
View file @ f348b923
import { Component } from '@angular/core';
import { IonicPage, NavController } from 'ionic-angular';
import { Response } from '@angular/http';
import { AppService } from '../../service/appHttpService';
import { AppService } from '../../../service/appHttpService';
import { ReportDetailPage } from '../reportDetail/reportDetail';
@IonicPage()
......
src/pages/surveyManage/item/edit/edit.html
View file @ f348b923
......@@ -8,20 +8,46 @@
</ion-header>
<ion-content padding>
<ion-content class="bgc-e7e8ed">
<ion-list>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>调查问卷名称</ion-label>
<ion-input type="password" placeholder="请输入标题"></ion-input>
<ion-label class="padding-left-16">调查问卷名称</ion-label>
</ion-item>
<div class="question-list">
<ion-item *ngFor="let item of qList;let i = index" (click)="itemEdit(i)">
<div class="item-content">
<p>1.【判断】是否愿意修养</p>
<p><input type="radio">是</p>
<p><input type="radio">否</p>
</div>
<div class="item-opra" *ngIf="editIndex == i">
<div (click)="itemEdit(item)"><span>编辑</span></div>
<div (click)="itemUp(item)"><span>上移</span></div>
<div (click)="itemDown(item)"><span>下移</span></div>
<div (click)="itemDelete(item)"><span>删除</span></div>
</div>
</ion-item>
</div>
</ion-list>
</ion-content>
<ion-footer>
<div class="footter-opr">
<div (click)="add()"><span>题目</span></div>
<div (click)="set()"><span>设置</span></div>
<div (click)="look()"><span>预览</span></div>
<div (click)="save()"><span>保存</span></div>
<div (click)="add()">
<img src="../../../../assets/imgs/survey/add.png" alt="">
<span>题目</span>
</div>
<div (click)="set()">
<img src="../../../../assets/imgs/survey/set.png" alt="">
<span>设置</span>
</div>
<div (click)="look()">
<img src="../../../../assets/imgs/survey/look.png" alt="">
<span>预览</span>
</div>
<div (click)="save()">
<img src="../../../../assets/imgs/survey/save.png" alt="">
<span>保存</span>
</div>
</div>
</ion-footer>
\ No newline at end of file
src/pages/surveyManage/item/edit/edit.scss
View file @ f348b923
page-edit {
.list-ios .item-block .item-inner,
.list-ios > .item-block:first-child,
.list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
border: none;
padding: 0;
}
.label-ios{
margin: 0;
}
.question-list{
margin-top: 10px;
ion-item{
margin-bottom: 8px;
padding: 0;
.item-content{
padding-left: 16px;
padding-top: 11px;
padding-bottom: 11px;
p{
margin-bottom: 10px;
}
}
}
}
.item-opra,
.footter-opr{
display: flex;
flex-direction: row;
padding:10px 0;
align-items: center;
padding:11px 0;
background-color: #fff;
}
.footter-opr{
border-top: 1px solid #cccccc;
}
.item-opra > div,
.footter-opr > div{
width: 25%;
text-align: center;
}
.item-opra {
border-top: 1px solid #ddd;
height: 5rem;
span{
padding: 6px 16px;
border: 1px solid #ddd;
border-radius: 4px;
font-size: 1.3rem;
}
}
}
src/pages/surveyManage/item/edit/edit.ts
View file @ f348b923
......@@ -9,9 +9,16 @@ import {SelectTypePage} from "../select-type/select-type";
})
export class EditPage {
editIndex;
constructor(public navCtrl: NavController, public navParams: NavParams,
public modalCtrl: ModalController) {
}
qList = [
{name:'测试'},
{name:'测试'},
{name:'测试'},
{name:'测试'}
];
ionViewDidLoad() {
console.log('ionViewDidLoad EditPage');
......@@ -22,4 +29,24 @@ export class EditPage {
this.navCtrl.push('SelectTypePage')
}
//操作
itemEdit(index){
this.editIndex = index;
}
//查看
look(){
this.navCtrl.push('DetailPage');
}
//设置
set(){
this.navCtrl.push('SetPage');
}
//保存
save(){
}
}
src/pages/tabs/contact/contact.html
View file @ f348b923
......@@ -25,6 +25,13 @@
</span>
<span class="contact-title color-999">添加分组</span>
</div>
<div class="item item-border" *ngFor="let item of ownerList" (click)="usualContactOrgPersons(item)">
<ion-icon name="folder" class="contact-icon"></ion-icon>
<span class="contact-title">{{item?.usergroupName}}</span>
<ion-item-options>
<button danger (click)="deleteItem(item)">删除</button>
</ion-item-options>
</div>
<div class="common">
上海市委组织部组织架构
<span float-right class="margin-right-10" >A~Z字母排序<ion-icon class="margin-left-5 color-666" name="md-arrow-dropdown"></ion-icon></span>
......@@ -34,5 +41,6 @@
<span class="contact-title">{{organization?.name}}</span>
</div>
<!-- <img src="./assets/imgs/development.jpg" class="wait"> -->
</ion-content>
src/pages/tabs/contact/contact.ts
View file @ f348b923
......@@ -17,6 +17,7 @@ export class ContactPage {
//组织部门列表
organizations: Array<string> = [];
ownerList: Array<string> = [];
constructor(
public navCtrl: NavController,
......@@ -31,11 +32,12 @@ export class ContactPage {
ngOnInit():void{
//加载组织列表：initOrganizeList
this.initOrganizeList();
this.initOwnerList();
}
initOrganizeList():void{
//this.appService.ObserverHttpGet("/wisdomgroup/app/getAllOrganization",null)
//隐藏显示
this.appService.ObserverHttpGet("/wisdomgroup/sysmanagement/org/getAllOrganization",null)
this.appService.ObserverHttpGetData("/wisdomgroup/sysmanagement/org/getAllOrganization",{order:0})
.subscribe((res: Response) => {
let data = res.json();
console.log("data:"+data);
......@@ -55,6 +57,31 @@ export class ContactPage {
);
}
initOwnerList(){
const data = {
pageSize:'10',
pageNumber:'1'
};
this.appService.ObserverHttpGetData("/wisdomgroup/modules/telpBook",data)
.subscribe((res: Response) => {
let data = res.json();
this.ownerList = data.data.list;
console.log(this.ownerList);
// //移除父节点
// for (let index = 0; index < this.organizations.length; index++) {
// const element = this.organizations[index];
// if(element["organizationLevel"] == '1' ) {
// var flag = index;
// }
// }
// this.organizations.splice(flag,1);
}, error => {
this.appService.alert('网络异常！');
}
);
}
search(){
this.navCtrl.push("SearchPage");
}
......@@ -73,5 +100,8 @@ export class ContactPage {
this.navCtrl.push('AddBlockPage');
}
deleteItem(item){
}
}
src/pages/tabs/home/home.html
View file @ f348b923
......@@ -36,7 +36,7 @@
<img src="./assets/imgs/home/icon-zb.png" alt="">
<label class="label2-2">值班情况</label>
</div>
<div class="card" (click)="wait()">
<div class="card" (click)="goActivityTrack()">
<img src="./assets/imgs/home/icon-hdgz.png" alt="">
<label class="label2-2">活动跟踪</label>
</div>
......@@ -65,15 +65,10 @@
<img src="./assets/imgs/home/icon-mail.png" alt="">
</div>
<div class="card3" style="width: 75%;">
<div class="card3-item">
<span class="tips"></span>
<span class="color-996">生日祝福</span>
<span>今天是XXX生日，祝他生日快乐</span>
</div>
<div class="card3-item">
<div class="card3-item" *ngFor="let item of noticeList;">
<span class="tips"></span>
<span class="color-996">生日祝福</span>
<span>今天是XXX生日，祝他生日快乐</span>
<span class="color-996">{{item.title}}</span>
<span>{{item.title}}</span>
</div>
</div>
<div class="card3" style="width: 10%;color: #999999">
......
src/pages/tabs/home/home.ts
View file @ f348b923
......@@ -8,11 +8,11 @@ import { AppService, AppGlobal } from '../../../service/appHttpService';
import { Calendar } from '@ionic-native/calendar';
import { ActivityApplyPage } from '../../activity/activityApply/activityApply'
import { ActivityConfirmPage } from '../../activity/activityConfirm/activityConfirm';
import { OutGoingReportPage } from '../../outGoingReport/outGoingReport';
import { OutGoingReportPage } from '../../report/outGoingReport/outGoingReport';
import { OperationListPage } from '../../operation-list/operation-list';
import { AnnouncementPage } from '../../announcement/announcement';
import { Storage } from '@ionic/storage';
import { OutGoingReportEditPage } from '../../outGoingReportEdit/outGoingReportEdit';
import { OutGoingReportEditPage } from '../../report/outGoingReportEdit/outGoingReportEdit';
import { AnnouncementViewPage } from '../../announcementView/announcementView';
import {MoreAppPage} from "../../home/more-app/more-app";
......@@ -40,7 +40,8 @@ export class HomePage {
//是否显示正在开发中
isWait: boolean = false;
slidersItems: object[] = [];
slidersItems = [];
noticeList = [];
picture: string = AppGlobal.picture;
......@@ -107,14 +108,21 @@ export class HomePage {
this.navCtrl.push("AnnouncementPage");
}
// ngOnInit(): void {
ngOnInit(): void {
// this.appService.ObserverHttpGet("/wisdomgroup/modules/common/file/getBanner", {}).subscribe((res: Response) => {
// this.slidersItems = res.json();
// console.log(res.json());
// }, error => {
// this.appService.alert('系统错误！');
// })
// }
this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/getAllNotice", {}).subscribe((res: Response) => {
this.noticeList = res.json().slice(0,2);
console.log(this.noticeList);
}, error => {
this.appService.alert('系统错误！');
})
}
//页面进入时启动自动播放
// ionViewDidEnter() {
// this.slides.startAutoplay();
......@@ -177,6 +185,11 @@ export class HomePage {
this.navCtrl.push("AnnouncementPage");
}
//活动跟踪
goActivityTrack(){
this.navCtrl.push("ActivityTrackPage");
}
wait() {
this.isWait = true;
}
......
src/pages/tabs/notice/notice.ts
View file @ f348b923
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {Response} from "@angular/http";
import {AppService} from "../../../service/appHttpService";
/**
* Generated class for the NoticePage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@IonicPage()
@Component({
......@@ -15,11 +11,19 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
})
export class NoticePage {
constructor(public navCtrl: NavController, public navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService:AppService) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad NoticePage');
this.appService.ObserverHttpPost("/wisdomgroup/modules/message/findAllActivityForAppWithXQ",null)
.subscribe((res: Response) => {
let data = res.json();
}, error => {
this.appService.alert('网络异常！');
}
);
}
}
src/pages/tabs/workbench/workbench.ts
View file @ f348b923
......@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
import { NavController} from 'ionic-angular';
import { Response } from '@angular/http';
import { AppService } from '../../../service/appHttpService';
import { ActivityTrackPage } from '../../activityTrack/activityTrack';
import { ReportTrackPage } from '../../reportTrack/reportTrack';
import { ActivityTrackPage } from '../../activity-track/activityTrack/activityTrack';
import { ReportTrackPage } from '../../report/reportTrack/reportTrack';
import { ActivityStatisticService } from '../../../service/activityStatisticService';
......
src/service/appHttpService.ts
View file @ f348b923
......@@ -73,6 +73,31 @@ export class AppService {
return this.http.get(url+this.encode(params,"get")) //本地
}
//get请求
ObserverHttpGetData(url,params): Observable<any>{
// return this.http.get(AppGlobal.domain+url+this.encode(params,"get")) //app
return this.http.get(url ,params) //本地
}
//delete
ObserverHttpDetelete(url,params): Observable<any>{
// return this.http.get(AppGlobal.domain+url+this.encode(params,"get")) //app
return this.http.delete(url+this.encode(params,"get")) //本地
}
ObserverHttpPostData(url, params) {
// return this.http.post(AppGlobal.domain+url,params,{ //app
return this.http.post(url,params,{ //本地
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
//post请求
ObserverHttpPost(url, params) {
// return this.http.post(AppGlobal.domain+url,null,{ //app
......@@ -86,6 +111,18 @@ export class AppService {
})
}
//put请求
ObserverHttpPut(url, params,data) {
// return this.http.post(AppGlobal.domain+url,null,{ //app
return this.http.put(url + data,params,{ //本地
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
private handleError(error: Response | any) {
let msg = '';
if (error.status == 400) {
......
src/theme/icon.scss
View file @ f348b923
......@@ -59,6 +59,18 @@
.padding-#{$i}{
padding: #{$i}px;
}
.padding-right-#{$i}{
padding-right: #{$i}px;
}
.padding-left-#{$i}{
padding-left: #{$i}px;
}
.padding-top-#{$i}{
padding-top: #{$i}px;
}
.padding-bottom-#{$i}{
padding-bttom: #{$i}px;
}
}
@for $i from 0 through 51{
......
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