Skip to content

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

日历

parent f834bc36
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 82 deletions
src/pages/dutyALl/duty-detail/duty-detail.html
View file @ 2bc39c58
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<ion-list> <ion-list>
<ion-item> <ion-item>
<span>值班日期：</span> <span>值班日期：</span>
<span>值班日期：</span> <span>{{time | date:'yyyy-MM-dd'}}</span>
</ion-item> </ion-item>
<ion-item> <ion-item>
<span>换班原因：</span> <span>换班原因：</span>
......
src/pages/dutyALl/duty-detail/duty-detail.ts
View file @ 2bc39c58
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular'; import {IonicPage, NavController, NavParams} from 'ionic-angular';
import { AppService } from "../../../service/appHttpService"; import {AppService} from "../../../service/appHttpService";
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -9,29 +9,30 @@ import { AppService } from "../../../service/appHttpService"; ...@@ -9,29 +9,30 @@ import { AppService } from "../../../service/appHttpService";
}) })
export class DutyDetailPage { export class DutyDetailPage {
time;
dutyDetail = { dutyDetail = {
reason:'', reason: '',
id:'' id: ''
}; };
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
public appService: AppService) { public appService: AppService) {
} }
ionViewDidLoad() { ionViewDidLoad() {
const id = this.navParams.get('id'); const id = this.navParams.get('id');
console.log(id); this.time = this.navParams.get('time');
this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/apply',{'id':id}) this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/apply', {'id': id})
.subscribe((res)=>{ .subscribe((res) => {
this.dutyDetail = res.json(); this.dutyDetail = res.json();
}) })
} }
submitOrder(){ submitOrder() {
console.log(this.dutyDetail); console.log(this.dutyDetail);
const id = this.dutyDetail.id; const id = this.dutyDetail.id;
this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/deleteApply', {'id': id})
this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/deleteApply',{'id':id}) .subscribe((res) => {
.subscribe((res)=>{
this.navCtrl.pop(); this.navCtrl.pop();
// this.dutyDetail = res; // this.dutyDetail = res;
}) })
......
src/pages/dutyALl/duty/duty.ts
View file @ 2bc39c58
...@@ -124,7 +124,8 @@ export class DutyPage { ...@@ -124,7 +124,8 @@ export class DutyPage {
//申请详情 //申请详情
dutyDetail(item){ dutyDetail(item){
this.navCtrl.push('DutyDetailPage',{ this.navCtrl.push('DutyDetailPage',{
"id":item.applyId "id":item.applyId,
'time':item.dutyDate
}) })
} }
......
src/pages/tabs/home/home.ts
View file @ 2bc39c58
...@@ -40,6 +40,7 @@ export class HomePage { ...@@ -40,6 +40,7 @@ export class HomePage {
type: 'string'; type: 'string';
optionsMulti: CalendarComponentOptions; optionsMulti: CalendarComponentOptions;
newArr: DayConfig[] = [];
//待出行 //待出行
waitgoCount = '0'; waitgoCount = '0';
...@@ -355,13 +356,14 @@ export class HomePage { ...@@ -355,13 +356,14 @@ export class HomePage {
let date = new Date(); let date = new Date();
let year = date.getFullYear(); let year = date.getFullYear();
let month = date.getMonth() +1; let month = date.getMonth() +1;
console.log(month); ///schedule/app/getMyScheduleOnMonth
this.loadEvent(year,month); this.loadEvent(year,month);
} }
loadEvent(year,month){ loadEvent(year,month){
let date = new Date(); let date = new Date();
let newArr: DayConfig[] = [];
//1.每月的周末
let d = new Date(year,month,0).getDate(); let d = new Date(year,month,0).getDate();
for( let i = 1; i< d +1;i++ ){ for( let i = 1; i< d +1;i++ ){
date.setFullYear(year,month -1,i); date.setFullYear(year,month -1,i);
...@@ -372,9 +374,24 @@ export class HomePage { ...@@ -372,9 +374,24 @@ export class HomePage {
disable: true, disable: true,
cssClass: 'dayOff1' cssClass: 'dayOff1'
}; };
newArr.push(data); this.newArr.push(data);
} }
} }
//2.获取每月值班信息
const data = {
date:year + '/' + month +'/01'
};
this.appService.ObserverHttpGetOption("/wisdomgroup/schedule/app/getMyScheduleOnMonth", data)
.subscribe((res: Response) => {
let response = res.json();
for( let i = 0;i<response.length;i++ ){
const data = {
date: new Date(response[i].dutyDate),
disable: true,
cssClass: 'dayOff1 dayOff3'
};
this.newArr.push(data);
}
this.optionsMulti = { this.optionsMulti = {
pickMode: 'multi', pickMode: 'multi',
monthFormat: 'YYYY 年 MM 月 ', monthFormat: 'YYYY 年 MM 月 ',
...@@ -382,8 +399,14 @@ export class HomePage { ...@@ -382,8 +399,14 @@ export class HomePage {
monthPickerFormat:monthCh, monthPickerFormat:monthCh,
weekStart: 0, weekStart: 0,
disableWeeks:[0,1,2,3,4,5,6], disableWeeks:[0,1,2,3,4,5,6],
daysConfig:newArr daysConfig:this.newArr
}; };
console.log(this.optionsMulti);
}, error => {
this.appService.alert('网络异常！');
}
);
} }
onChange(e){ onChange(e){
......
src/service/appHttpService.ts
View file @ 2bc39c58
...@@ -19,8 +19,6 @@ export class AppGlobal { ...@@ -19,8 +19,6 @@ export class AppGlobal {
static domain = "http://180.168.156.212:2931"; static domain = "http://180.168.156.212:2931";
//static domain = "http://localhost:8080" //static domain = "http://localhost:8080"
//乔坤
//static domain = "http://10.10.202.54:8080";220.248.107.115:2239
//测试 //测试
// static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/"; // static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/";
...@@ -64,7 +62,6 @@ export class AppService { ...@@ -64,7 +62,6 @@ export class AppService {
for (var key in params) { for (var key in params) {
if (params.hasOwnProperty(key)) { if (params.hasOwnProperty(key)) {
var value = params[key]; var value = params[key];
//str += encodeURIComponent(key) + '=' + encodeURIComponent(value) + '&';
str += key + '=' + value + '&'; str += key + '=' + value + '&';
} }
} }
...@@ -76,43 +73,36 @@ export class AppService { ...@@ -76,43 +73,36 @@ export class AppService {
//get请求 //get请求
ObserverHttpGet(url, params): Observable<any> { ObserverHttpGet(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url+this.encode(params,"get")) //app
return this.http.get(url + this.encode(params, "get")) //本地 return this.http.get(url + this.encode(params, "get")) //本地
} }
//get请求 //get请求
ObserverHttpGetData(url, params): Observable<any> { ObserverHttpGetData(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url, params) //app
return this.http.get(url, params) //本地 return this.http.get(url, params) //本地
} }
//get请求 //get请求
ObserverHttpGetAdd(url, params): Observable<any> { ObserverHttpGetAdd(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url+ params) //app
return this.http.get(url+ params) //本地 return this.http.get(url+ params) //本地
} }
//get请求带？的 //get请求带？的
ObserverHttpGetOption(url, params): Observable<any> { ObserverHttpGetOption(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url,{params: params}); //app
return this.http.get(url, {params: params}); //本地 return this.http.get(url, {params: params}); //本地
} }
//delete //delete
ObserverHttpDetelete(url, params): Observable<any> { ObserverHttpDetelete(url, params): Observable<any> {
// return this.http.delete(AppGlobal.domain+url+this.encode(params,"get")) //app
return this.http.delete(url + this.encode(params, "get")) //本地 return this.http.delete(url + this.encode(params, "get")) //本地
} }
//delete //delete
ObserverHttpDeteleteOption(url, params): Observable<any> { ObserverHttpDeteleteOption(url, params): Observable<any> {
// return this.http.delete(AppGlobal.domain+url + params) //app
return this.http.delete(url + params); //本地 return this.http.delete(url + params); //本地
} }
//delete //delete
ObserverHttpDeteleteData(url, params,data): Observable<any> { ObserverHttpDeteleteData(url, params,data): Observable<any> {
// return this.http.delete(AppGlobal.domain + url + params,{ //app
return this.http.delete(url + params,{ return this.http.delete(url + params,{
params:this.encode(data,'post'), params:this.encode(data,'post'),
headers: new Headers({ headers: new Headers({
...@@ -124,7 +114,6 @@ export class AppService { ...@@ -124,7 +114,6 @@ export class AppService {
} }
ObserverHttpPostData(url, params) { ObserverHttpPostData(url, params) {
// return this.http.post(AppGlobal.domain+url,params,{ //app
return this.http.post(url, params, { //本地 return this.http.post(url, params, { //本地
headers: new Headers({ headers: new Headers({
// "Accept": "application/json", // "Accept": "application/json",
...@@ -136,7 +125,6 @@ export class AppService { ...@@ -136,7 +125,6 @@ export class AppService {
ObserverHttpPostAdd(url, params) { ObserverHttpPostAdd(url, params) {
// return this.http.post(AppGlobal.domain+url,params,{ //app
return this.http.post(url+ params, { //本地 return this.http.post(url+ params, { //本地
headers: new Headers({ headers: new Headers({
// "Accept": "application/json", // "Accept": "application/json",
...@@ -147,7 +135,6 @@ export class AppService { ...@@ -147,7 +135,6 @@ export class AppService {
} }
ObserverHttpPostOption(url,data) { ObserverHttpPostOption(url,data) {
// return this.http.post(AppGlobal.domain+url,null,{ //app
return this.http.post(url, null,{ return this.http.post(url, null,{
params:data, params:data,
headers: new Headers({ headers: new Headers({
...@@ -160,7 +147,6 @@ export class AppService { ...@@ -160,7 +147,6 @@ export class AppService {
} }
ObserverHttpPostForm(url, params) { ObserverHttpPostForm(url, params) {
// return this.http.post(AppGlobal.domain+url,null,{ //app
return this.http.post(url, null, { //本地 return this.http.post(url, null, { //本地
params: params, params: params,
headers: new Headers({ headers: new Headers({
...@@ -173,7 +159,6 @@ export class AppService { ...@@ -173,7 +159,6 @@ export class AppService {
//post请求 //post请求
ObserverHttpPost(url, params) { ObserverHttpPost(url, params) {
// return this.http.post(AppGlobal.domain+url,null,{ //app
return this.http.post(url, null, { //本地 return this.http.post(url, null, { //本地
params: this.encode(params, 'post'), params: this.encode(params, 'post'),
headers: new Headers({ headers: new Headers({
...@@ -186,7 +171,6 @@ export class AppService { ...@@ -186,7 +171,6 @@ export class AppService {
//post请求 //post请求
ObserverHttpNoForm(url, params) { ObserverHttpNoForm(url, params) {
// return this.http.post(AppGlobal.domain+url,null,{ //app
return this.http.post(url,null,{ return this.http.post(url,null,{
params:params, params:params,
headers: new Headers({ headers: new Headers({
...@@ -200,7 +184,6 @@ export class AppService { ...@@ -200,7 +184,6 @@ export class AppService {
//put请求 //put请求
ObserverHttpPut(url, params, data) { ObserverHttpPut(url, params, data) {
// return this.http.post(AppGlobal.domain+url +data,params,{ //app
return this.http.put(url + data, params, { //本地 return this.http.put(url + data, params, { //本地
headers: new Headers({ headers: new Headers({
// "Accept": "application/json", // "Accept": "application/json",
...@@ -278,9 +261,9 @@ export class AppService { ...@@ -278,9 +261,9 @@ export class AppService {
} }
// // //
// // //app请求方式 // //app请求方式
// // //
// import {LoadingController, AlertController, ToastController} from 'ionic-angular'; // import {LoadingController, AlertController, ToastController} from 'ionic-angular';
// import {Injectable} from '@angular/core'; // import {Injectable} from '@angular/core';
// import {Http, Headers} from '@angular/http'; // import {Http, Headers} from '@angular/http';
...@@ -301,8 +284,6 @@ export class AppService { ...@@ -301,8 +284,6 @@ export class AppService {
// static domain = "http://180.168.156.212:2931"; // static domain = "http://180.168.156.212:2931";
// //static domain = "http://localhost:8080" // //static domain = "http://localhost:8080"
// //
// //乔坤
// //static domain = "http://10.10.202.54:8080";220.248.107.115:2239
// //
// //测试 // //测试
// // static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/"; // // static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/";
...@@ -346,7 +327,6 @@ export class AppService { ...@@ -346,7 +327,6 @@ export class AppService {
// for (var key in params) { // for (var key in params) {
// if (params.hasOwnProperty(key)) { // if (params.hasOwnProperty(key)) {
// var value = params[key]; // var value = params[key];
// //str += encodeURIComponent(key) + '=' + encodeURIComponent(value) + '&';
// str += key + '=' + value + '&'; // str += key + '=' + value + '&';
// } // }
// } // }
...@@ -358,68 +338,64 @@ export class AppService { ...@@ -358,68 +338,64 @@ export class AppService {
// //
// //get请求 // //get请求
// ObserverHttpGet(url, params): Observable<any> { // ObserverHttpGet(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url+this.encode(params,"get")) //app // return this.http.get(AppGlobal.domain + url + this.encode(params, "get")) //app
// // return this.http.get(url + this.encode(params, "get")) //本地
// } // }
// //
// //get请求 // //get请求
// ObserverHttpGetData(url, params): Observable<any> { // ObserverHttpGetData(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url, params) //app // return this.http.get(AppGlobal.domain + url, params) //app
// // return this.http.get(url, params) //本地
// } // }
// //
// //get请求 // //get请求
// ObserverHttpGetAdd(url, params): Observable<any> { // ObserverHttpGetAdd(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url+ params) //app // return this.http.get(AppGlobal.domain + url + params) //app
// // return this.http.get(url+ params) //本地
// } // }
// //
// //get请求带？的 // //get请求带？的
// ObserverHttpGetOption(url, params): Observable<any> { // ObserverHttpGetOption(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain+url,{params: params}); //app // return this.http.get(AppGlobal.domain + url, {params: params}); //app
// // return this.http.get(url, {params: params}); //本地
// } // }
// //
// //delete // //delete
// ObserverHttpDetelete(url, params): Observable<any> { // ObserverHttpDetelete(url, params): Observable<any> {
// return this.http.delete(AppGlobal.domain+url+this.encode(params,"get")) //app // return this.http.delete(AppGlobal.domain + url + this.encode(params, "get")) //app
// // return this.http.delete(url + this.encode(params, "get")) //本地
// } // }
// //
// //delete // //delete
// ObserverHttpDeteleteOption(url, params): Observable<any> { // ObserverHttpDeteleteOption(url, params): Observable<any> {
// return this.http.delete(AppGlobal.domain+url + params) //app // return this.http.delete(AppGlobal.domain + url + params) //app
// // return this.http.delete(url + params); //本地
// } // }
// //
// //delete // //delete
// ObserverHttpDeteleteData(url, params,data): Observable<any> { // ObserverHttpDeteleteData(url, params, data): Observable<any> {
// return this.http.delete(AppGlobal.domain + url + params,{ //app // return this.http.delete(AppGlobal.domain + url + params, { //app
// params:this.encode(data,'post'), // params: this.encode(data, 'post'),
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// "Content-Type": "application/json" // "Content-Type": "application/json"
// // 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) //本地 // }) //本地
// } // }
// //
// ObserverHttpPostData(url, params) { // ObserverHttpPostData(url, params) {
// return this.http.post(AppGlobal.domain+url,params,{ //app // return this.http.post(AppGlobal.domain + url, params, { //app
// headers: new Headers({
// "Content-Type": "application/json"
// })
// })
// }
//
// ObserverHttpPostAdd(url, params) {
// return this.http.post(AppGlobal.domain + url + params, { //app
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// "Content-Type": "application/json" // "Content-Type": "application/json"
// // 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // })
// } // }
// //
// ObserverHttpPostOption(url,data) { // ObserverHttpPostOption(url, data) {
// return this.http.post(AppGlobal.domain+url,null,{ //app // return this.http.post(AppGlobal.domain + url, null, { //app
// params:data, // params: data,
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// // "Content-Type": "application/json"
// 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8' // 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }); // });
...@@ -427,11 +403,9 @@ export class AppService { ...@@ -427,11 +403,9 @@ export class AppService {
// } // }
// //
// ObserverHttpPostForm(url, params) { // ObserverHttpPostForm(url, params) {
// return this.http.post(AppGlobal.domain+url,null,{ //app // return this.http.post(AppGlobal.domain + url, null, { //app
// params: params, // params: params,
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// // "Content-Type": "application/json"
// 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8' // 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // })
...@@ -439,11 +413,9 @@ export class AppService { ...@@ -439,11 +413,9 @@ export class AppService {
// //
// //post请求 // //post请求
// ObserverHttpPost(url, params) { // ObserverHttpPost(url, params) {
// return this.http.post(AppGlobal.domain+url,null,{ //app // return this.http.post(AppGlobal.domain + url, null, { //app
// params: this.encode(params, 'post'), // params: this.encode(params, 'post'),
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// //"Content-Type": "application/json,charset=UTF-8"
// 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' // 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
// }) // })
// }) // })
...@@ -451,12 +423,10 @@ export class AppService { ...@@ -451,12 +423,10 @@ export class AppService {
// //
// //post请求 // //post请求
// ObserverHttpNoForm(url, params) { // ObserverHttpNoForm(url, params) {
// return this.http.post(AppGlobal.domain+url,null,{ //app // return this.http.post(AppGlobal.domain + url, null, { //app
// params:params, // params: params,
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json", // 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
// // "Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'
// }) // })
// }) // })
// //
...@@ -464,11 +434,9 @@ export class AppService { ...@@ -464,11 +434,9 @@ export class AppService {
// //
// //put请求 // //put请求
// ObserverHttpPut(url, params, data) { // ObserverHttpPut(url, params, data) {
// return this.http.post(AppGlobal.domain+url +data,params,{ //app // return this.http.post(AppGlobal.domain + url + data, params, { //app
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// "Content-Type": "application/json" // "Content-Type": "application/json"
// // 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // })
// } // }
...@@ -511,8 +479,6 @@ export class AppService { ...@@ -511,8 +479,6 @@ export class AppService {
// message: message, // message: message,
// position: position, // position: position,
// duration: duration, // duration: duration,
// //showCloseButton:true,
// //closeButtonText:"关闭"
// }).present(); // }).present();
// } // }
// //
......
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