Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
W
work-log
Project
Project
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
高宇
work-log
Commits
e1b65e8c
Commit
e1b65e8c
authored
Jun 28, 2019
by
高宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a
parent
20c5307b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
16 deletions
+5
-16
calenderGrid.vue
src/components/calendar/analysisCalendar/calenderGrid.vue
+3
-4
list.vue
src/components/calendar/list.vue
+1
-1
leaveMessagePagenation.vue
src/components/common/leaveMessagePagenation.vue
+1
-2
schedulePagenation.vue
src/components/common/schedulePagenation.vue
+0
-9
No files found.
src/components/calendar/analysisCalendar/calenderGrid.vue
View file @
e1b65e8c
...
@@ -145,12 +145,11 @@
...
@@ -145,12 +145,11 @@
end
:
info
.
end
.
valueOf
()
/
1000
end
:
info
.
end
.
valueOf
()
/
1000
}
}
}).
then
(
res
=>
{
}).
then
(
res
=>
{
res
.
event
.
forEach
(
item
=>
{
res
.
forEach
(
item
=>
{
item
.
allDay
=
false
item
.
allDay
=
false
})
})
console
.
log
(
res
.
event
)
successCallback
(
res
)
successCallback
(
res
.
event
)
// this.defaultDate = res.defaultDate
this
.
defaultDate
=
res
.
defaultDate
}).
catch
(
_
=>
{
}).
catch
(
_
=>
{
}).
finally
(()
=>
{
}).
finally
(()
=>
{
$
(
'[data-toggle="tooltip"]'
).
tooltip
()
$
(
'[data-toggle="tooltip"]'
).
tooltip
()
...
...
src/components/calendar/list.vue
View file @
e1b65e8c
...
@@ -157,7 +157,7 @@
...
@@ -157,7 +157,7 @@
},
},
addItem
(
info
,
type
)
{
addItem
(
info
,
type
)
{
this
.
operationPage
=
'addCalendar'
this
.
operationPage
=
'addCalendar'
this
.
operationTitle
=
'
添加
日程'
this
.
operationTitle
=
'
新建
日程'
// this.$router.push({name: 'editProject', params: {id: row.id}})
// this.$router.push({name: 'editProject', params: {id: row.id}})
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
sidePopup
.
show
(
this
.
$refs
[
this
.
operationPage
].
init
(
info
,
type
))
this
.
$refs
.
sidePopup
.
show
(
this
.
$refs
[
this
.
operationPage
].
init
(
info
,
type
))
...
...
src/components/common/leaveMessagePagenation.vue
View file @
e1b65e8c
...
@@ -5,9 +5,8 @@
...
@@ -5,9 +5,8 @@
@
size-change=
"handleSizeChange"
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
@
current-change=
"handleCurrentChange"
:current-page=
"pager.thispage"
:current-page=
"pager.thispage"
:page-sizes=
"[2, 10, 20, 40, 60, 80, 100]"
:page-size=
"pager.pagesize"
:page-size=
"pager.pagesize"
layout=
"total,
sizes,
prev, pager, next, jumper"
layout=
"total, prev, pager, next, jumper"
:total=
"total"
>
:total=
"total"
>
</el-pagination>
</el-pagination>
</section>
</section>
...
...
src/components/common/schedulePagenation.vue
View file @
e1b65e8c
...
@@ -2,10 +2,8 @@
...
@@ -2,10 +2,8 @@
<section
class=
"pull-right page-footer"
>
<section
class=
"pull-right page-footer"
>
<el-pagination
v-if=
"total > pager.pagesize"
class=
""
<el-pagination
v-if=
"total > pager.pagesize"
class=
""
background
background
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
@
current-change=
"handleCurrentChange"
:current-page=
"pager.page"
:current-page=
"pager.page"
:page-sizes=
"[10, 20, 40, 60, 80, 100]"
:page-size=
"pager.pagesize"
:page-size=
"pager.pagesize"
layout=
"total, prev, pager, next, jumper"
layout=
"total, prev, pager, next, jumper"
:total=
"total"
>
:total=
"total"
>
...
@@ -36,13 +34,6 @@ export default {
...
@@ -36,13 +34,6 @@ export default {
// this.$emit('update:pager', this.pager)
// this.$emit('update:pager', this.pager)
},
},
methods
:
{
methods
:
{
handleSizeChange
(
val
)
{
this
.
pager
.
page
=
1
this
.
pager
.
pagesize
=
val
// this.totalcount = this.total
this
.
$emit
(
'update:pager'
,
this
.
pager
)
// this.$parent.loadList()
},
handleCurrentChange
(
val
)
{
handleCurrentChange
(
val
)
{
this
.
pager
.
page
=
val
this
.
pager
.
page
=
val
// this.totalcount = this.total
// this.totalcount = this.total
...
...
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