Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
VueElementTemplate
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
黄瑜
VueElementTemplate
Commits
35254b3f
Commit
35254b3f
authored
Apr 28, 2018
by
李静
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a
parent
471e1c8a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
HmFullCalendar.vue
src/views/haomo/components/calendar/HmFullCalendar.vue
+9
-4
index.vue
src/views/haomo/components/calendar/index.vue
+5
-3
No files found.
src/views/haomo/components/calendar/HmFullCalendar.vue
View file @
35254b3f
...
@@ -274,6 +274,9 @@
...
@@ -274,6 +274,9 @@
title
:
{
title
:
{
required
:
false
required
:
false
},
},
events
:
{
required
:
false
},
date
:
{
date
:
{
required
:
false
required
:
false
}
}
...
@@ -443,12 +446,12 @@
...
@@ -443,12 +446,12 @@
dateItem
.
active
=
!
dateItem
.
active
dateItem
.
active
=
!
dateItem
.
active
}
}
// 向上发送本次点击的行程数据
// 向上发送本次点击的行程数据
console
.
log
(
result
)
console
.
log
(
result
,
'--------------------'
)
if
(
result
.
schedule
)
{
if
(
result
.
schedule
)
{
const
currentTime
=
this
.
timestampToTime
(
result
.
schedule
.
date
)
const
currentTime
=
this
.
timestampToTime
(
result
.
schedule
.
date
)
console
.
log
(
currentTime
)
console
.
log
(
currentTime
)
this
.
currentDate
=
currentTime
this
.
currentDate
=
currentTime
this
.
event
=
result
.
schedule
.
title
this
.
event
=
result
.
schedule
.
event
}
}
// this.$emit('dateChange', result)
// this.$emit('dateChange', result)
}
else
{
// 已激活行程提示的,不作反应
}
else
{
// 已激活行程提示的,不作反应
...
@@ -490,18 +493,20 @@
...
@@ -490,18 +493,20 @@
item
.
time
=
moment
(
item
[
self
.
date
]).
format
(
'YYYY-MM-DD'
)
item
.
time
=
moment
(
item
[
self
.
date
]).
format
(
'YYYY-MM-DD'
)
item
.
date
=
moment
(
item
[
self
.
date
]).
format
(
'X'
)
*
1000
item
.
date
=
moment
(
item
[
self
.
date
]).
format
(
'X'
)
*
1000
item
.
title
=
item
[
self
.
title
]
item
.
title
=
item
[
self
.
title
]
item
.
allEvents
=
item
[
self
.
events
]
if
(
saveTime
===
item
.
time
)
{
if
(
saveTime
===
item
.
time
)
{
self
.
schedules
[
self
.
schedules
.
length
-
1
].
event
.
push
(
item
)
self
.
schedules
[
self
.
schedules
.
length
-
1
].
allEvents
.
push
(
item
.
allEvents
)
}
else
{
}
else
{
saveTime
=
item
.
time
saveTime
=
item
.
time
self
.
schedules
.
push
({
self
.
schedules
.
push
({
date
:
item
.
date
,
date
:
item
.
date
,
title
:
item
.
title
,
title
:
item
.
title
,
event
:
[
item
]
allEvents
:
[
item
.
allEvents
]
})
})
}
}
})
})
})
})
console
.
log
(
self
.
schedules
,
'+++++最终+++++++++'
)
}
}
},
},
created
()
{
created
()
{
...
...
src/views/haomo/components/calendar/index.vue
View file @
35254b3f
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
:width=
"width"
:width=
"width"
:schema=
"schema['HmUser']"
:schema=
"schema['HmUser']"
:title=
"title"
:title=
"title"
:events=
"events"
:date=
"date"
:date=
"date"
@
dateChange=
"datechange"
@
dateChange=
"datechange"
@
monthChange=
"monthchange"
@
monthChange=
"monthchange"
...
@@ -26,9 +27,10 @@
...
@@ -26,9 +27,10 @@
return
{
return
{
show
:
false
,
show
:
false
,
width
:
'300px'
,
width
:
'300px'
,
// title为需要传入的事件所对应的的字段名,date为时间所对应的字段
// title为需要传入的事件名所对应的的字段名,date为时间所对应的字段,events为事件所对应的字段,都不是必传
title
:
'username'
,
title
:
''
,
date
:
'createTime'
date
:
'createTime'
,
events
:
'email'
}
}
},
},
filters
:
{
filters
:
{
...
...
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