diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 163de63a5..16b8dacd8 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -157,7 +157,6 @@ } .top-tools--sub { flex-direction: row-reverse; - overflow: hidden; .top-tool-left { height: 100%; width: 0; // 避免计算错误 diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss index 6d6f82300..e26460726 100644 --- a/nezha-fronted/src/assets/css/components/common/timePicker.scss +++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss @@ -165,7 +165,6 @@ .calendar-popover-text:last-of-type { margin-right: 0; } - .date-range-panel { // height: 460px; width: 500px; @@ -310,9 +309,26 @@ } } } +@media (max-height: 900px) { + .date-range-panel { + .date-range-panel-content-right { + height: 180px; + overflow-y: auto; + } + .date-range-panel-content-left { + height: 180px; + overflow-y: auto; + } + } +} .date-range-panel--top { top: -460px; } +@media (max-height: 900px) { + .date-range-panel--top { + top: -215px; + } +} .el-date-range-picker.el-picker-panel__body__only,.el-picker-panel__body { width: 324px; .el-date-range-picker__header,.el-date-picker__header{ diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue index b2c32d20f..6c9a11b1f 100644 --- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue +++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue @@ -10,6 +10,7 @@ v-if="item.isLoad" :meta2dId="'autoTopology' + item.id + (isFullscreen ? 'screen' : '')" :topoData="item.topoData" + :minScale="0.01" :isPreview="true" :querysArray="item.querysArray" :project="item" diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index 86983547e..b0306d356 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -375,7 +375,8 @@ export default { }, 600) } const subListDom = document.querySelector('.sub-list') // 副列表 - if (subListDom.offsetHeight < 505) { + const height = window.innerHeight > 900 ? 505 : 250 + if (subListDom.offsetHeight < height) { this.$store.dispatch('dispatchTimeBoxClass', 'date-range-panel--top') } else { this.$store.dispatch('dispatchTimeBoxClass', '') diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index 9d0786c00..de4021f6f 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -80,7 +80,7 @@ export default { methods: { init: function () { const meta2dOptions = { - minScale: 0.25, + minScale: this.minScale, maxScale: 2, autoAnchor: false } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 5bc528053..c1653db06 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -149,6 +149,10 @@ export default { type: Boolean, default: false }, + minScale: { + type: Number, + default: 0.25 + }, querysArray: {}, params: {}, project: {},