|
@@ -1414,13 +1414,19 @@ export default {
|
|
|
const end = new Date()
|
|
|
const start = new Date()
|
|
|
const start2 = new Date()
|
|
|
+ const end2 = new Date()
|
|
|
start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
|
|
|
+ end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 10)
|
|
|
end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
|
|
|
|
|
|
that.tab.table.getdataListParm.parammaps.date = parseTime(start2, '{y}-{m}-{d}')
|
|
|
that.tab.table.getdataListParm.parammaps.startTime = parseTime(start2, '{y}-{m}-{d}')
|
|
|
- that.tab.table.getdataListParm.parammaps.stopTime = parseTime(start2, '{y}-{m}-{d}')
|
|
|
+ that.tab.table.getdataListParm.parammaps.stopTime = parseTime(end2, '{y}-{m}-{d}')
|
|
|
+ that.tab.table.getdataListParm.parammaps.inputDatetime = [start2, end2]
|
|
|
+ // that.tab.table.getdataListParm.parammaps.inputDatetime = [startTime,stopTime]
|
|
|
+ // that.tab.table.getdataListParm.parammaps.inputDatetime[0] = parseTime(start2, '{y}-{m}-{d}')
|
|
|
+ // that.tab.table.getdataListParm.parammaps.inputDatetime[1] = parseTime(start2, '{y}-{m}-{d}')
|
|
|
|
|
|
// start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
|
|
|
that.tab.chartDate[0] = parseTime(start, '{y}-{m}-{d}')
|
|
@@ -1804,21 +1810,38 @@ export default {
|
|
|
this.getTabList()
|
|
|
},
|
|
|
handleNext() {
|
|
|
- if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
|
|
|
- this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
|
|
|
- var stop = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() + 1))
|
|
|
- if (stop > Date.now() - 8.64e7) {
|
|
|
+ // if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
|
|
|
+ // this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
|
|
|
+ // var stop = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() + 1))
|
|
|
+ // if (stop > Date.now() - 8.64e7) {
|
|
|
+ // this.Nextdisabled1 = true
|
|
|
+ // this.Beforedisabled1 = false
|
|
|
+ // } else {
|
|
|
+ // this.Nextdisabled1 = false
|
|
|
+ // this.Beforedisabled1 = false
|
|
|
+ // }
|
|
|
+ // this.tab.table.getdataListParm.parammaps.date = parseTime(stop, '{y}-{m}-{d}')
|
|
|
+ // this.tab.table.getdataListParm.parammaps.startTime = parseTime(stop, '{y}-{m}-{d}')
|
|
|
+ // this.tab.table.getdataListParm.parammaps.stopTime = parseTime(stop, '{y}-{m}-{d}')
|
|
|
+ // this.getTabList()
|
|
|
+ // }
|
|
|
+ if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
|
|
|
+ var start1 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
|
|
|
+ var stop1 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
|
|
|
+ if (stop1 > Date.now() - 8.64e7) {
|
|
|
this.Nextdisabled1 = true
|
|
|
this.Beforedisabled1 = false
|
|
|
} else {
|
|
|
this.Nextdisabled1 = false
|
|
|
this.Beforedisabled1 = false
|
|
|
}
|
|
|
- this.tab.table.getdataListParm.parammaps.date = parseTime(stop, '{y}-{m}-{d}')
|
|
|
- this.tab.table.getdataListParm.parammaps.startTime = parseTime(stop, '{y}-{m}-{d}')
|
|
|
- this.tab.table.getdataListParm.parammaps.stopTime = parseTime(stop, '{y}-{m}-{d}')
|
|
|
- this.getTabList()
|
|
|
+ this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
|
|
|
+ this.tab.table.getdataListParm.parammaps.inputDatetime.push(start1, stop1)
|
|
|
+ this.$forceUpdate()
|
|
|
}
|
|
|
+ this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
|
|
|
+ this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
|
|
|
+ this.getTabList()
|
|
|
},
|
|
|
handleBefore2() {
|
|
|
if (this.tab2.date !== '' && this.tab2.date !== null) {
|