Merge branch 'master' of https://github.com/Helltab/dubbo-kubernetes into feature/ui/framework/vue3
* 'master' of https://github.com/Helltab/dubbo-kubernetes:
feat: add traffic page
feat: add traffic page
feat: add internationalization
feat: add mock data
# Conflicts:
# ui-vue3/src/components/SearchTable.vue
diff --git a/ui-vue3/src/api/service/metricInfo.ts b/ui-vue3/src/api/service/metricInfo.ts
index 364472b..3cf499f 100644
--- a/ui-vue3/src/api/service/metricInfo.ts
+++ b/ui-vue3/src/api/service/metricInfo.ts
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-
-import request from "@/base/http/request";
+import request from '@/base/http/request'
export const queryPromSql = (params: any): Promise<any> => {
- return request({
- url: 'http://123.56.255.156:9090/api/v1/query',
- method: 'get',
- params
- })
-}
\ No newline at end of file
+ return request({
+ url: 'http://123.56.255.156:9090/api/v1/query',
+ method: 'get',
+ params
+ })
+}
diff --git a/ui-vue3/src/views/home/index.vue b/ui-vue3/src/views/home/index.vue
index 2a96b94..0d427f4 100644
--- a/ui-vue3/src/views/home/index.vue
+++ b/ui-vue3/src/views/home/index.vue
@@ -80,7 +80,7 @@
import { getMetricsMetadata } from '@/api/service/serverInfo'
import { useRoute } from 'vue-router'
import { Chart } from '@antv/g2'
-import {queryPromSql} from "@/api/service/metricInfo";
+import { queryPromSql } from '@/api/service/metricInfo'
let __null = PRIMARY_COLOR
@@ -95,9 +95,12 @@
})
onMounted(async () => {
- console.log(await queryPromSql({
- query: "((node_memory_MemTotal_bytes - node_memory_MemFree_bytes - node_memory_Buffers_bytes - node_memory_Cached_bytes) / (node_memory_MemTotal_bytes)) * 100"
- }));
+ console.log(
+ await queryPromSql({
+ query:
+ '((node_memory_MemTotal_bytes - node_memory_MemFree_bytes - node_memory_Buffers_bytes - node_memory_Cached_bytes) / (node_memory_MemTotal_bytes)) * 100'
+ })
+ )
let clusterData = (await getClusterInfo({})).data
metricsMetadata.info = <{ [key: string]: string }>(await getMetricsMetadata({})).data
clusterInfo.info = <{ [key: string]: string }>clusterData
