Commit 4e228e3e by fengzhaoyu

修改日程js

parent 2e078179
......@@ -61,7 +61,7 @@ create.Component({
},
() => {
let now = new Date();
let year = now.getUTCFullYear();
let year = now.getFullYear();
let scheduleList = [];
for (let i = 0; i <= year - 2019; i++) {
scheduleList.push(that.returnScheduleList(2019 + i));
......@@ -138,7 +138,7 @@ create.Component({
parseInt(initialTime[1]) - 1,
parseInt(initialTime[2])
);
let initialTimeDateyear = new Date(initialTimeDate).getUTCFullYear();
let initialTimeDateyear = initialTimeDate.getFullYear();
let initialTimeDatemonth =
initialTimeDate.getMonth() + 1 < 10
? "0" + (initialTimeDate.getMonth() + 1)
......@@ -152,7 +152,7 @@ create.Component({
let rule = RRule.fromString(
`${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
);
rule.options.tzid = "";
// rule.options.tzid = "";
// 判断是否需要剔除某一天
if (item.excludePlanDates) {
// 拿到剔除日期的list
......@@ -160,11 +160,10 @@ create.Component({
item.excludePlanDates.split(",")
);
rule.all().map(item2 => {
let excludeDate = getFormatDate(item2, "yyyyMMdd", "-");
let time = new Date(item2);
time.setHours(time.getHours() - 8);
let hasExclude =
excludeDateList.scheduleList.indexOf(excludeDate) === -1;
let hasExclude = excludeDateList.scheduleList.indexOf(excludeDate) === -1;
let excludeDate = getFormatDate(time, "yyyyMMdd", "-");
if (
new Date(time).getTime() < excludeDateList.templateList &&
hasExclude
......@@ -190,7 +189,7 @@ create.Component({
scheduleTemplateId: item.id,
startTime: startTime,
title: item.title,
planDate: getFormatDate(startTime, "yyyyMMdd", "-")
planDate: getFormatDate(time, "yyyyMMdd", "-")
}
);
}
......@@ -320,7 +319,7 @@ create.Component({
DateMap.forEach(function (value, key, map) {
const keyDate = new Date(key);
if (keyDate.getDay() === 0) {
let rangeYear1 = keyDate.getUTCFullYear();
let rangeYear1 = keyDate.getFullYear();
let rangeMonth1 = keyDate.getMonth();
let rangeDay1 = keyDate.getDate();
let rangeDate = new Date(rangeYear1, rangeMonth1, rangeDay1 + 6);
......
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