diff --git a/src/views/modules/analysis/export/operation.vue b/src/views/modules/analysis/export/operation.vue index 7ce5a4a0..b15653e5 100644 --- a/src/views/modules/analysis/export/operation.vue +++ b/src/views/modules/analysis/export/operation.vue @@ -27,27 +27,16 @@ - - - - - - + + type="daterange" + range-separator="至" + start-placeholder="开始日期" + end-placeholder="结束日期"> @@ -105,23 +94,7 @@ export default { options: [], categorys: [], loading: false, - timeFlag: '1', - pickerBeginDateBefore: { - disabledDate: (time) => { - let beginDateVal = this.dataForm.operationEndTime - if (beginDateVal) { - return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() - } - } - }, - pickerBeginDateAfter: { - disabledDate: (time) => { - let EndDateVal = this.dataForm.operationStartTime - if (EndDateVal) { - return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() - } - } - }, + timeFlag: '1' } }, activated () { diff --git a/src/views/modules/events/item-close-list.vue b/src/views/modules/events/item-close-list.vue index abd4ef78..bbd82ae3 100644 --- a/src/views/modules/events/item-close-list.vue +++ b/src/views/modules/events/item-close-list.vue @@ -128,6 +128,13 @@ align="center" show-overflow-tooltip > + + +