Merge branch 'dev-3.4-report' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
This commit is contained in:
@@ -194,6 +194,7 @@
|
||||
:format="timeFormatStrToDatePickFormat(dateFormatStr)"
|
||||
popper-class="panel-time-picker-popper right-box-select-top"
|
||||
prefix-icon=" "
|
||||
@change="changeData(true)"
|
||||
size="mini"
|
||||
type="datetime">
|
||||
</my-date-picker>
|
||||
@@ -208,6 +209,7 @@
|
||||
:format="timeFormatStrToDatePickFormat(dateFormatStr)"
|
||||
popper-class="panel-time-picker-popper right-box-select-top"
|
||||
prefix-icon=" "
|
||||
@change="changeData(false)"
|
||||
size="mini"
|
||||
type="datetime">
|
||||
</my-date-picker>
|
||||
@@ -577,6 +579,23 @@ export default {
|
||||
}).catch(() => {
|
||||
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: {
|
||||
|
||||
Reference in New Issue
Block a user