diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 8b7ae3520..1edc6bd60 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -415,3 +415,9 @@ td .nz-icon-gear:before{ input, textarea { font-family: Inter-Regular !important; } +.message-next{ + vertical-align: bottom; + float: unset; + font-size: 10px; + margin-left: 190px; +} diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss index 31d7fd38b..ec04b7f67 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss @@ -217,3 +217,7 @@ .fz12{ font-size: 12px; } +.el-skeleton__item{ + //background-color: $--background-color-disabled !important; + //background-image: unset !important; +} diff --git a/nezha-fronted/src/assets/css/components/page/config/profile.scss b/nezha-fronted/src/assets/css/components/page/config/profile.scss index f5d494b36..a50ba360e 100644 --- a/nezha-fronted/src/assets/css/components/page/config/profile.scss +++ b/nezha-fronted/src/assets/css/components/page/config/profile.scss @@ -225,7 +225,7 @@ } .list-page.profile-right { width: calc(100% - 370px); - padding: 0px 0px 7px 0px; + padding: 0; pxbox-shadow: 0 1px 2px 0 rgba(0,0,0,0.06); border-radius: 2px; .nz-table2 { diff --git a/nezha-fronted/src/assets/css/components/page/tool/ping.scss b/nezha-fronted/src/assets/css/components/page/tool/ping.scss index 2501a2f23..8fc1ee71d 100644 --- a/nezha-fronted/src/assets/css/components/page/tool/ping.scss +++ b/nezha-fronted/src/assets/css/components/page/tool/ping.scss @@ -251,6 +251,7 @@ } .right-content-box{ width: 380px; + color: $--color-text-primary; } .tools-header-right-content{ margin-left: 30px; @@ -410,3 +411,11 @@ } } +td.el-table__expanded-cell { + padding: 0 0 0 60px; + background-color: $--popover-background-color !important; +} +td.el-table__expanded-cell:hover { + padding: 0 0 0 60px; + background-color: $--background-color-base !important; +} diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index bd66a71b8..31c4d2011 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -253,7 +253,7 @@ $--right-box-sub-title-border-color: $--border-color-light; $--tooltip-background-color: #222329; $--tooltip-border-color: rgba(112,116,122,0.6); /* 17.label*/ -$--label-background-color: #18171D; +$--label-background-color: $--background-color-empty; /*** themes/common.scss是与主题切换无关的变量 ***/ @import './src/common/var.scss'; diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 36d54fa15..63c9fe4de 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -158,11 +158,19 @@ export default { minValue = valueSorted.length ? valueSorted[0][1] : 0 maxValue = valueSorted.length ? valueSorted[valueSorted.length - 1][1] : 0 const unit = chartDataFormat.getUnit(chartUnit) + minValue = minValue > 0 ? 0 : minValue if (!isNaN(maxValue)) { maxValue = Number(maxValue) } else { maxValue = 0 } + if (maxValue < 0) { + maxValue = Math.abs(maxValue) + } + if (Math.abs(minValue) > Math.abs(maxValue)) { + maxValue = Math.abs(minValue) + } + maxValue = maxValue - minValue maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii) // 取最大值后 需要对其进行取整 let oldValue = maxValue let dot = 0 @@ -192,7 +200,7 @@ export default { offset = Number.parseInt(offset) const localOffset = new Date().getTimezoneOffset() * 60 * 1000 * -1 // 默认 一分钟显示时区偏移的结果 if (window.dataJson) { - offset = new Date().getTimezoneOffset()* -1/60 + offset = new Date().getTimezoneOffset() * -1 / 60 } const tData = new Date(value - localOffset + offset * 60 * 60 * 1000) let hour = tData.getHours() diff --git a/nezha-fronted/src/components/chart/chart/legend.vue b/nezha-fronted/src/components/chart/chart/legend.vue index fc080b4e8..39aecf264 100644 --- a/nezha-fronted/src/components/chart/chart/legend.vue +++ b/nezha-fronted/src/components/chart/chart/legend.vue @@ -226,9 +226,21 @@ export default { const chartUnit = chartInfo.unit ? chartInfo.unit : 2 const unit = chartDataFormat.getUnit(chartUnit) minValue = minValue > 0 ? 0 : minValue + if (maxValue < 0) { + maxValue = Math.abs(maxValue) + } + if (Math.abs(minValue) > Math.abs(maxValue)) { + maxValue = Math.abs(minValue) + } maxValue = maxValue - minValue maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii) let oldValue = maxValue + if (maxValue < 0) { + oldValue = Math.abs(maxValue) + } + if (minValue < 0) { + oldValue = Math.abs(maxValue - minValue) + } let dot = 0 if (maxValue == 1) { dot++ diff --git a/nezha-fronted/src/components/chart/chart/line-chart-block.vue b/nezha-fronted/src/components/chart/chart/line-chart-block.vue index 2a338c70e..4b45429bf 100644 --- a/nezha-fronted/src/components/chart/chart/line-chart-block.vue +++ b/nezha-fronted/src/components/chart/chart/line-chart-block.vue @@ -2071,6 +2071,17 @@ export default { const chartUnit = chartInfo.unit ? chartInfo.unit : 2 const unit = chartDataFormat.getUnit(chartUnit) minValue = minValue > 0 ? 0 : minValue + if (!isNaN(maxValue)) { + maxValue = Number(maxValue) + } else { + maxValue = 0 + } + if (maxValue < 0) { + maxValue = Math.abs(maxValue) + } + if (Math.abs(minValue) > Math.abs(maxValue)) { + maxValue = Math.abs(minValue) + } maxValue = maxValue - minValue maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii) let oldValue = maxValue diff --git a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue index 69d2fa6cf..02f8dc935 100644 --- a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue +++ b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue @@ -11,7 +11,7 @@
- +