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
4e228e3e
Commit
4e228e3e
authored
Apr 08, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改日程js
parent
2e078179
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+7
-8
No files found.
PageComponents/scheduleList/scheduleList.js
View file @
4e228e3e
...
...
@@ -61,7 +61,7 @@ create.Component({
},
()
=>
{
let
now
=
new
Date
();
let
year
=
now
.
get
UTC
FullYear
();
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
).
getUTC
FullYear
();
let
initialTimeDateyear
=
initialTimeDate
.
get
FullYear
();
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
(
startT
ime
,
"yyyyMMdd"
,
"-"
)
planDate
:
getFormatDate
(
t
ime
,
"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
.
get
UTC
FullYear
();
let
rangeYear1
=
keyDate
.
getFullYear
();
let
rangeMonth1
=
keyDate
.
getMonth
();
let
rangeDay1
=
keyDate
.
getDate
();
let
rangeDate
=
new
Date
(
rangeYear1
,
rangeMonth1
,
rangeDay1
+
6
);
...
...
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