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

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

@@ -189,29 +189,31 @@
class="form-item--half-width" class="form-item--half-width"
prop="param.report.schedule.stime" prop="param.report.schedule.stime"
> >
<my-date-picker align="right" class=" " <my-date-picker align="right" class=" "
v-model="editPanel.param.report.schedule.stime" v-model="editPanel.param.report.schedule.stime"
: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=" "
size="mini" @change="changeData(true)"
type="datetime"> size="mini"
</my-date-picker> type="datetime">
</el-form-item> </my-date-picker>
</el-form-item>
<el-form-item <el-form-item
:label="$t('dashboard.panel.endAt')" :label="$t('dashboard.panel.endAt')"
class="form-item--half-width" class="form-item--half-width"
prop="param.report.schedule.etime" prop="param.report.schedule.etime"
> >
<my-date-picker align="right" class=" " <my-date-picker align="right" class=" "
v-model="editPanel.param.report.schedule.etime" v-model="editPanel.param.report.schedule.etime"
: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=" "
size="mini" @change="changeData(false)"
type="datetime"> size="mini"
</my-date-picker> type="datetime">
</el-form-item> </my-date-picker>
</el-form-item>
<el-form-item :label='$t("dashboard.panel.period")' class="range-time" prop="param.report.range.unit"> <el-form-item :label='$t("dashboard.panel.period")' class="range-time" prop="param.report.range.unit">
<el-radio-group v-model="editPanel.param.report.range.unit" size="small"> <el-radio-group v-model="editPanel.param.report.range.unit" size="small">
<el-radio-button label="day">{{ $t("dashboard.panel.prevDay") }}</el-radio-button> <el-radio-button label="day">{{ $t("dashboard.panel.prevDay") }}</el-radio-button>
@@ -577,7 +579,24 @@ 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: {
obj: { obj: {