push

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

@@ -33,7 +33,7 @@
       <img src="./assets/imgs/home/icon-bbgz.png" alt="">
       <label class="label2-2">报备跟踪</label>
     </div>
-    <div class="card"  (click)="wait()">
+    <div class="card" >
       <img src="./assets/imgs/home/icon-wjtc.png" alt="">
       <label class="label2-2">问卷调查</label>
     </div>

src/pages/manageDuty/duty-change-detail/duty-change-detail.html

@@ -7,18 +7,21 @@
 
 </ion-header>
 <ion-content class="bgc-e7e8ed">
-  <p class="padding-10-20 bgc-fff">已忽略</p>
+  <!--<p class="padding-10-20 bgc-fff">已忽略</p>-->
   <!--<p>已安排替班</p>-->
   <!--<p>已安排换班</p>-->
-  <div class="detail-item">
-    <p class="detail-title1">申请信息</p>
-    <p>申请人</p>
-    <p>值班日期</p>
-    <p>换班原因</p>
-  </div>
-  <div class="detail-item">
-    <p class="detail-title2">换班信息</p>
-    <p>换班对象</p>
-    <p>值班日期</p>
-  </div>
+  <ng-container *ngFor="let item of httpDetail;">
+    <div class="detail-item">
+      <p class="detail-title1">申请信息</p>
+      <p>申请人： {{item?.oldPersonName}}</p>
+      <p>值班日期：{{item?.oldDate | date:'yyyy-MM-dd'}}</p>
+      <!--<p>换班原因</p>-->
+    </div>
+    <div class="detail-item">
+      <p class="detail-title2">换班信息</p>
+      <p>换班对象：{{item?.newPersonName}}</p>
+      <p>值班日期：{{item?.newDate  | date:'yyyy-MM-dd'}}</p>
+    </div>
+  </ng-container>
+
 </ion-content>

src/pages/manageDuty/duty-change-detail/duty-change-detail.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {AppService} from "../../../service/appHttpService";
 
 @IonicPage()
 @Component({
@@ -9,12 +10,21 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 export class DutyChangeDetailPage {
 
   detail;
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  httpDetail;
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+              public appService: AppService) {
   }
 
   ionViewDidLoad() {
     this.detail = this.navParams.get('item');
-    console.log(this.detail);
+    this.getDetail();
+  }
+
+  getDetail(){
+    this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/getDataByApplyId',{applyId:this.detail.id})
+        .subscribe((res)=>{
+          this.httpDetail = res.json();
+        });
   }
 
 }

src/pages/operation-list/operation-list.html

@@ -7,7 +7,7 @@
 
 <ion-content class="content" direction="y" scrollbar-y="true">
     <ion-list>
-        <ion-item *ngFor="let operation of operations">
+        <ion-item class="margin-bottom-5" *ngFor="let operation of operations">
 
             <div class="content-box">
                 <div class="content-item-box">
@@ -34,7 +34,7 @@
         </ion-item>
 
 
-        <ion-item *ngFor="let operation of pageOperations">
+        <ion-item class="margin-bottom-5" *ngFor="let operation of pageOperations">
 
             <div class="content-box">
                 <div class="content-item-box">

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

@@ -42,7 +42,7 @@ export class DesicrPage {
                     toast.present();
                     setTimeout((res) => {
                         this.navCtrl.pop();
-                    }, 2000);
+                    }, 1000);
                 }
             )
     }
@@ -50,10 +50,9 @@ export class DesicrPage {
     selectPerson(){
         let modal = this.modalCtrl.create(PersonPage);
         modal.onDidDismiss(data=>{
-            console.log(data);
             this.desrc.usergroup = data.id;
             this.groupName = data.groupName;
-        })
+        });
         modal.present();
     }
 

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

@@ -5,14 +5,12 @@
     <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>
+        <span ion-text color="primary" >取消</span>
       </button>
     </ion-buttons>
     <ion-buttons end>
       <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-navbar>

src/pages/tabs/home/home.html

@@ -42,9 +42,9 @@
         <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 class="card" (click)="goToSurveyManage()">
+        <img src="./assets/imgs/home/icon-wjgl.png" alt="">
+        <label class="label2-2 more2-2">问卷管理</label>
       </div>
       <div class="card" (click)="gotoMore()">
         <img src="./assets/imgs/home/icon-more.png" alt="">
@@ -65,7 +65,7 @@
          {{item.content}}
         </div>
       </div>
-      <div class="card3" style="width: 10%;color: #999999">
+      <div class="card3" style="width: 10%;color: #999999;font-size: 1.6rem">
         <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
       </div>
     </div>

src/pages/tabs/home/home.ts

@@ -193,6 +193,11 @@ export class HomePage {
     this.navCtrl.push("AnnouncementPage");
   }
 
+    //问卷调查
+    goToSurveyManage(){
+        this.navCtrl.push('ListPage');
+    }
+
   //活动跟踪
     goActivityTrack(){
         this.navCtrl.push("ActivityTrackPage");

src/pages/tabs/mine/mine.html

@@ -38,16 +38,15 @@
                 <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>-->
+            <!--<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">
             <div class="group">

src/pages/version/version.ts

@@ -38,7 +38,7 @@ export class VersionPage {
         this.appService.ObserverHttpGet('/wisdomgroup/modules/common/file/getAppPush',null)
             .subscribe(
                 (res)=>{
-                   this.pusNumber = res.json();
+                        this.pusNumber = res.json();
                 }
             )
   }