diff --git a/nezha-fronted/src/assets/css/components/common/table/settings/cortexDetailTable.scss b/nezha-fronted/src/assets/css/components/common/table/settings/cortexDetailTable.scss index d9647f4ed..12fba5fb7 100644 --- a/nezha-fronted/src/assets/css/components/common/table/settings/cortexDetailTable.scss +++ b/nezha-fronted/src/assets/css/components/common/table/settings/cortexDetailTable.scss @@ -72,7 +72,8 @@ .config-tab { overflow: hidden; .el-table__body-wrapper { - height: 100%; + height: calc(100% - 40px); + overflow-x: hidden; tbody { tr:hover > td { background-color: $--background-color-empty; diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue index 5e631a057..b323201fd 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue @@ -17,7 +17,8 @@ :loading="tools.loading" :ringTableData='ringTableData' :configTableData='configTableData' - :servicesTableData='servicesTableData'> + :servicesTableData='servicesTableData' + @configval='configval'> @@ -59,6 +60,7 @@ export default { data () { return { tableId: 'cortexDetail', + configMode: 'defaults', configTableData: [], servicesTableData: [], ringTableData: [], @@ -68,6 +70,10 @@ export default { mounted () { }, methods: { + configval (val) { + this.configMode = val + this.getConfigTableData() + }, async getIngesterTableData () { const response = await this.$get('agent/' + this.obj.id + '/cortex/ingester/ring') if (response.code === 200) { @@ -81,7 +87,7 @@ export default { } }, async getConfigTableData () { - const response = await this.$get('agent/' + this.obj.id + '/cortex/config?mode=defaults') + const response = await this.$get('agent/' + this.obj.id + '/cortex/config?mode=' + this.configMode) if (response.code === 200) { this.configTableData = response.data.conent.split(/\n/) this.configTableData.unshift('{') diff --git a/nezha-fronted/src/components/common/table/settings/cortexDetailTable.vue b/nezha-fronted/src/components/common/table/settings/cortexDetailTable.vue index 1c603255c..8e57585d7 100644 --- a/nezha-fronted/src/components/common/table/settings/cortexDetailTable.vue +++ b/nezha-fronted/src/components/common/table/settings/cortexDetailTable.vue @@ -78,8 +78,8 @@ {{indexs? $t('cortex.storeGateway'):$t('cortex.ingester')}} - {{scope.row[item.prop]?momentTz(scope.row[item.prop]):'-'}} - {{scope.row[item.prop]?momentTz(scope.row[item.prop]):'-'}} + + {{scope.row[item.prop]}} - @@ -90,9 +90,10 @@
{{scope.row}}