diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss index 2a81d227f..4313ac18c 100644 --- a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss @@ -20,9 +20,11 @@ height: calc(100% - 78px); } .meta2d-project{ + box-sizing: border-box; height: calc(100% - 78px); border: 1px solid; border-color: $--border-color-light !important; + overflow: hidden; } .meta2d-chart { //border: 1px solid; diff --git a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss index 61e9837e4..b33048f91 100644 --- a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss +++ b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss @@ -3,7 +3,8 @@ width: 100%; display: flex; background-color: $--background-color-empty; - overflow-x: auto; + // overflow-x: auto; + overflow-x: hidden; .project-table { //width: calc(100% - 10px) !important; } @@ -20,7 +21,7 @@ width: calc(50% - 10px); margin-right: 10px; min-width: 435px; - overflow: hidden; + // overflow: hidden; //div.page { // textarea { // display: none; diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js index 3422b7bc7..bc5cd4e6d 100644 --- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js +++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js @@ -557,7 +557,6 @@ export default { const moment1 = moment((minTime * 1000 - localOffset + offset * 60 * 1000)) const moment2 = moment((maxTime * 1000 - localOffset + offset * 60 * 1000)) - console.log(minTime, maxTime) const isSameDay = moment1.isSame(moment2, 'day') const isSameMonth = moment1.isSame(moment2, 'month')