diff --git a/nezha-fronted/src/App.vue b/nezha-fronted/src/App.vue index d7335f6aa..d65551a40 100644 --- a/nezha-fronted/src/App.vue +++ b/nezha-fronted/src/App.vue @@ -12,9 +12,9 @@ export default { name: 'App', mounted() { - /*this.$http.get("config.json").then((result)=>{ - this.$axios.defaults.baseURL = result.body.baseUrl; - });*/ + // this.$http.get("config.json").then((result)=>{ + // this.$axios.defaults.baseURL = result.body.baseUrl; + // }); this.$axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; } } diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index 026839fdb..8618624b5 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -45,6 +45,9 @@
{{$t('dashboard.metricPreview.title')}}
+ +
{{$t('dashboard.metricPreview.title')}}
+
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 69cb8369c..831005d2c 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -202,6 +202,7 @@ const en = { }, metricPreview:{ title:'Explore', + inputTip:'Enter a PromQL query' }, refresh:'Refresh',//'刷新' edit:'Edit',//'编辑' diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 68b97530a..549055598 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -326,7 +326,9 @@ }, methods: { show(show) { - this.panelName2 = this.showPanel.name; + if(this.showPanel){ + this.panelName2 = this.showPanel.name; + } this.rightBox.show = show; this.isUrl = false; }, diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue index c1e5c1a6d..2ecffa97c 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue @@ -1,36 +1,42 @@ - + diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue index cc44f07d2..16db86ef1 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue @@ -5,21 +5,20 @@
- Metric   - + Metric   +
- +
-
-
-
-
-
+
+
+
+
@@ -37,7 +36,6 @@ dropDownVisible:false, metricStore:[], metricOptions:[], - cascaderValue:'', } }, created() { @@ -46,7 +44,7 @@ }, methods:{ clearExpression:function(){ - this.expressionList[this.index]=''; + this.expressionChange(); }, addExpression:function(){ this.$emit('addExpression',this.index); @@ -133,7 +131,7 @@ diff --git a/nezha-fronted/src/components/page/dashboard/metricPreview.vue b/nezha-fronted/src/components/page/dashboard/metricPreview.vue index 511838981..98b38f1a7 100644 --- a/nezha-fronted/src/components/page/dashboard/metricPreview.vue +++ b/nezha-fronted/src/components/page/dashboard/metricPreview.vue @@ -10,6 +10,7 @@ +
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index 53754d9e8..30b176dc5 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -1,5 +1,5 @@