Merge branch 'master' into es-6.x · apache/skywalking@b7084a3

Commit

Merge branch 'master' into es-6.x

Browse files

aderm committed Nov 10, 2019

2 parents 0878616 + bfb34a7 commit b7084a3

+1 −0		.gitignore
+6 −0		src/assets/lang/en.ts
+6 −0		src/assets/lang/zh.ts
+2 −1		src/components/index.ts
+2 −2		src/components/rk-echarts.vue
+6 −0		src/components/rk-header.vue
+120 −0		src/components/rk-select.vue
+5 −3		src/components/rk-sidebox.vue
+5 −0		src/router.ts
+77 −0		src/store/modules/comparison/comparison-const.ts
+498 −0		src/store/modules/comparison/comparison-store.ts
+19 −0		src/store/modules/comparison/index.ts
+41 −1		src/store/modules/dashboard/fragments/database.ts
+2 −70		src/store/modules/dashboard/modules/dashboard-data.ts
+11 −0		src/store/mutation-types.ts
+52 −0		src/types/comparison.d.ts
+1 −1		src/types/global.d.ts
+87 −0		src/utils/queryChartData.ts
+104 −0		src/views/components/comparison/chart-line.vue
+45 −0		src/views/components/comparison/comparison-charts.vue
+172 −0		src/views/components/comparison/comparison-config.vue
+20 −0		src/views/components/comparison/index.ts
+69 −0		src/views/containers/comparison.vue