diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index deb815e7b..35b354dec 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -567,3 +567,7 @@ } } } +.el-table__body-wrapper { + overflow: auto; + background-color: $--table-body-background-color; +} diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss index f6603134c..486af40eb 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss @@ -149,3 +149,14 @@ vertical-align: bottom; color: $--color-text-primary; } +.panel{ + .right-box-chart{ + .ͼ2 .cm-content{ + caret-color:$--color-text-regular; + } + .ͼ1.cm-editor.cm-focused{ + outline: 0px; + padding-left: 5px; + } + } +} diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index ec1a9f676..6b1292755 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -195,7 +195,7 @@
- + diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue index 4ff6979c3..22e233bce 100644 --- a/nezha-fronted/src/components/common/rightBox/panelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue @@ -189,29 +189,31 @@ class="form-item--half-width" prop="param.report.schedule.stime" > - - - + + + - - - + :label="$t('dashboard.panel.endAt')" + class="form-item--half-width" + prop="param.report.schedule.etime" + > + + + {{ $t("dashboard.panel.prevDay") }} @@ -577,7 +579,24 @@ 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: { obj: { diff --git a/nezha-fronted/src/components/common/rightBox/profileBox.vue b/nezha-fronted/src/components/common/rightBox/profileBox.vue index 7d9244bc9..93a76bc20 100644 --- a/nezha-fronted/src/components/common/rightBox/profileBox.vue +++ b/nezha-fronted/src/components/common/rightBox/profileBox.vue @@ -37,7 +37,7 @@ - +
+ { // console.log('error................'+JSON.stringify(error)); if (error) {