问卷调查

src/pages/activity/batch-detail/batch-detail.html

@@ -41,6 +41,7 @@
             <div class="content-item">
               <p> <span>报名截止：</span><span>1</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>

src/pages/edit/edit.html

+<!--
+  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/edit/edit.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { EditPage } from './edit';
+
+@NgModule({
+  declarations: [
+    EditPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(EditPage),
+  ],
+})
+export class EditPageModule {}

src/pages/edit/edit.scss

+page-edit {
+
+}

src/pages/edit/edit.ts

+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.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-edit',
+  templateUrl: 'edit.html',
+})
+export class EditPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad EditPage');
+  }
+
+}

src/pages/home/more-app/more-app.html

+<ion-header>
+  <ion-navbar>
+    <ion-title>更多应用</ion-title>
+  </ion-navbar>
+</ion-header>
+
+<ion-content>
+  <div class="item2-2">
+    <div class="card" (click)="goActivity()">
+      <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">
+    </div>
+    <div class="card" (click)="goAnnouncement()">
+      <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">
+    </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">
+    </div>
+    <div class="card"  (click)="wait()">
+      <img src="./assets/imgs/home/icon-zb.png" alt="">
+      <label class="label2-2">值班情况</label>
+    </div>
+    <div class="card"  (click)="wait()">
+      <img src="./assets/imgs/home/icon-hdgz.png" alt="">
+      <label class="label2-2">活动跟踪</label>
+    </div>
+    <div class="card"  (click)="wait()">
+      <img src="./assets/imgs/home/icon-bbgz.png" alt="">
+      <label class="label2-2">报备跟踪</label>
+    </div>
+    <div class="card"  (click)="wait()">
+      <img src="./assets/imgs/home/icon-wjtc.png" alt="">
+      <label class="label2-2">问卷调查</label>
+    </div>
+    <div class="card" (click)="goToSurveyManage()">
+      <img src="./assets/imgs/home/icon-more.png" alt="">
+      <label class="label2-2 more2-2">问卷管理</label>
+    </div>
+    <div class="card" (click)="wait()">
+      <img src="./assets/imgs/home/icon-more.png" alt="">
+      <label class="label2-2 more2-2">值班换班</label>
+    </div>
+  </div>
+</ion-content>

src/pages/home/more-app/more-app.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { MoreAppPage } from './more-app';
+
+@NgModule({
+  declarations: [
+    MoreAppPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(MoreAppPage),
+  ],
+})
+export class MoreAppPageModule {}

src/pages/home/more-app/more-app.scss

+page-more-app {
+  .item2-2,.item3-2,.item4-2,.item5-2{
+    background-color: #ffffff;
+    //box-shadow:0px 5px 5px #b5cef7;
+    padding-bottom: 8px;
+  }
+
+  .item2-2,.item3-2{
+    display: flex;
+    flex-direction: row;
+    flex-wrap:wrap;
+    // align-items: center;
+    align-content: space-between;
+    justify-content: left;
+    box-sizing: border-box;
+  }
+  .card3-item{
+    margin: 3px 0;
+  }
+  .card{
+    height: 100%;
+    width: 20%;
+    display: inline-flex;
+    flex-direction: column;
+    // flex-direction: center;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    margin:2.5%;
+    position: relative;
+  }
+  .card img:first-child{
+    width: 50%;
+  }
+}

src/pages/home/more-app/more-app.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {ListPage} from "../../surveyManage/list/list";
+
+
+
+@IonicPage()
+@Component({
+  selector: 'page-more-app',
+  templateUrl: 'more-app.html',
+})
+export class MoreAppPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad MoreAppPage');
+  }
+
+    goToSurveyManage(){
+      this.navCtrl.push('ListPage');
+    }
+}

src/pages/surveyManage/item/create/create.html

+<!--
+  Generated template for the CreatePage page.
+
+  See http://ionicframework.com/docs/components/#navigation for more info on
+  Ionic pages and navigation.
+-->
+<ion-header>
+
+  <ion-navbar>
+    <ion-title>create</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/item/create/create.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { CreatePage } from './create';
+
+@NgModule({
+  declarations: [
+    CreatePage,
+  ],
+  imports: [
+    IonicPageModule.forChild(CreatePage),
+  ],
+})
+export class CreatePageModule {}

src/pages/surveyManage/item/create/create.scss

+page-create {
+
+}

src/pages/surveyManage/item/create/create.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the CreatePage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-create',
+  templateUrl: 'create.html',
+})
+export class CreatePage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad CreatePage');
+  }
+
+}

src/pages/surveyManage/item/desicr/desicr.html

+<!--
+  Generated template for the DesicrPage page.
+
+  See http://ionicframework.com/docs/components/#navigation for more info on
+  Ionic pages and navigation.
+-->
+<ion-header>
+
+  <ion-navbar>
+    <ion-title>desicr</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/item/desicr/desicr.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { DesicrPage } from './desicr';
+
+@NgModule({
+  declarations: [
+    DesicrPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(DesicrPage),
+  ],
+})
+export class DesicrPageModule {}

src/pages/surveyManage/item/desicr/desicr.scss

+page-desicr {
+
+}

src/pages/surveyManage/item/desicr/desicr.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the DesicrPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-desicr',
+  templateUrl: 'desicr.html',
+})
+export class DesicrPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad DesicrPage');
+  }
+
+}

src/pages/surveyManage/item/detail/detail.html

+<ion-header>
+
+  <ion-navbar>
+    <ion-title>问卷预览</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/item/detail/detail.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { DetailPage } from './detail';
+
+@NgModule({
+  declarations: [
+    DetailPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(DetailPage),
+  ],
+})
+export class DetailPageModule {}

src/pages/surveyManage/item/detail/detail.scss

+page-detail {
+
+}

src/pages/surveyManage/item/detail/detail.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the DetailPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-detail',
+  templateUrl: 'detail.html',
+})
+export class DetailPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad DetailPage');
+  }
+
+}

src/pages/surveyManage/item/set/set.html

+<!--
+  Generated template for the SetPage 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-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/item/set/set.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { SetPage } from './set';
+
+@NgModule({
+  declarations: [
+    SetPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(SetPage),
+  ],
+})
+export class SetPageModule {}

src/pages/surveyManage/item/set/set.scss

+page-set {
+
+}

src/pages/surveyManage/item/set/set.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the SetPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-set',
+  templateUrl: 'set.html',
+})
+export class SetPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad SetPage');
+  }
+
+}

src/pages/surveyManage/list/list.html

+<ion-header>
+
+  <ion-navbar>
+    <ion-title>问卷管理</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/list/list.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { ListPage } from './list';
+
+@NgModule({
+  declarations: [
+    ListPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(ListPage),
+  ],
+})
+export class ListPageModule {}

src/pages/surveyManage/list/list.scss

+page-list {
+
+}

src/pages/surveyManage/list/list.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+
+
+@IonicPage()
+@Component({
+  selector: 'page-list',
+  templateUrl: 'list.html',
+})
+export class ListPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad ListPage');
+  }
+
+}

src/pages/surveyManage/modal/person/person.html

+
+<ion-header>
+
+  <ion-navbar>
+    <ion-title>选择用户组</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/modal/person/person.scss

+page-person {
+
+}

src/pages/surveyManage/modal/person/person.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the PersonPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@Component({
+  selector: 'page-person',
+  templateUrl: 'person.html',
+})
+export class PersonPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad PersonPage');
+  }
+
+}

src/pages/surveyManage/modal/select-type/select-type.html

+<!--
+  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-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/modal/select-type/select-type.scss

+page-select-type {
+
+}

src/pages/surveyManage/modal/select-type/select-type.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+
+@Component({
+  selector: 'page-select-type',
+  templateUrl: 'select-type.html',
+})
+export class SelectTypePage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad SelectTypePage');
+  }
+
+}

src/pages/surveyManage/result/result.html

+<!--
+  Generated template for the ResultPage 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-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/surveyManage/result/result.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { ResultPage } from './result';
+
+@NgModule({
+  declarations: [
+    ResultPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(ResultPage),
+  ],
+})
+export class ResultPageModule {}

src/pages/surveyManage/result/result.scss

+page-result {
+
+}

src/pages/surveyManage/result/result.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the ResultPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-result',
+  templateUrl: 'result.html',
+})
+export class ResultPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad ResultPage');
+  }
+
+}

src/pages/tabs/home/home.html

@@ -48,7 +48,7 @@
         <img src="./assets/imgs/home/icon-wjtc.png" alt="">
         <label class="label2-2">问卷调查</label>
       </div>
-      <div class="card" (click)="wait()">
+      <div class="card" (click)="gotoMore()">
         <img src="./assets/imgs/home/icon-more.png" alt="">
         <label class="label2-2 more2-2">更多应用</label>
       </div>

src/pages/tabs/home/home.ts

@@ -14,6 +14,7 @@ import { AnnouncementPage } from '../../announcement/announcement';
 import { Storage } from '@ionic/storage';
 import { OutGoingReportEditPage } from '../../outGoingReportEdit/outGoingReportEdit';
 import { AnnouncementViewPage } from '../../announcementView/announcementView';
+import {MoreAppPage} from "../../home/more-app/more-app";
 
 @IonicPage()
 @Component({
@@ -400,6 +401,11 @@ export class HomePage {
     });
   }
 
+  //更多应用
+    gotoMore(){
+      this.navCtrl.push('MoreAppPage')
+    }
+
   //尚未报备跳转
   goOutGoingReportAboutNot() {
     this.navCtrl.push("OutGoingReportPage", {