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 02181328e..2501a2f23 100644 --- a/nezha-fronted/src/assets/css/components/page/tool/ping.scss +++ b/nezha-fronted/src/assets/css/components/page/tool/ping.scss @@ -151,7 +151,7 @@ } } .data-bottom{ - height: calc(100% - 50px) !important; + height: 100% !important; overflow: hidden; .details{ padding: 20px; @@ -159,6 +159,9 @@ } } } + .nz-table2{ + flex: 1 !important; + } } .wrap{ diff --git a/nezha-fronted/src/assets/css/components/page/tool/trace.scss b/nezha-fronted/src/assets/css/components/page/tool/trace.scss index 9ed19e8ea..fd254380d 100644 --- a/nezha-fronted/src/assets/css/components/page/tool/trace.scss +++ b/nezha-fronted/src/assets/css/components/page/tool/trace.scss @@ -1,11 +1,15 @@ +.ping-popover.el-popover { + padding: 0; + margin-top: 5px; +} .trace{ .top-tool-left{ // align-items: center; } .ipInput{ - width:250px; + width:280px; min-height: 36px; - max-height: 62px; + max-height: 128px; } .ti-tag-input{ background: transparent ; @@ -13,7 +17,8 @@ .vue-tags-input,.ti-new-tag-input { .ti-input { min-height: 36px; - max-height: 62px; + //max-height: 62px; + height: 100%; overflow-y: auto; box-sizing: border-box; border-radius: 2px; @@ -26,6 +31,7 @@ color: $--color-text-regular !important; } .ti-tags{ + height: 24px; .ti-tag{ word-break: break-all; } @@ -145,7 +151,7 @@ } } .data-bottom{ - height: calc(100% - 50px) !important; + height: 100% !important; overflow: hidden; .details{ padding: 20px; @@ -153,6 +159,9 @@ } } } + .nz-table2{ + flex: 1 !important; + } } .wrap{ diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js index 69244d5cd..250d75e46 100644 --- a/nezha-fronted/src/components/common/mixin/table.js +++ b/nezha-fronted/src/components/common/mixin/table.js @@ -131,6 +131,9 @@ export default { } this.$set(item, 'alertNumtooltipShow', flag) } + }, + rowKey (row) { // ping trace的 唯一key + return row.ip + '-' + row.dc.id } }, watch: { diff --git a/nezha-fronted/src/components/common/table/tool/pingTable.vue b/nezha-fronted/src/components/common/table/tool/pingTable.vue index 96292d368..92cb134b4 100644 --- a/nezha-fronted/src/components/common/table/tool/pingTable.vue +++ b/nezha-fronted/src/components/common/table/tool/pingTable.vue @@ -2,7 +2,8 @@ diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 54e48f058..2529ac76f 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -86,14 +86,14 @@