Skip to content

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

问卷调查

parent 39a326a9
Hide whitespace changes
Inline Side-by-side
Showing with 341 additions and 123 deletions
src/app/app.module.ts
View file @ cdf11a3b
......@@ -20,11 +20,15 @@ import { File } from '@ionic-native/file';
import { Keyboard } from '@ionic-native/keyboard';
import { Badge } from "@ionic-native/badge";
import {ContactModalPage} from "../pages/contact/contact-modal/contact-modal";
import {SelectTypePage} from "../pages/surveyManage/modal/select-type/select-type";
import { PersonPage } from "../pages/surveyManage/modal/person/person";
@NgModule({
declarations: [
MyApp,
ContactModalPage
ContactModalPage,
SelectTypePage,
PersonPage
],
imports: [
BrowserModule,
......@@ -46,7 +50,9 @@ import {ContactModalPage} from "../pages/contact/contact-modal/contact-modal";
bootstrap: [IonicApp],
entryComponents: [
MyApp,
ContactModalPage
ContactModalPage,
SelectTypePage,
PersonPage
],
providers: [
StatusBar,
......
src/pages/activity/activityDetail/activityDetail.html
View file @ cdf11a3b
......@@ -11,7 +11,7 @@
</div>
<div class="item1-content">
<div class="margin-5-0">
<label class="item1-title">上海市人民医院体检</label>
<label class="item1-title">{{activity.activityName}}</label>
<!-- <label class="item1-title" *ngIf="activity.activityFbObject==1">{{activity.activityName}}（全体人员）</label>
<label class="item1-title" *ngIf="activity.activityFbObject==2">{{activity.activityName}}（用户组）</label>
<label class="item1-title" *ngIf="activity.activityFbObject==3">{{activity.activityName}}（处事部门）</label> -->
......@@ -23,7 +23,7 @@
</div>
<div class="item1-introduction">
<!-- {{activity.activityIntro}} -->
{{introduce}}
{{activity.activityIntro}}
<button class="btn-introduce" (click)="show()">具体介绍</button>
</div>
</div>
......@@ -34,23 +34,25 @@
<ion-item class="list-title">
<label class="item-label">
<span class="item-title">
批次信息(最多可报名X个批次信息)
批次信息(最多可报名
<span *ngIf="activity.applyCount == 0">{{ batchList.length}}</span>
<span *ngIf="activity.applyCount != 0">{{activity.applyCount}}</span>
个批次信息)
</span>
</label>
</ion-item>
<ion-item class="item2-content">
<div *ngFor="let batch of batches" class="item2-box" (click)="goBatchDetail(batch)">
<!--<span class="time">{{batch.time}}</span>-->
<!--<span class="quantity">剩余{{batch.quantity}}名</span>-->
<div *ngFor="let batch of batchList" class="item2-box" (click)="goBatchDetail(batch)">
<p>
<span class="color-666">批次名称:</span>
<span>批次名称</span>
<span>{{batch.batchName}}</span>
<span class="activity-btn2" float-right>已报名</span>
<span *ngIf="" class="activity-btn2" float-right>已满员</span>
</p>
<p>
<span class="color-666">截止时间:</span>
<span>2018-11-12</span>
<span class="color-24bafc" float-right>{{batch.quantity}}</span>
<span>{{batch.batchEndDate}}</span>
<span class="color-24bafc" float-right>{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span>
</p>
</div>
</ion-item>
......
src/pages/activity/activityDetail/activityDetail.module.ts
View file @ cdf11a3b
......@@ -9,6 +9,8 @@ import { ActivityDetailPage } from './activityDetail';
imports: [
IonicPageModule.forChild(ActivityDetailPage),
],
providers:[
]
})
export class ActivityDetailModule {
......
src/pages/activity/activityDetail/activityDetail.ts
View file @ cdf11a3b
......@@ -15,7 +15,10 @@ import {BatchDetailPage} from "../batch-detail/batch-detail";
export class ActivityDetailPage {
batches: object[];
activity: object;
activity = {
batchList:[]
};
batchList = [];
//页面报名保存展示
isCover: boolean = false;
//活动详情显示
......@@ -30,61 +33,29 @@ export class ActivityDetailPage {
public appService: AppService, public toast: ToastController) {
// console.log(this.navParams.get("activityId"));
this.subIntroduce("2018年市委组织部体检活动将在3月5号在上海市人民医院进行，共分八批，欢迎大家根据个人安排进行报名工作。2018年市委组织部体检活动将在3月5号在上海市人民医院进行，共分八批，欢迎大家根据个人安排进行报名工作。");
this.activity = {
id: 1,
time: "2018/4/10",
location: "上海市人民医院（虹桥路xxxx号）",
musterTime: "自行前往",
deadlineTime: "所有处级以下人员"
}
this.batches = [{
id: 1,
time: "03/20",
quantity: 20
}, {
id: 2,
time: "03/27",
quantity: 20
}, {
id: 3,
time: "04/03",
quantity: 20
}, {
id: 4,
time: "04/10",
quantity: 20
}, {
id: 5,
time: "04/17",
quantity: 20
}, {
id: 6,
time: "04/24",
quantity: 20
}, {
id: 7,
time: "05/01",
quantity: 20
}, {
id: 8,
time: "05/08",
quantity: 20
}];
let orderId = this.navParams.get('orderid');
this.findMyOrderByOrderId(orderId);
let id = this.navParams.get('id');
this.findMyOrderByOrderId(id);
}
findMyOrderByOrderId(orderid){
let order = this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findMyOrderByOrderId",{"orderid":orderid})
.subscribe((res: Response) => {
let data = res.json();
console.log(data);
findMyOrderByOrderId(id){
this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id":id})
.subscribe((res :Response) => {
this.activity = res.json();
console.log(this.activity);
this.batchList = this.activity.batchList;
}, error => {
this.appService.alert('网络异常！');
}
);
// let order = this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findMyOrderByOrderId",{"orderid":orderid})
// .subscribe((res: Response) => {
// let data = res.json();
// console.log(data);
// }, error => {
// this.appService.alert('网络异常！');
// }
// );
}
......
src/pages/activity/activityList/activityList.html
View file @ cdf11a3b
......@@ -24,11 +24,11 @@
<span class="item-title">{{item.activityName}}</span>
</div>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 && item.orderList.length==0 ">可报名</button>
<button ion-button round class="btn btn2" *ngIf="item.activityState==2 && item.orderList.length>0 ">已报名</button>
<button ion-button round class="btn btn3" *ngIf="item.activityState==2 && item.orderList.length>0 ">不可报名</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">可报名</button>
<button ion-button round class="btn btn2" *ngIf="item.activityState==1 ">已报名</button>
<button ion-button round class="btn btn3" *ngIf="item.activityState==3 ">不可报名</button>
</div>
<div class="content-box" (click)="goApplyDetails(item)">
<div class="content-box" (click)="goDetail(item)">
<div class="content-item-box">
<label class="left-title">活动类型：</label>
<div class="data">{{activityType[item.activityType]}}</div>
......@@ -42,7 +42,7 @@
</div>
<div class="content-button">
<span>最新批次:</span>
<span>最新批次名称</span>
<span>{{item.recent_batch.batchName}}</span>
</div>
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length>0 " (click)="goDetail(item);$event.stopPropagation();">查看</button>-->
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length==0 " (click)="goApply(item);$event.stopPropagation();">报名</button>-->
......
src/pages/activity/activityList/activityList.ts
View file @ cdf11a3b
......@@ -69,7 +69,6 @@ export class ActivityListPage {
getActivityList(){
//this.appService.ObserverHttpPost("/wisdomgroup/modules/activity/findAllActivityForApp",null)
this.appService.ObserverHttpPost("/wisdomgroup/modules/activity/findAllActivityForAppWithUsergroup",null)
......@@ -85,11 +84,9 @@ export class ActivityListPage {
//查看详情
goDetail(item){
let orderid = item.orderList.id;
// this.findMyOrderByOrderId(orderid,result =>{
// let order = result;
this.navCtrl.push("ActivityDetailPage",{orderid:orderid});
// });
console.log(item);
let id = item.id;
this.navCtrl.push("ActivityDetailPage",{id:id});
}
......
src/pages/edit/edit.html deleted 100644 → 0
View file @ 39a326a9
<!--
Generated template for the EditPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>
<ion-navbar>
<ion-title>edit</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
</ion-content>
src/pages/surveyManage/item/create/create.html
View file @ cdf11a3b
......@@ -7,7 +7,7 @@
<ion-header>
<ion-navbar>
<ion-title>create</ion-title>
<ion-title>单选题</ion-title>
</ion-navbar>
</ion-header>
......
src/pages/surveyManage/item/desicr/desicr.html
View file @ cdf11a3b
......@@ -7,12 +7,23 @@
<ion-header>
<ion-navbar>
<ion-title>desicr</ion-title>
<ion-title>编辑问卷</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<ion-list>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>问卷标题</ion-label>
<ion-input type="password" placeholder="请输入标题"></ion-input>
</ion-item>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>问卷说明</ion-label>
<ion-textarea></ion-textarea>
</ion-item>
</ion-list>
<button class="submit-btn submit" (click)="submitOrder()">保存</button>
</ion-content>
src/pages/surveyManage/item/desicr/desicr.scss
View file @ cdf11a3b
page-desicr {
.submit{
background-color: #24bafc;
}
}
src/pages/surveyManage/item/desicr/desicr.ts
View file @ cdf11a3b
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {EditPage} from "../edit/edit";
/**
* Generated class for the DesicrPage page.
......@@ -22,4 +23,8 @@ export class DesicrPage {
console.log('ionViewDidLoad DesicrPage');
}
submitOrder(){
this.navCtrl.push('EditPage');
}
}
src/pages/surveyManage/item/edit/edit.html 0 → 100644
View file @ cdf11a3b
<ion-header>
<ion-navbar>
<ion-title>编辑问卷</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<ion-list>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>调查问卷名称</ion-label>
<ion-input type="password" placeholder="请输入标题"></ion-input>
</ion-item>
</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>
</ion-footer>
\ No newline at end of file
src/pages/surveyManage/item/edit/edit.scss 0 → 100644
View file @ cdf11a3b
page-edit {
.footter-opr{
display: flex;
flex-direction: row;
padding:10px 0;
}
.footter-opr > div{
width: 25%;
text-align: center;
}
}
src/pages/edit/edit.ts → src/pages/surveyManage/item/edit/edit.ts
View file @ cdf11a3b
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
/**
* Generated class for the EditPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
import { IonicPage, NavController, NavParams,ModalController } from 'ionic-angular';
import {SelectTypePage} from "../../modal/select-type/select-type";
@IonicPage()
@Component({
......@@ -15,11 +9,18 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
})
export class EditPage {
constructor(public navCtrl: NavController, public navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams,
public modalCtrl: ModalController) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad EditPage');
}
//添加题目
add(){
let typeModal = this.modalCtrl.create(SelectTypePage);
typeModal.present();
}
}
src/pages/surveyManage/list/list.html
View file @ cdf11a3b
......@@ -2,11 +2,60 @@
<ion-navbar>
<ion-title>问卷管理</ion-title>
<span (click)="create()" float-right class="margin-right-10 color-999">创建</span>
</ion-navbar>
<div class="pageMenuSlides">
<div class="swiper-container">
<div class="swiper-wrapper">
<!-- {{i==0?'bottomLine':''}}是初始化的时候默认选择第一个菜单 -->
<div class="swiper-slide" *ngFor="let item of menuList;let i=index;" tappable (click)="selectPageMenu(i)">
<span class=" {{swiperIndex == i? 'swiper-title':''}} ">{{item.name}}</span>
<span></span>
</div>
</div>
</div>
</div>
</ion-header>
<ion-content padding>
<ion-slides #contentSlides class="height-190" (ionSlideDidChange)="slideChanged()" >
<ion-slide *ngFor="let item of menuList">
<ion-content direction="y" scrollbar-y="true">
<ion-list>
<ion-item>
<div class="item" (click)="showOpra(item)">
<div class="item-header">
<div class="item-header-style">
<span class="item-title">{{item.activityName}}</span>
</div>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">未发布</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">已发布</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">已过期</button>
</div>
<div class="content-button">
<span>参与人员:</span>
<span>最新批次名称</span>
</div>
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length>0 " (click)="goDetail(item);$event.stopPropagation();">查看</button>-->
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length==0 " (click)="goApply(item);$event.stopPropagation();">报名</button>-->
</div>
</ion-item>
</ion-list>
</ion-content>
</ion-slide>
</ion-slides>
</ion-content>
<ion-footer *ngIf="showOp">
<div class="footter-opr">
<div (click)="look()"><span>查看</span></div>
<div (click)="result()"><span>结果</span></div>
<div (click)="copy()"><span>复制</span></div>
<div (click)="delete()"><span>删除</span></div>
</div>
<ion-toolbar>
<ion-title>取消</ion-title>
</ion-toolbar>
</ion-footer>
src/pages/surveyManage/list/list.scss
View file @ cdf11a3b
page-list {
.pageMenuSlides{
//设置菜单栏底部的颜色
border-bottom:1px solid rgb(255, 255, 255);
.swiper-container{
width: 100%;
height: 40px;
border-bottom: 1px solid #dddddd;
}
.swiper-slide{
//设置菜单栏的颜色
background: rgb(255, 255, 255);
//设置字体颜色
color: #0c0c0c;
font-size: 16px;
}
.bottomLine{
//设置当前菜单底部边框
border-bottom: 2px solid #7aa7fa;
color:#7aa7fa
}
.swiper-title{
position: relative;
color: #24bafc;
}
.swiper-title::after{
content: '';
position: absolute;
width: 100%;
height: 2px;
background-color: #24bafc;
bottom: -8px;
left: 0px;
}
}
.slide-zoom{
height: 100%;
}
.footter-opr{
display: flex;
flex-direction: row;
flex-wrap: wrap;
height: 100px;
}
.footter-opr div{
width: 33%;
text-align: center;
}
.footter-opr div span{
border-radius: 5px;
border: 1px solid #aaa;
padding: 10px 25px;
}
}
src/pages/surveyManage/list/list.ts
View file @ cdf11a3b
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {Component, ViewChild} from '@angular/core';
import {IonicPage, NavController, NavParams, Slides} from 'ionic-angular';
import {DetailPage} from "../item/detail/detail";
import {ResultPage} from "../result/result";
import {CreatePage} from "../item/create/create";
import {DesicrPage} from "../item/desicr/desicr";
declare var Swiper;
@IonicPage()
@Component({
selector: 'page-list',
templateUrl: 'list.html',
})
export class ListPage {
@ViewChild('contentSlides') contentSlides :Slides;
menuList = [
{name:'草稿箱',id:'1',item:''},
{name:'已发布',id:'2',item:''},
{name:'已过期',id:'3',item:''},
];
showOp = false;
swiperIndex;
swiper;
constructor(public navCtrl: NavController, public navParams: NavParams) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad ListPage');
this.initSwiper();
this.swiperIndex = 0;
}
initSwiper(){
this.swiper = new Swiper('.pageMenuSlides .swiper-container', {
//设置slider容器能够同时显示的slides数量(
slidesPreView: 3,
//slide之间的距离（单位px）
spaceBetween: 0,
//断点设定：根据屏幕宽度设置某参数为不同的值
breakpoints: {
1024: {
slidesPerView: 3,
spaceBetween: 0
},
768: {
slidesPerView: 3,
spaceBetween: 0
},
640: {
slidesPerView: 3,
spaceBetween: 0
},
320: {
slidesPerView: 3,
spaceBetween: 0
}
}
});
}
selectPageMenu(index) {
this.swiperIndex = index;
//切换页面
this.contentSlides.slideTo(index);
}
slideChanged() {
//getActiveIndex()获得当前页面的index
let index = this.contentSlides.getActiveIndex();
//s切换菜单
this.swiper.slideTo(index, 300);
}
showOpra(item){
this.showOp = true;
}
//创建
create(){
this.navCtrl.push('DesicrPage');
}
//查看
look(){
this.navCtrl.push('DetailPage');
}
//结果
result(){
this.navCtrl.push('ResultPage');
}
//复制
copy(){
}
//删除
delete(){
}
}
src/pages/surveyManage/modal/person/person.html
View file @ cdf11a3b
......@@ -3,8 +3,13 @@
<ion-navbar>
<ion-title>选择用户组</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>
</button>
</ion-buttons>
</ion-navbar>
</ion-header>
......
src/pages/surveyManage/modal/person/person.ts
View file @ cdf11a3b
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {IonicPage, NavController, NavParams, ViewController} from 'ionic-angular';
/**
* Generated class for the PersonPage page.
......@@ -14,11 +14,17 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
})
export class PersonPage {
constructor(public navCtrl: NavController, public navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams,
public viewCtrl: ViewController) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad PersonPage');
}
dismiss() {
let data = { 'foo': 'bar' };
this.viewCtrl.dismiss(data);
}
}
src/pages/surveyManage/modal/select-type/select-type.html
View file @ cdf11a3b
<!--
Generated template for the SelectTypePage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>
<ion-navbar>
<ion-title>选择题型</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>
</button>
</ion-buttons>
</ion-navbar>
</ion-header>
......
src/pages/surveyManage/modal/select-type/select-type.ts
View file @ cdf11a3b
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { IonicPage, NavController, NavParams, ViewController } from 'ionic-angular';
@Component({
......@@ -8,11 +8,17 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
})
export class SelectTypePage {
constructor(public navCtrl: NavController, public navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams,
public viewCtrl: ViewController) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad SelectTypePage');
}
dismiss() {
let data = { 'foo': 'bar' };
this.viewCtrl.dismiss(data);
}
}
src/theme/icon.scss
View file @ cdf11a3b
......@@ -40,6 +40,9 @@
.color-999{
color: #999;
}
.color-red{
color: red;
}
.color-24bafc{
color: #24bafc;
}
......
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