diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index f35c8db25..521d0edb0 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -263,12 +263,13 @@ -
+
No data
+
 
@@ -303,7 +304,7 @@ export default { obj: Object, panelLock: { type: Boolean, default: false }, hasGroup: { type: Boolean, default: true }, - panelDataList: Array + panelDataList: Array, }, components: { @@ -332,6 +333,7 @@ export default { start: '', end: '' }, + panelLoading: false, extraMarginBottom: 0, // dom额外的margin panelId: '', timer: null, @@ -715,12 +717,13 @@ export default { item.isLoaded = false }) // chart数据存在dataTotalListBak中 - if (response.data.list) { + if (response.data.list.length > 0) { this.dataTotalListBak = response.data.list + this.panelLoading = false } else { this.dataTotalListBak = response.data + this.panelLoading = true } - let chartListTmp = [] // 查询条件带name if (this.filter.searchName) { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index e19291bd6..36a72b50b 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -24,6 +24,7 @@
- {{item.name}} - 2FA + + + + {{item.name}} + 2FA +
@{{item.username}} diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue index c3a3f996a..a08d7bf40 100644 --- a/nezha-fronted/src/components/common/project/popData/assetTable.vue +++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue @@ -16,6 +16,7 @@
- diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index d8be11d33..e9d0cbfe5 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -104,7 +104,7 @@ {{ $t('overall.enabled') }}
-
+
{{ $t('overall.disabled') }}
@@ -133,13 +133,14 @@ - diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue index 2e63fed91..90c46eb56 100644 --- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue @@ -102,13 +102,14 @@ - diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue index 8eaf57601..6823458e8 100644 --- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue @@ -81,13 +81,14 @@ - diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index 03e106738..d6f0d56e7 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -132,13 +132,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue index ba5edfc0e..ae9e058d7 100644 --- a/nezha-fronted/src/components/common/table/settings/agentTable.vue +++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue @@ -69,13 +69,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue index 3a7d843bc..f42001cfa 100644 --- a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue +++ b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue @@ -83,13 +83,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue index d8e2312f5..f33f63c8e 100644 --- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue +++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue @@ -50,13 +50,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue index 689d58ebb..3acce526c 100644 --- a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue @@ -64,13 +64,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue index be9176525..0a4fd074f 100644 --- a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue +++ b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue @@ -83,13 +83,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue index 1a3e2b2ca..15f3e58bd 100644 --- a/nezha-fronted/src/components/common/table/settings/dcTable.vue +++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue @@ -46,7 +46,7 @@ {{ $t('overall.enabled') }}
-
+
{{ $t('overall.disabled') }}
@@ -99,15 +99,15 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue index b0c8b260e..9ce992136 100644 --- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue @@ -184,13 +184,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue index 174334a65..fd344062e 100644 --- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue @@ -56,13 +56,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/menuTable.vue b/nezha-fronted/src/components/common/table/settings/menuTable.vue index 65397f738..49dcf7da3 100644 --- a/nezha-fronted/src/components/common/table/settings/menuTable.vue +++ b/nezha-fronted/src/components/common/table/settings/menuTable.vue @@ -72,13 +72,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue index 6bb037308..928a99b30 100644 --- a/nezha-fronted/src/components/common/table/settings/mibTable.vue +++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue @@ -89,13 +89,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue index 080fbbb55..a71adc682 100644 --- a/nezha-fronted/src/components/common/table/settings/modelTable.vue +++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue @@ -76,13 +76,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue index 8f606ec76..a4db8e4c4 100644 --- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue @@ -81,13 +81,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue index 668288c55..75bb05e7e 100644 --- a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue @@ -45,13 +45,14 @@ - - diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue index d5d32693e..4d17a92e5 100644 --- a/nezha-fronted/src/components/common/table/settings/projectTable.vue +++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue @@ -80,13 +80,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue index 5fe97534f..014ec872b 100644 --- a/nezha-fronted/src/components/common/table/settings/roleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue @@ -64,13 +64,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue index 93db768da..a30087f91 100644 --- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue @@ -103,13 +103,14 @@ - diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue index ed25b3d1d..46be1f65f 100644 --- a/nezha-fronted/src/components/common/table/settings/userTable.vue +++ b/nezha-fronted/src/components/common/table/settings/userTable.vue @@ -54,12 +54,12 @@ @@ -93,13 +93,14 @@ - diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue index 71ec16baf..1afafe1dc 100644 --- a/nezha-fronted/src/components/page/alert/alertRule.vue +++ b/nezha-fronted/src/components/page/alert/alertRule.vue @@ -44,6 +44,7 @@ ref="dataDetail" :orderByFa="orderBy" v-loading="tools.loading" + :loading="tools.loading" :detailViewRightObj="detailViewRightObj" :api="url" :table-data="tableData" diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue index 7b550337a..0a16930d8 100644 --- a/nezha-fronted/src/components/page/config/terminalLog.vue +++ b/nezha-fronted/src/components/page/config/terminalLog.vue @@ -25,6 +25,7 @@ ref="dataDetail" :orderByFa="orderBy" v-loading="tools.loading" + :loading="tools.loading" :detailViewRightObj="detailViewRightObj" :api="url" :table-data="tableData" diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 799c0bcae..e00073546 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -566,6 +566,7 @@ export default { this.$store.state.showPanel.id = 0 this.$store.state.showPanel.name = '' this.$store.state.showPanel.type = 'dashboard' + } else { if (response.msg) { this.$message.error(response.msg)