Compare commits

..

No commits in common. "5e4227ba2586ff42c4f627e3c5ab118307b1905e" and "43e824f958aa96f54191edb1f8566ea3cf81add1" have entirely different histories.

View File

@ -108,9 +108,8 @@ export default {
let start = moment().format('yyyy-MM-DD'); let start = moment().format('yyyy-MM-DD');
let end = moment().format('yyyy-MM-DD'); let end = moment().format('yyyy-MM-DD');
this.formConfig[0].defaultSelect = [start, end]; this.formConfig[0].defaultSelect = [start, end];
this.queryParams.startTime = this.queryParams.startTime = moment(start + ' 00:00:00').valueOf();
moment(start + ' 00:00:00').valueOf() + 25200000; this.queryParams.endTime = moment(end + ' 23:59:59').valueOf();
this.queryParams.endTime = moment(end + ' 23:59:59').valueOf() + 25200000;
this.getList(); this.getList();
}, },
methods: { methods: {
@ -239,10 +238,12 @@ export default {
buttonClick(val) { buttonClick(val) {
if (val.btnName === 'search') { if (val.btnName === 'search') {
if (val.timeVal && val.timeVal.length > 0) { if (val.timeVal && val.timeVal.length > 0) {
this.queryParams.startTime = this.queryParams.startTime = moment(
moment(val.timeVal[0] + ' 00:00:00').valueOf() + 25200000; val.timeVal[0] + ' 00:00:00'
this.queryParams.endTime = ).valueOf();
moment(val.timeVal[1] + ' 23:59:59').valueOf() + 25200000; this.queryParams.endTime = moment(
val.timeVal[1] + ' 23:59:59'
).valueOf();
} }
this.queryParams.lineId = val.lineId; this.queryParams.lineId = val.lineId;
this.getList(); this.getList();