Commit 477cbcdf authored by xiejb's avatar xiejb

添加2天时间筛选

parent 797beb9d
...@@ -158,9 +158,13 @@ export default { ...@@ -158,9 +158,13 @@ export default {
active: true active: true
}, },
{ {
name: '7', name: '2',
active: false active: false
}, },
// {
// name: '7天',
// active: false
// },
{ {
name: '30天', name: '30天',
active: false active: false
...@@ -492,6 +496,10 @@ export default { ...@@ -492,6 +496,10 @@ export default {
_this.showCustomizeDate = false _this.showCustomizeDate = false
_this.getCurrentWeek() _this.getCurrentWeek()
break break
case '2天':
_this.showCustomizeDate = false
_this.getTwoDate()
break
case '今天': case '今天':
_this.showCustomizeDate = false _this.showCustomizeDate = false
_this.getCurrentDate() _this.getCurrentDate()
...@@ -561,6 +569,12 @@ export default { ...@@ -561,6 +569,12 @@ export default {
// return startStop // return startStop
}, },
// 获得当前星期的开始与结束日期 // 获得当前星期的开始与结束日期
getTwoDate () {
var sunday = new Date()
this.moreSearchInfo.time.start = this.getDay(getFormateDate(sunday, 'yyyy-MM-dd'), -1)
this.moreSearchInfo.time.end = getFormateDate(sunday, 'yyyy-MM-dd')
},
// 获得当前星期的开始与结束日期
getCurrentWeek () { getCurrentWeek () {
var sunday = new Date() var sunday = new Date()
this.moreSearchInfo.time.start = this.getDay(getFormateDate(sunday, 'yyyy-MM-dd'), -6) this.moreSearchInfo.time.start = this.getDay(getFormateDate(sunday, 'yyyy-MM-dd'), -6)
......
...@@ -162,8 +162,8 @@ export default { ...@@ -162,8 +162,8 @@ export default {
}, },
// 弹框提示 // 弹框提示
showDialogAction() { showDialogAction() {
Dialog.alert({ this.$dialog.alert({
title: '标题', confirmButtonColor: '#1989fa',
message: '请点击右上角按钮,使用默认浏览器打开本页面!', message: '请点击右上角按钮,使用默认浏览器打开本页面!',
}).then(() => { }).then(() => {
// on close // on close
......
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