Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
a0c00ac8
Commit
a0c00ac8
authored
5 years ago
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改rrules时区问题
parent
dbb96ef0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+5
-4
No files found.
PageComponents/scheduleList/scheduleList.js
View file @
a0c00ac8
...
@@ -148,7 +148,7 @@ create.Component({
...
@@ -148,7 +148,7 @@ create.Component({
let
rule
=
RRule
.
fromString
(
let
rule
=
RRule
.
fromString
(
`
${
item
.
recurrenceModel
.
recurrenceRule
}
;DTSTART=
${
DTSTART
}
`
`
${
item
.
recurrenceModel
.
recurrenceRule
}
;DTSTART=
${
DTSTART
}
`
);
);
rule
.
options
.
tzid
=
"
Asia/Hong_Kong
"
;
rule
.
options
.
tzid
=
""
;
// 判断是否需要剔除某一天
// 判断是否需要剔除某一天
if
(
item
.
excludePlanDates
)
{
if
(
item
.
excludePlanDates
)
{
// 拿到剔除日期的list
// 拿到剔除日期的list
...
@@ -176,7 +176,6 @@ create.Component({
...
@@ -176,7 +176,6 @@ create.Component({
{
{
confirmAttendance
:
item
.
confirmAttendance
,
confirmAttendance
:
item
.
confirmAttendance
,
endTime
:
getFormatDate
(
endTime
,
"yyyyMMdd HH:mm:ss"
),
endTime
:
getFormatDate
(
endTime
,
"yyyyMMdd HH:mm:ss"
),
// id: item.id,
scheduleTemplateId
:
item
.
id
,
scheduleTemplateId
:
item
.
id
,
startTime
:
startTime
,
startTime
:
startTime
,
title
:
item
.
title
,
title
:
item
.
title
,
...
@@ -187,12 +186,14 @@ create.Component({
...
@@ -187,12 +186,14 @@ create.Component({
});
});
}
else
{
}
else
{
rule
.
all
().
map
(
item2
=>
{
rule
.
all
().
map
(
item2
=>
{
let
time
=
new
Date
(
item2
);
time
.
setHours
(
time
.
getHours
()
-
8
);
let
startTime
=
let
startTime
=
getFormatDate
(
item2
,
"yyyyMMdd"
)
+
getFormatDate
(
time
,
"yyyyMMdd"
)
+
" "
+
" "
+
item
.
recurrenceModel
.
startTime
;
item
.
recurrenceModel
.
startTime
;
let
endTime
=
new
Date
(
let
endTime
=
new
Date
(
getFormatDate
(
item2
,
"yyyyMMdd"
)
+
getFormatDate
(
time
,
"yyyyMMdd"
)
+
" "
+
" "
+
item
.
recurrenceModel
.
startTime
item
.
recurrenceModel
.
startTime
);
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment