color

src/pages/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -67,7 +67,6 @@ export class OutGoingReportEditPage {
 
         //报备列表页面  到  个人报备1页面
         this.storage.get("premanager").then((value) => {
-    console.log(value);
             if (value != null && value != '') {
                 this.premanager = value;
                 //加载报备的图片
@@ -77,10 +76,11 @@ export class OutGoingReportEditPage {
                 this.userpre.managerId = this.premanager["id"]; //1.保存-报备id
                 this.temp_endTime = this.premanager["endTime"];  //报备截止时间
 
-                if (this.premanager["reported"]) {  //已报备--修改操作，
+                // if (this.premanager["reported"]) {  //已报备--修改操作，
                     //编辑初始化：查询
                     this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre", {premanagerId: value.id})
                         .subscribe((res: Response) => {
+                            if(res){
                                 let result = res.json();
                                 this.userpre.id = result["id"];  //保存-id
                                 //离沪勾选
@@ -109,11 +109,12 @@ export class OutGoingReportEditPage {
                                     //页面显示 时间差
                                     this.dategap = this.userpre.leaveTime + "~" + this.userpre.backTime;  //回显时间差
                                 }
+                            }
                             }, error => {
                                 this.appService.alert('网络异常！');
                             }
                         );
-                }
+                // }
             }
         });
         this.storage.get("person").then((value)=>{

src/pages/surveyManage/list/list.html

@@ -53,7 +53,7 @@
   <div class="cover">
     <p class="survey-title">{{temp?.title}}</p>
     <div class="footter-opr">
-      <div *ngIf="swiperIndex == 0" (click)="look()"><span>编辑</span></div>
+      <div *ngIf="swiperIndex == 0" (click)="edit()"><span>编辑</span></div>
       <div *ngIf="swiperIndex == 1" (click)="look()"><span>查看</span></div>
       <div *ngIf="swiperIndex == 1" (click)="overDue()"><span>设为过期</span></div>
       <div *ngIf="swiperIndex == 0" (click)="release()"><span>发布</span></div>

src/pages/surveyManage/list/list.ts

@@ -4,6 +4,7 @@ import {ResultPage} from "../result/result";
 import {DesicrPage} from "../item/desicr/desicr";
 import {AppService} from "../../../service/appHttpService";
 import {EditPage} from "../item/edit/edit";
+import {DetailPage} from "../item/detail/detail";
 
 
 declare var Swiper;
@@ -104,12 +105,18 @@ export class ListPage {
         this.navCtrl.push('DesicrPage');
     }
 
-    //查看
-    look() {
+    //编辑
+    edit() {
         this.showOp = false;
         this.navCtrl.push('EditPage', {temp: this.temp});
     }
 
+    //查看
+    look(){
+        this.showOp = false;
+        this.navCtrl.push('DetailPage',{temp:this.temp});
+    }
+
     //设为过期
     overDue() {
         this.appService.alert('确定将该问卷设为过期吗',(res)=>{

src/pages/tabs/home/home.ts

@@ -97,10 +97,7 @@ export class HomePage {
     }
 
     ionViewDidEnter() {
-        if (this.slides) {
-            this.slides.startAutoplay();
-            this.slides.autoplayDisableOnInteraction = false;
-        }
+
         //获取权限
         this.getRole();
         //获取消息数量
@@ -207,7 +204,7 @@ export class HomePage {
             .toPromise()
             .then(res => {
                 let activity = res.json();
-                this.navCtrl.push('ActivityDetailPage',{id:activity.id});
+                this.navCtrl.push('ActivityDetailPage', {id: activity.id});
             })
             .catch(error => {
             });
@@ -216,15 +213,12 @@ export class HomePage {
 
     //获取报备
     getPremanager(id) {
-        this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/findById", {id: id})
-            .toPromise()
-            .then(res => {
-                let premanager = res.json();
-                this.storage.set("premanager", premanager);
-                this.navCtrl.push("OutGoingReportEditPage");
-            })
-            .catch(error => {
-            });
+        this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/findById", {id: id}).
+        subscribe((res) => {
+            let premanager = res.json();
+            this.storage.set("premanager", premanager);
+            this.navCtrl.push("OutGoingReportEditPage");
+        })
     }
 
 
@@ -314,7 +308,7 @@ export class HomePage {
     }
 
     //获取是否有新消息
-    getHasNewMessage(){
+    getHasNewMessage() {
         this.appService.ObserverHttpGet("/wisdomgroup/modules/message/hasNewMessage", null)
             .subscribe((res: Response) => {
                     let data = res.json();