Merge pull request 'projects/mesxc-zjl' (#369) from projects/mesxc-zjl into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #369
This commit is contained in:
commit
5e4227ba25
@ -108,8 +108,9 @@ export default {
|
||||
let start = moment().format('yyyy-MM-DD');
|
||||
let end = moment().format('yyyy-MM-DD');
|
||||
this.formConfig[0].defaultSelect = [start, end];
|
||||
this.queryParams.startTime = moment(start + ' 00:00:00').valueOf();
|
||||
this.queryParams.endTime = moment(end + ' 23:59:59').valueOf();
|
||||
this.queryParams.startTime =
|
||||
moment(start + ' 00:00:00').valueOf() + 25200000;
|
||||
this.queryParams.endTime = moment(end + ' 23:59:59').valueOf() + 25200000;
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
@ -238,12 +239,10 @@ export default {
|
||||
buttonClick(val) {
|
||||
if (val.btnName === 'search') {
|
||||
if (val.timeVal && val.timeVal.length > 0) {
|
||||
this.queryParams.startTime = moment(
|
||||
val.timeVal[0] + ' 00:00:00'
|
||||
).valueOf();
|
||||
this.queryParams.endTime = moment(
|
||||
val.timeVal[1] + ' 23:59:59'
|
||||
).valueOf();
|
||||
this.queryParams.startTime =
|
||||
moment(val.timeVal[0] + ' 00:00:00').valueOf() + 25200000;
|
||||
this.queryParams.endTime =
|
||||
moment(val.timeVal[1] + ' 23:59:59').valueOf() + 25200000;
|
||||
}
|
||||
this.queryParams.lineId = val.lineId;
|
||||
this.getList();
|
||||
|
Loading…
Reference in New Issue
Block a user