fix(项目报告): 修复项目报告无法选择当前日期的问题
--bug=1009783 --user=宋天阳 【报表统计】github#9565,报表统计的时间控件现在今天查询无法满足 https://www.tapd.cn/55049933/s/1096544
This commit is contained in:
parent
0a193d6421
commit
ad7d54b936
|
@ -1421,7 +1421,7 @@ public class MockConfigService {
|
|||
mockExpect.setMockConfigId(mockConfig.getId());
|
||||
mockExpect.setId(expectInDb.getId());
|
||||
mockExpect.setUpdateTime(System.currentTimeMillis());
|
||||
mockExpectConfigMapper.updateByPrimaryKey(mockExpect);
|
||||
mockExpectConfigMapper.updateByPrimaryKeyWithBLOBs(mockExpect);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
<el-date-picker
|
||||
size="small"
|
||||
v-model="option.times"
|
||||
align="right"
|
||||
type="datetimerange"
|
||||
value-format="timestamp"
|
||||
:range-separator="$t('api_monitor.to')"
|
||||
:start-placeholder="$t('commons.date.start_date')"
|
||||
:end-placeholder="$t('commons.date.end_date')"
|
||||
:picker-options="datePickerOptions"
|
||||
style="margin-left: 10px;width: 100%">
|
||||
style="margin-right: 10px;width: 100%">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div v-if="option.timeType === 'dynamicTime'" style="width: 70%;margin-left: 20px;float: left">
|
||||
|
@ -219,14 +219,6 @@ export default {
|
|||
id: 'id',
|
||||
label: 'label',
|
||||
},
|
||||
datePickerOptions: {
|
||||
disabledDate: (time) => {
|
||||
let nowDate = new Date();
|
||||
let oneDay = 1000 * 60 * 60 * 24;
|
||||
let oneYearLater = new Date(nowDate.getTime() + (oneDay * 365));
|
||||
return time.getTime() > nowDate || time.getTime() > oneYearLater;//注意是||不是&&
|
||||
}
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
Loading…
Reference in New Issue