..

README.md

 项目结构
-├── README.md
+├── README.md    //介绍
 ├── config.xml     //cordova插件配置目录
-├── ionic.config.json
+├── ionic.config.json   //服务代理
 ├── ionic.starter.json
 ├── package-lock.json
 ├── package.json      //项目依赖目录
 ├── platforms
-│   └── android
+│   └── android      //安卓平台
 │       ├── CordovaLib
 │       ├── android.json
 │       ├── app
@@ -20,7 +20,7 @@
 │       ├── project.properties
 │       ├── settings.gradle
 │       └── wrapper.gradle
-├── plugins
+├── plugins    //cordova插件
 │   ├── android.json
 │   ├── cordova-plugin-app-version
 │   │   ├── CHANGELOG.md
@@ -88,7 +88,7 @@
 │       ├── plugin.xml
 │       ├── src
 │       └── www
-├── resources
+├── resources      //启动页的图片，app的icon
 │   ├── README.md
 │   ├── android
 │   │   ├── icon
@@ -143,7 +143,7 @@
 │   │   ├── search
 │   │   ├── tabs
 │   │   └── version
-│   ├── service     //异常处理
+│   ├── service     //http服务
 │   │   ├── activityStatisticService.ts
 │   │   ├── appHttpService.ts
 │   │   └── appUpdateService.ts
@@ -151,22 +151,18 @@
 │   └── theme   //核心CSS
 │       ├── icon.scss
 │       └── variables.scss
-├── tsconfig.json
+├── tsconfig.json  //ts规范
 └── tslint.json     //ts规范
 
 启动命令：
 1.npm install      //安装项目依赖
 2.ionic serve      //项目编译启动
-
+3.ionic g page newPage   //创建新页面
 安装 cordova插件命令：
 ionic cordova plugin add 插件名
 例如：
 ionic cordova plugin add cordova-plugin-badge
 
-"proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
-
-"proxyUrl": "http://10.10.200.11:8080/wisdomgroup"
-http://10.10.200.105:8080
 
 如果build android 报错了请在platforms/build.gradle里面的最后添加如下代码：
 configurations.all {

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter2" version="1.3.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter2" version="1.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>智汇19号(测)</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

src/pages/activity-track/block-modal/block-modal.ts

@@ -27,7 +27,6 @@ export class BlockModalPage {
     dismiss() {
 
         let selectBatch = [];
-        console.log(selectBatch.length);
         this.blockList.forEach(res=>{
             if(res.check == true){
                selectBatch.push(res);

src/pages/activity-track/replace-apply/replace-apply.ts

@@ -38,7 +38,6 @@ export class ReplaceApplyPage {
     }
 
     ionViewDidLoad() {
-        console.log('ionViewDidLoad ReplaceApplyPage');
     }
 
     ionViewDidEnter() {
@@ -141,7 +140,6 @@ export class ReplaceApplyPage {
         this.selectBatchList.forEach(res=>{
             order.batchlist += res.id + ',';
         });
-        console.log(order);
         this.appService.ObserverHttpPost("/wisdomgroup/modules/order/create", order)
             .subscribe((res: Response) => {
                     this.navCtrl.pop();

src/pages/activity/activityApply/activityApply.ts

@@ -97,21 +97,8 @@ export class ActivityApplyPage {
         });
     }
 
-
-    //切换批次其对应活动说明也发生改变
-    showBatchDetails(onebatchDetail) {
-        console.log(onebatchDetail.batchSetAddress);
-        this.onebatch = onebatchDetail;
-        this.order.Batchid = this.onebatch["id"];  //改变批次时，更改工单关联的批次id
-        this.isSelected = this.onebatch["id"];     //选中批次的id
-
-        this.noticeArry = this.onebatch["batchNotice"].split("\r\n");
-
-    }
-
     //携带人数 数字加减
     add() {
-        console.log("1:" + this.order.Personnumber);
         if (this.order.Personnumber < this.item.batchPerNumber) {
             this.order.Personnumber++;
         }
@@ -150,7 +137,6 @@ export class ActivityApplyPage {
         let applyNum = 0;
         this.activity.batchList.forEach((res) => {
             if (res.order) {
-                console.log(res.order);
                 applyNum++;
             }
         });
@@ -178,9 +164,7 @@ export class ActivityApplyPage {
                     if (true) {
                         this.isSuccess = true;
                         setTimeout(() => {
-                            console.log("报名成功");
                             this.isSuccess = false;
-                            //this.navCtrl.setRoot("MyActivityListPage");
                             this.navCtrl.push("MyActivityListPage");
                         }, 1000);
                     } else {
@@ -196,7 +180,6 @@ export class ActivityApplyPage {
         this.order.Batchid = this.item.id;
         this.order.Activityid = this.item.activityId;
         this.order.batchlist = this.item.id + ',';
-        console.log(this.order);
         this.appService.ObserverHttpPostOption("/wisdomgroup/modules/order/create", this.order)
             .subscribe((res: Response) => {
                     if (true) {

src/pages/activity/activityConfirm/activityConfirm.ts

@@ -204,7 +204,6 @@ export class ActivityConfirmPage {
             data.orderstate = '4';
         }
 
-        console.log(data);
         this.appService.ObserverHttpPost("/wisdomgroup/modules/order/confirmEvaluationOrder",data)
         .subscribe((res: Response) => {
             let resultback = res.json();

src/pages/activity/activityDetail/activityDetail.ts

@@ -77,7 +77,6 @@ export class ActivityDetailPage {
 
     //批次详情
     goBatchDetail(item) {
-        console.log(this.activity);
         this.navCtrl.push('BatchDetailPage', {batch: item, activity: this.activity});
     }
 
@@ -138,7 +137,6 @@ export class ActivityDetailPage {
                 {
                     text: '取消',
                     handler: () => {
-                        console.log('Disagree clicked');
                     }
                 },
                 {

src/pages/activity/activityList/activityList.ts

@@ -40,7 +40,6 @@ export class ActivityListPage {
 
     .subscribe((res: Response) => {
       let data = res.json();
-      console.log("activityListData------->",data);    
         this.items =data;
       }, error => {        
       }   
@@ -49,26 +48,13 @@ export class ActivityListPage {
 
   //查看详情
   goDetail(item){
-    console.log(item);
     let id = item.id;
     this.navCtrl.push("ActivityDetailPage",{id:id});
   }
 
-
-  goApplyDetails(item){
-    console.log(item);
-      // if(item.activityState==2 && item.orderList.length>0){
-          this.goDetail(item);
-      // }else{
-      //     this.goApply(item);
-      // }
-  }
-
   doRefresh(refresher) {
-    console.log('Begin async operation', refresher);
     setTimeout(() => {
       this.getActivityList();
-      console.log('Async operation has ended');
       refresher.complete();
     }, 2000);
   }

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

@@ -91,7 +91,6 @@ export class BatchDetailPage {
 
     //立即报名
     goApply(){
-      console.log(this.activity);
       this.navCtrl.push('ActivityApplyPage',{
           activity:this.activity,
           item:this.batch

src/pages/activity/order-detail/order-detail.ts

@@ -37,7 +37,6 @@ export class OrderDetailPage {
         this.batch = this.navParams.get('item').batch;
         let con = this.batch.batchNotice.replace(/\r?\n/g, "<br />");
         this.batch.batchNotice = this.sanitizer.bypassSecurityTrustHtml(con);
-        console.log(this.order);
     }
 
     //取消报名（订单）

src/pages/activity/order-edit/order-edit.ts

@@ -33,7 +33,6 @@ export class OrderEditPage {
       this.submitOrder.Batchid = this.order.batchid;
       this.submitOrder.Orderbz = this.order.orderbz;
       this.submitOrder.Personnumber = this.order.personnumber;
-      console.log(this.navParams.get('item'));
       this.getAllBatch();
   }
 
@@ -60,7 +59,6 @@ export class OrderEditPage {
     }
 
     submit(){
-        console.log('报名操作');
        const data  = {
             Orderid: this.order.orderid,         //订单id
             Personnumber: this.submitOrder.Personnumber,    //携带人数

src/pages/chooseAddress/chooseAddress.ts

@@ -174,7 +174,6 @@ export class ChooseAddressPage {
 
    //搜索地址
    searchAddress() {
-      console.log("searchValue:"+this.searchValue);
       if(this.searchValue == null || this.searchValue == ''){
           this.isSearch = false;
           return false;

src/pages/contact/block-list/block-list.ts

@@ -55,7 +55,6 @@ export class BlockListPage {
 
                 this.appService.ObserverHttpPostData('/wisdomgroup/modules/telpBook', data)
                     .subscribe((res) => {
-                        console.log(res.json());
                         if (res.json().apiResult.errcode == '0') {
                             toast.setMessage('添加成功');
                             toast.present();

src/pages/contact/contactList/contactList.ts

@@ -57,7 +57,6 @@ export class ContactListPage {
         this.appService.ObserverHttpGetOption("/wisdomgroup/app/contact/getGeneralContactPersons", data)
             .subscribe((res: Response) => {
                     let data = res.json();
-                    console.log("data1:" + JSON.stringify(data));
                     this.contactPersons = data;
                     this.contactPersons.forEach(element => {
                         //常用联系人的部门信息
@@ -65,7 +64,6 @@ export class ContactListPage {
                             element["orgName"] = result["orgName"];
                         });
                         //是否已添加到常用联系人中：
-                        //true:按钮为：移除常用联系人
                         //false:按钮为：添加常用联系人
                         //常用联系人：默认为true 有移除常用联系人按钮
                         element["hasgeneralpersonsflag"] = true;
@@ -93,7 +91,6 @@ export class ContactListPage {
         this.appService.ObserverHttpGet("/wisdomgroup/sysmanagement/user/getAllUserByOrgid", {"orgId": this.orgid})
             .subscribe((res: Response) => {
                     let data = res.json();
-                    console.log("data:" + data);
                     this.contactPersons = data;
                     this.contactPersons.forEach(element => {
                         //部门人员的部门信息

src/pages/contact/contract-personinfo/contract-personinfo.ts

@@ -133,7 +133,6 @@ export class ContractPersoninfoPage {
     }
 
     call(number) {
-        console.log("拨打:" + number);
         window.location.href = "tel:" + number;
     }
 

src/pages/dutyALl/duty-sign-up/duty-sign-up.ts

@@ -30,7 +30,6 @@ export class DutySignUpPage {
 
     ionViewDidLoad() {
         this.nowDay = moment().format('l');
-        console.log(this.nowDay);
         this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/myScheduleOfToday', null)
             .subscribe((res) => {
                if(res){
@@ -47,7 +46,6 @@ export class DutySignUpPage {
         };
         this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/signIn', data)
             .subscribe((res) => {
-                console.log(res);
             })
     }
 
@@ -60,17 +58,13 @@ export class DutySignUpPage {
         };
         this.appService.ObserverHttpGet('/wisdomgroup/schedule/signOut',data)
             .subscribe((res)=>{
-                console.log(res);
             })
     }
 
     //计算距离
     calcuDistance() {
         this.geolocation.getCurrentPosition().then((resp) => {
-            console.log(resp.coords.latitude);
-            console.log(resp.coords.longitude);
             const distance = this.getDisance(this.mainLat, this.mainLng, resp.coords.latitude, resp.coords.longitude);
-            console.log(distance);
             alert('距离：' + distance);
         }).catch((error) => {
             console.log(error);

src/pages/dutyALl/duty/duty.ts

@@ -68,7 +68,6 @@ export class DutyPage {
     }
 
     onChange(e){
-        console.log(e);
         const date = new Date(e).toLocaleDateString();
         this.getDuty(date);
     }

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

@@ -21,7 +21,6 @@ export class MoreAppPage {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad MoreAppPage');
     this.getRole();
   }
 

src/pages/joinPersons/joinPersons.ts

@@ -27,10 +27,7 @@ export class JoinPersonsPage {
     public appService: AppService, public toast: ToastController) {
 
       this.batchid = this.navParams.get("batchid");
-      console.log("选择的批次id:"+this.batchid);
       this.batch = this.navParams.get("batch");
-      console.log("批次信息："+this.batch);
-      
   }
 
   ngOnInit():void{
@@ -38,7 +35,6 @@ export class JoinPersonsPage {
     this.appService.ObserverHttpGet("/wisdomgroup/modules/order/batchParticipantsInfo",{"id":this.batchid})
     .subscribe((res: Response) => {
           let data = res.json();
-          console.log("canyurenyuan :"+data);
           this.items = data;
       }, error => {        
       }

src/pages/manageDuty/duty-apply-handle/duty-apply-handle.ts

@@ -36,8 +36,6 @@ export class DutyApplyHandlePage {
   }
 
     submit(type){
-        console.log(this.applyDetail);
-
         switch (type){
           case '1':{  //换班
             this.navCtrl.push('SelectChangePersonPage',{
@@ -63,7 +61,7 @@ export class DutyApplyHandlePage {
                     .subscribe((res)=>{
                         this.appService.popToastView('已忽略','middle',2000);
                         this.navCtrl.pop();
-                    })
+                    });
               break;
           }
       }

src/pages/manageDuty/select-change-person/select-change-person.ts

@@ -96,7 +96,6 @@ export class SelectChangePersonPage {
 
     onSelect(e) {
         this.changeInfo = null;
-        console.log(e);
         if (e.subTitle != '') {
             this.changeInfo = e;
         }

src/pages/mine/my-duty/my-duty.ts

@@ -18,7 +18,6 @@ export class MyDutyPage {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad MyDutyPage');
     this.getDuty();
   }
 

src/pages/mine/myActivityList/myActivityList.ts

@@ -91,7 +91,6 @@ export class MyActivityListPage {
     this.appService.ObserverHttpPost("/wisdomgroup/modules/order/searchAllOrder", null)
       .subscribe((res: Response) => {
           let data = res.json();
-          console.log("activityOrderListData------->", data);
           this.allOrder = data;
         this.allOrder.forEach(element => { //待出行
           //添加属性
@@ -99,7 +98,6 @@ export class MyActivityListPage {
           if (element["orderstate"] == '1') {
             element["showParticipantBtn"] = false;
             let signflag =  Date.parse(element["batch"].batchEndDate.toString())<Date.parse(new Date().toString());
-            console.log("signflag:"+signflag);
             if(signflag){
               element["showParticipantBtn"] = true;  //显示参与人员按钮标识
             } 
@@ -138,7 +136,6 @@ export class MyActivityListPage {
           }
           this.waitgoOrderCount =  this.waitGoOrder.length;
           //this.allOrder.splice(this.allOrder.indexOf(orderid),1)   
-          //console.log("b:"+this.allOrder);    
           //this.waitGoOrder.splice(this.waitGoOrder.indexOf(orderid),1) 
           //this.waitgoOrderCount =  this.waitGoOrder.length;
 
@@ -245,7 +242,6 @@ export class MyActivityListPage {
     //确认出行：更改订单状态为完成，订单满意度评价，意见，确认方式
     this.order["orderstate"] = '4';  //已完成
     this.order["orderconfirm"] = '1' ;  //手机app确认
-    console.log("ordervalue:"+this.order);
     this.appService.ObserverHttpPost("/wisdomgroup/modules/order/confirmEvaluationOrder",this.order)
     .subscribe((res: Response) => {
         let resultback = res.json();

src/pages/mine/myReport/myReport.ts

@@ -38,8 +38,6 @@ export class MyReportPage {
                 public appService: AppService,
                 public activityStatisticService: ActivityStatisticService,
                 public storage: Storage) {
-
-        console.log(this.navCtrl);
     }
 
     //初始化加载我的报备

src/pages/mine/mySurvey/my-survey/my-survey.ts

@@ -32,14 +32,8 @@ export class MySurveyPage {
               })
             })
     });
-   // this.getSurveyList()
   }
 
-    getSurveyList(){
-        const userId = {};
-        console.log( this.userId);
-
-    }
 
     //填写问卷
     geToWrite(item){

src/pages/mine/mySurvey/survery/survery.ts

@@ -43,10 +43,6 @@ export class SurveryPage {
         });
     }
 
-    getSurveyList(){
-        const userId = {};
-        console.log( this.userId);
-    }
 
     //填写问卷
     geToWrite(item){

src/pages/mine/mySurvey/survey-preview/survey-preview.ts

@@ -46,10 +46,8 @@ export class SurveyPreviewPage {
                                     data.select = false;
                                 }
                             });
-                            console.log(res.option.answerdesc);
                         }
                     });
-                    console.log(this.contentList);
                 })
         });
 

src/pages/mine/mySurvey/survey-result/survey-result.ts

@@ -33,7 +33,6 @@ export class SurveyResultPage {
               this.contentList.forEach(res=>{
                   res.quesDesc = JSON.parse(res.quesDesc);
               });
-              console.log(this.contentList);
           })
   }
 

src/pages/modifyPassword/modifyPassword.ts

@@ -42,39 +42,31 @@ export class ModifyPasswordPage {
   }
 
   sureModifyPassword(){
-    console.log("修改密码！");
-
     if(this.passwordInfo.formerPassword == ''||
        this.passwordInfo.modifyPassword == ''||
        this.passwordInfo.sureModifyPassword == ''){
-        console.log("请输入完整信息");
         this.appService.popToastView("请输入完整信息！",'top',2000);
         return;
     } 
     if(this.passwordInfo.formerPassword != ''){           
       if(this.user.password != this.passwordInfo.formerPassword){
-        console.log("原密码输入有误！");
         this.appService.popToastView("原密码输入有误！",'top',2000);
         return ;
       }  
     }
     if(!this.myreg.test(this.passwordInfo.modifyPassword)){  
-        console.log('新密码由8到16位数字和字母组成！');  
         this.appService.popToastView('新密码由8到16位数字和字母组成！','top',2000);
         return false;  
     }  
     if(this.passwordInfo.modifyPassword != this.passwordInfo.sureModifyPassword){
-          console.log("两次输入的密码不一致");        
           this.appService.popToastView("两次输入的密码不一致",'top',2000);
           return;
     }else{
-          console.log("到后台！");
           this.appService.ObserverHttpPost("/wisdomgroup/manager/updatePassword",{"password":this.passwordInfo.modifyPassword})
           .subscribe((res: Response) => {   
               this.appService.popToastView("修改成功！",'top',2000);                           
               //将缓存中密码密码修改
               this.user.password = this.passwordInfo.modifyPassword;
-              console.log(this.user);            
               this.storage.set('userLoginInfo',this.user);
               //退出后台
               this.logoutApp();

src/pages/operation-list/operation-list.ts

@@ -32,7 +32,6 @@ export class OperationListPage {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad OperationListPage');
     //this.initMineOperationInfo();
   }
 
@@ -74,7 +73,6 @@ export class OperationListPage {
       let hour = Math.round(timegap%nd/nh);//计算差多少小时
       let min = Math.round(timegap%nd%nh/nm);//计算差多少分钟
       let sec = Math.round(timegap%nd%nh%nm/ns);//计算差多少秒//输出结果
-      console.log("时间相差："+day+"天"+hour+"小时"+min+"分钟"+sec+"秒。");
 
       if(day>0){
         result = day+"天前";
@@ -104,7 +102,6 @@ export class OperationListPage {
           });
           
           this.pageOperations = this.pageOperations.concat(this.tempOperations);
-          console.log("scroll:"+JSON.stringify(this.pageOperations));
           infiniteScroll.complete();   //当数据请求完成调用
         }
         //数据少于一页时  隐藏 ion-infinate-scroll

src/pages/person/editPersonInfo/editPersonInfo.ts

@@ -55,7 +55,6 @@ export class EditPersonInfoPage {
   ionViewDidLoad():void{ 
     this.user = this.storage.get("user").then((value)=>{
       this.user = value;
-      console.log(this.user);
       this.gender = this.user.userDetail.user.gender;
       this.userinfo = this.user.userDetail.user;
       this.userinfo.userId = this.user.id;
@@ -97,18 +96,15 @@ export class EditPersonInfoPage {
    //修改信息：房间号，座机号，邮箱
    updateUserInfo(): void {
 
-    console.log("1:"+this.userinfo);
 
     if(this.code == '2'){
       if(!this.myregMobile.test(this.userinfo.telephone)){  
-        console.log('请输入规则的电话号码！');  
         this.appService.popToastView('请输入规则的电话号码！','top',2000);
         return ;   
       } 
     }
     if(this.code == '3'){
       if(!this.myregEamil.test(this.userinfo.email)){  
-        console.log('请输入规则的邮箱！');  
         this.appService.popToastView('请输入规则的邮箱！','top',2000);
         return ;   
       } 
@@ -117,19 +113,11 @@ export class EditPersonInfoPage {
     this.appService.ObserverHttpPost("/wisdomgroup/auth4/updateUserInfo",this.userinfo)
     .toPromise() 
     .then(res => { 
-      var data = res.json();  
-      console.log("reback user data:"+data);  
-      
-      // this.user.userDetail.user.abbreviation = data.abbreviation;
-      // this.user.userDetail.user.telephone = data.telephone;
-      // this.user.userDetail.user.email = data.email;
-
+      let data = res.json();
       this.user.userDetail.user = data;
 
       this.storage.remove("user");
       this.storage.set("user",this.user);
-      console.log("abbreviation:"+this.user.userDetail.user.abbreviation);
-      //this.changeImageFlag(); 
       this.navCtrl.pop();
     }) 
     .catch(error => {   

src/pages/person/personInfo/personInfo.ts

@@ -31,10 +31,7 @@ export class PersonInfoPage {
     ionViewWillEnter(): void {
         this.user = this.storage.get("user").then((value) => {
             this.user = value;
-            console.log(this.user);
-            console.log("id1:" + this.user.id);
             this.gender = this.user.userDetail.user.gender;
-            console.log("gender:" + this.gender);
             this.getOrgName(this.user.id, result => {
                 let data = result;
                 this.orgName = data["orgName"];

src/pages/report/outGoingReport/outGoingReport.ts

@@ -27,14 +27,12 @@ export class OutGoingReportPage {
 
   //刷新
   doRefresh(refresher) {
-    console.log('Begin async operation', refresher);
     setTimeout(() => {
       if (this.type == 1) {
         this.initPremanagerList();
       } else if (this.type == 2) {
         this.initPremanagerListAboutNot();
       }
-      console.log('Async operation has ended');
       refresher.complete();
     }, 2000);
   }
@@ -68,7 +66,6 @@ export class OutGoingReportPage {
     this.appService.ObserverHttpGet("/wisdomgroup/modules/premanager/findNeedPremanager", null)
       .subscribe((res: Response) => {
         let data = res.json();
-        console.log(data);
         this.PremanagerList = data;
       }, error => {
       }

src/pages/report/outGoingReportEdit/outGoingReportEdit.html

@@ -63,8 +63,8 @@
     </ion-item>
 
   </ion-list>
-  <button class="submit-btn submit" *ngIf="!premanager.reported" (click)="savePremanager()">提交报备</button>
-  <button class="submit-btn submit" *ngIf="premanager.reported" (click)="editPremanager()">修改报备</button>
+  <button class="submit-btn submit" *ngIf="!userpre.id" (click)="savePremanager()">提交报备</button>
+  <button class="submit-btn submit" *ngIf="userpre.id" (click)="editPremanager()">修改报备</button>
 </ion-content>
 
 

src/pages/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -69,7 +69,6 @@ export class OutGoingReportEditPage {
         this.storage.get("premanager").then((value) => {
             if (value != null && value != '') {
                 this.premanager = value;
-                console.log(this.premanager);
                 //加载报备的图片
                 this.picture = AppGlobal.picture + this.premanager["uploadPic"];
                 //加载报备详细说明
@@ -181,7 +180,6 @@ export class OutGoingReportEditPage {
 
     //报备详情限定一行17个字符串，两行57个字符串，多余以省略号代替
     subIntroduce(str: string) {
-        console.log("introduce:" + str.length);
         if (!str) this.introduce = '';
         if (str.length <= 17) this.introduce = str;
         if (str.length > 17 && str.length <= 25) this.introduce = str.substr(0, 17) + "...";
@@ -278,7 +276,6 @@ export class OutGoingReportEditPage {
 
     //修改报备
     editPremanager() {
-
         if (this.userpre.isorFromsh == 1) {
             //判断离沪地点是否选择
             if (this.userpre.outaddressids == null || this.userpre.outaddressids == '') {
@@ -292,6 +289,10 @@ export class OutGoingReportEditPage {
                 this.userpre.userpreDesc = temp_userpreDesc;
             }
         }
+        if(this.person){
+            this.userpre.userId = this.person.id;
+            this.userpre.userName = this.person.name;
+        }
 
         this.storage.get("cityList").then((value) => {
             if (value != null && value != '') { //离沪
@@ -307,15 +308,18 @@ export class OutGoingReportEditPage {
                 let resultback = result;
                 if (resultback.code == '200') {
                     //this.appService.popToastView(resultback.msg,'middle',1000);
-
-                    //清空 插入
-                    const index = this.navCtrl.getActive().index;
-                    this.navCtrl.remove(0, index);
-                    this.navCtrl.setRoot(MinePage);
-                    this.navCtrl.parent.select(3);
-
-
-                    this.navCtrl.push("MyReportPage");
+                    if( this.userpre.id ){
+                        const index = this.navCtrl.getActive().index;
+                        this.navCtrl.remove(3, index);
+                        this.navCtrl.pop();
+                    }else{
+                        // //清空 插入
+                        const index = this.navCtrl.getActive().index;
+                        this.navCtrl.remove(0, index);
+                        this.navCtrl.setRoot(MinePage);
+                        this.navCtrl.parent.select(3);
+                        this.navCtrl.push("MyReportPage");
+                    }
                 } else {
                     //失败
                     this.appService.popToastView(resultback.msg, 'middle', 1000);

src/pages/report/outGoingReportView/outGoingReportView.ts

@@ -85,6 +85,5 @@ export class OutGoingReportViewPage {
     }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad OutGoingReportViewPage');
   }
 }

src/pages/report/reportDetail/reportDetail.ts

@@ -62,7 +62,6 @@ export class ReportDetailPage {
         this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/getUserAboutLeave", {id: id})
             .subscribe((res: Response) => {
                     let data = res.json();
-                    console.log(data);
                     this.itemsOfLeave = data;
                 }, error => {
                 }
@@ -74,7 +73,6 @@ export class ReportDetailPage {
         this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/getUserAboutNotLeave", {id: id})
             .subscribe((res: Response) => {
                     let data = res.json();
-                    console.log(data);
                     this.itemsOfNotLeave = data;
                 }, error => {
                 }

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

@@ -37,7 +37,6 @@ export class CreatePage {
 
     ionViewDidLoad() {
         this.temp = this.navParams.get('temp');    //问卷信息
-        console.log(this.temp);
         if (this.navParams.get('edit')) {      //编辑
             this.editTemp = this.navParams.get('edit');
             this.editIndex = this.navParams.get('index');
@@ -106,7 +105,6 @@ export class CreatePage {
             array: JSON.stringify(newArr),
             id: this.temp.id
         };
-        console.log(newArr);
         const toast = this.toastCtrl.create(message);
         this.appService.ObserverHttpPost('/wisdomgroup/modules/question/saveQuestion', data)
             .subscribe(
@@ -161,7 +159,6 @@ export class CreatePage {
         const data = {
             array: JSON.stringify(arr)
         };
-        console.log(this.temp);
         const toast = this.toastCtrl.create(message);
         this.appService.ObserverHttpPost('/wisdomgroup/modules/question/saveQuestion', data)
             .subscribe(

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

@@ -90,7 +90,6 @@ export class DesicrPage {
             isans: this.desrc.isans,   //是否匿名
             state: this.desrc.state   //状态
         };
-        console.log(data);
         this.appService.ObserverHttpPost('/wisdomgroup/modules/question/updateOnApp', data)
             .subscribe((res) => {
                 if (res) {

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

@@ -20,7 +20,6 @@ export class DetailPage {
 
   ionViewDidLoad() {
     this.temp =  this.navParams.get('temp');
-    console.log(this.temp);
     this.getDetail();
   }
 

src/pages/surveyManage/item/edit/edit.ts

@@ -75,7 +75,6 @@ export class EditPage {
     }
 
     goEdit(index) {
-        console.log(index);
         this.navCtrl.push('CreatePage', {
             edit: this.contentList,
             index: index,
@@ -177,7 +176,6 @@ export class EditPage {
             };
             newArr.push(arr);
         }
-        console.log(newArr);
         const data = {
             array: JSON.stringify(newArr),
             id: this.temp.id

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

@@ -48,13 +48,11 @@ export class SetPage {
 
     save() {
         //是否匿名
-        console.log(this.isans);
         if (this.isans == true || this.isans == 1) {
             this.temp.isans = 1;
         } else {
             this.temp.isans = 2;
         }
-        console.log(this.temp.isans);
         //是否公开问卷结果
         if (this.isopen == true || this.isopen == 1) {
             this.temp.isopen = 1;

src/pages/tabs/mine/mine.ts

@@ -47,10 +47,7 @@ export class MinePage {
     orgNameInfo(): void {
         this.user = this.storage.get("user").then((value) => {
             this.user = value;
-            console.log(this.user);
-            console.log("id1:" + this.user.id);
             this.gender = this.user.userDetail.user.gender;
-            console.log("gender:" + this.gender);
             this.getOrgName(this.user.id, result => {
                 let data = result;
                 this.orgName = data["orgName"];
@@ -112,7 +109,6 @@ export class MinePage {
                         //   })
                         //退出登陆，将缓存中的用户注销，跳转到登陆页面。
                         this.storage.get("user").then((value) => {
-                            console.log(value);
                         });
                         this.storage.remove("user");
                         this.storage.remove("userLoginInfo");
@@ -152,12 +148,10 @@ export class MinePage {
                 }
             });
         }).catch(err => {
-            console.log('getVersionNumber:' + err);
         });
     }
 
     goSet() {
-        // this.navCtrl.push('VersionPage');
         this.app.getRootNav().push('VersionPage');
     }
 

src/pages/version/version.ts

@@ -75,7 +75,6 @@ export class VersionPage {
                 }
             });
         }).catch(err => {
-            console.log('getVersionNumber:' + err);
         });
     }