fix: 合并冲突

2023-03-01 15:29:24 +08:00
parent fc5ee1f601
commit 4114dba67c
2 changed files with 2 additions and 0 deletions
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue
@@ -58,6 +58,7 @@ export default {
        }).catch(res => {
          this.ringTableData.push([])
          this.$refs.loading.endLoading()
+          this.loading = false
        })
      }
    }
--- a/nezha-fronted/src/components/common/bottomBox/tabs/lokiStatus.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/lokiStatus.vue
@@ -57,6 +57,7 @@ export default {
          this.getTableData()
        }).catch(res => {
          this.$refs.loading.endLoading()
+          this.loading = false
        })
      }
    }