diff --git a/src/views/modules/analysis/issue/issue-classified-statistic-second.vue b/src/views/modules/analysis/issue/issue-classified-statistic-second.vue index 76ae87be..5f5a6361 100644 --- a/src/views/modules/analysis/issue/issue-classified-statistic-second.vue +++ b/src/views/modules/analysis/issue/issue-classified-statistic-second.vue @@ -27,7 +27,8 @@ :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" format="yyyy-MM-dd" - placeholder="选择日期时间"> + placeholder="选择日期时间" + style="width:200px"> + placeholder="选择日期时间" + style="width:200px"> - {{ $t('query') }} + {{ $t('query') }} @@ -100,17 +102,17 @@ export default { }, pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } }, diff --git a/src/views/modules/analysis/issue/issue-classified-statistic.vue b/src/views/modules/analysis/issue/issue-classified-statistic.vue index 4ea46c6d..9bac7268 100644 --- a/src/views/modules/analysis/issue/issue-classified-statistic.vue +++ b/src/views/modules/analysis/issue/issue-classified-statistic.vue @@ -26,6 +26,7 @@ +
+ placeholder="选择日期时间" + style="width:200px"> + placeholder="选择日期时间" + style="width:200px"> - {{ $t('query') }} + {{ $t('query') }} diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue index 09c16598..97a50ce7 100644 --- a/src/views/modules/analysis/user/gridopening.vue +++ b/src/views/modules/analysis/user/gridopening.vue @@ -10,13 +10,13 @@ :options="options" :props="{ checkStrictly: true }" clearable - style="width:250px"> + style="width:200px"> + style="width:200px">
- + + style="width:200px"> - + + style="width:200px"> @@ -328,7 +325,7 @@ export default { return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } - }, + } } }, created () { @@ -451,11 +448,6 @@ export default { this.dataForm.dept = choosenItem.name this.dataForm.deptId = choosenItem.id }, - setRegistTime () { - console.log(this.time[0]) - this.dataForm.startTime = this.time[0] - this.dataForm.endTime = this.time[1] - }, // 获取总计 getAllCount () { this.isAble = true