Commit e1b65e8c authored by 高宇's avatar 高宇

a

parent 20c5307b
...@@ -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()
......
...@@ -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))
......
...@@ -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>
......
...@@ -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
......
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