gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.4-report' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

Browse Source
This commit is contained in:
zhangyu
2022-06-29 09:22:08 +08:00
parent edb3286859 a1ca417813
commit 0fb9221b2c
1 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nezha-fronted/src/components/common/rightBox/panelBox.vue
View File

@@ -194,6 +194,7 @@
:format="timeFormatStrToDatePickFormat(dateFormatStr)" :format="timeFormatStrToDatePickFormat(dateFormatStr)"
popper-class="panel-time-picker-popper right-box-select-top" popper-class="panel-time-picker-popper right-box-select-top"
prefix-icon=" " prefix-icon=" "
@change="changeData(true)"
size="mini" size="mini"
type="datetime"> type="datetime">
</my-date-picker> </my-date-picker>
@@ -208,6 +209,7 @@
:format="timeFormatStrToDatePickFormat(dateFormatStr)" :format="timeFormatStrToDatePickFormat(dateFormatStr)"
popper-class="panel-time-picker-popper right-box-select-top" popper-class="panel-time-picker-popper right-box-select-top"
prefix-icon=" " prefix-icon=" "
@change="changeData(false)"
size="mini" size="mini"
type="datetime"> type="datetime">
</my-date-picker> </my-date-picker>
@@ -577,6 +579,23 @@ export default {
}).catch(() => { }).catch(() => {
this.prevent_opt.save = false this.prevent_opt.save = false
}) })
},
changeData (flag) {
if (flag) {
if (this.editPanel.param.report.schedule.etime) {
if (this.editPanel.param.report.schedule.stime > this.editPanel.param.report.schedule.etime) {
this.editPanel.param.report.schedule.stime = ''
this.$message.error(this.$t('alert.silence.timeError'))
}
}
} else {
if (this.editPanel.param.report.schedule.stime) {
if (this.editPanel.param.report.schedule.stime > this.editPanel.param.report.schedule.etime) {
this.editPanel.param.report.schedule.etime = ''
this.$message.error(this.$t('alert.silence.timeError'))
}
}
}
} }
}, },
watch: { watch: {