|
|
@ -191,6 +191,8 @@
|
|
|
this.searchTask=this.searchTask==val.code?null:val.code;
|
|
|
this.searchTaskName=this.searchTaskName==val.name?null:val.name;
|
|
|
},
|
|
|
|
|
|
//当前的年月
|
|
|
monDetail:function(){
|
|
|
this.currentDay = this.ynow + '年'+ (this.mnow + 1) +'月';
|
|
|
this.currentDayForEn=this.ynow+'/'+(this.mnow>=9?(this.mnow+1):"0"+(this.mnow+1))+'/'+(this.dnow>=9?this.dnow:"0"+this.dnow)
|
|
|
@ -208,7 +210,7 @@
|
|
|
this.monDetail();
|
|
|
this.goToLoadData(true);
|
|
|
},
|
|
|
getPreMouth:function(){
|
|
|
getPreMouth:function(){ //上一个月
|
|
|
var pMnow,pYnow;
|
|
|
if(this.mnow<=0){
|
|
|
pMnow=11;
|
|
|
@ -242,7 +244,7 @@
|
|
|
nMnow=this.mnow+1;
|
|
|
nYnow=this.ynow;
|
|
|
}
|
|
|
var m_days=new Array(31,(28+this.is_leap(nYnow)),31,30,31,01,31,31,30,31,30,31); //每个月的天数
|
|
|
var m_days=new Array(31,(28+this.is_leap(nYnow)),31,30,31,31,31,31,30,31,30,31); //每个月的天数
|
|
|
return {
|
|
|
days:m_days[nMnow],
|
|
|
date:nYnow+'-'+(++nMnow>=10?nMnow:"0"+nMnow)
|
|
|
@ -285,6 +287,8 @@
|
|
|
}
|
|
|
}
|
|
|
this.__Data=dataArr;
|
|
|
console.log("输出日历格式")
|
|
|
console.log(dataArr)
|
|
|
this.monDetail();
|
|
|
this.calenderPlanDetail();
|
|
|
},
|
|
|
@ -348,6 +352,8 @@
|
|
|
status:vm.status,//任务状态（0未完成，1已完成，2已预约）
|
|
|
}
|
|
|
rehaAPI.calendarPlanDetail(params).then(function(res){
|
|
|
console.log("从后端请求的日历数据")
|
|
|
console.log(JSON.stringify(res))
|
|
|
vm.curTask=vm.searchTask;
|
|
|
vm.curTaskName=vm.searchTaskName;
|
|
|
vm.calendarData=[];
|
|
|
@ -477,6 +483,8 @@
|
|
|
}
|
|
|
rehaAPI.calendarPlanDetailList(params).then(function(res){
|
|
|
if(res.status==200){
|
|
|
console.log("时间轴请求：")
|
|
|
console.log(JSON.stringify(res))
|
|
|
var _currentTimeStamp=+new Date(new Date().setHours(0, 0, 0, 0))
|
|
|
vm.timeAxisData=_.map(res.data||{},function(o){
|
|
|
var _time=o.executeTime.split(' ');
|
lulihong