diff --git a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js index 34edf26be4..33ef0d0e05 100644 --- a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js @@ -159,18 +159,10 @@ class TimeDateRangeServiceImpl extends WidgetService { const nowYear = now.getFullYear() const nowDate = now.getDate() - const tarYear = nowYear if (dynamicSuffix === 'before') { - const deffMonth = nowMonth - dynamicPrefix - let diffYear = deffMonth / 12 - if (deffMonth < 0) { - diffYear -= 1 - } - return new Date(tarYear + diffYear, nowMonth - dynamicPrefix % 12, nowDate).getTime() + return new Date(nowYear, nowMonth - dynamicPrefix, nowDate).getTime() } else { - const deffMonth = nowMonth + dynamicPrefix - const diffYear = deffMonth / 12 - return new Date(tarYear + diffYear, deffMonth % 12, nowDate).getTime() + return new Date(nowYear, nowMonth + dynamicPrefix, nowDate).getTime() } } if (dynamicInfill === 'year') { diff --git a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js index 1a9e0c6deb..90c85c6a1b 100644 --- a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js @@ -1,4 +1,6 @@ -import { WidgetService } from '../service/WidgetService' +import { + WidgetService +} from '../service/WidgetService' const leftPanel = { icon: 'iconfont icon-ri', @@ -45,7 +47,9 @@ const drawPanel = { class TimeDateServiceImpl extends WidgetService { constructor(options = {}) { - Object.assign(options, { name: 'timeDateWidget' }) + Object.assign(options, { + name: 'timeDateWidget' + }) super(options) this.filterDialog = true this.showSwitch = false @@ -111,16 +115,10 @@ class TimeDateServiceImpl extends WidgetService { const nowYear = now.getFullYear() const nowDate = now.getDate() - const tarYear = nowYear if (dynamicSuffix === 'before') { - const deffMonth = nowMonth - dynamicPrefix - const diffYear = Math.floor(deffMonth / 12) - - return new Date(tarYear + diffYear, nowMonth - dynamicPrefix % 12, nowDate).getTime() + return new Date(nowYear, nowMonth - dynamicPrefix, nowDate).getTime() } else { - const deffMonth = nowMonth + dynamicPrefix - const diffYear = deffMonth / 12 - return new Date(tarYear + diffYear, deffMonth % 12, nowDate).getTime() + return new Date(nowYear, nowMonth + dynamicPrefix, nowDate).getTime() } } if (dynamicInfill === 'year') { @@ -134,5 +132,7 @@ class TimeDateServiceImpl extends WidgetService { } } } -const timeDateServiceImpl = new TimeDateServiceImpl({ name: 'timeDateWidget' }) +const timeDateServiceImpl = new TimeDateServiceImpl({ + name: 'timeDateWidget' +}) export default timeDateServiceImpl diff --git a/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue b/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue index 06ea0b0cd0..02d0e820af 100644 --- a/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue +++ b/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue @@ -11,7 +11,12 @@ - + @@ -22,12 +27,31 @@
- - + + - - + + @@ -35,9 +59,18 @@ - + - + @@ -46,13 +79,7 @@
- + @@ -71,7 +98,9 @@ diff --git a/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue b/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue index f0b707259b..9241ed82c2 100644 --- a/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue +++ b/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue @@ -223,21 +223,20 @@ export default { .inline-first, .inline { display: flex; - - >>>.el-input--mini { - min-width: 70px; - } - } .inline-first { .el-form-item { margin-bottom: 5px !important; + + .el-form-item__content>.el-input--mini { + min-width: 70px; + } } } .relative-time { - width: 100%; + width: 100% !important; }