diff --git a/package.json b/package.json
index 6742000703b3e0663813c130f0971158661bd7eb..1660aed5e880221d987076b56342ad08c4ebc465 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"babel-polyfill": "^6.26.0",
"codemirror": "^5.45.0",
"echarts": "^4.8.0",
+ "echarts-liquidfill": "^2.0.6",
"element-ui": "^2.11.1",
"js-yaml": "^3.13.1",
"json2yaml": "^1.1.0",
diff --git a/src/components/allot-info-confirm.vue b/src/components/allot-info-confirm.vue
index 003cd0b8cf3211db0d31d1832ee41851df12f15f..2de4b37c9d0c4335e063b7e64521fab07e97522c 100644
--- a/src/components/allot-info-confirm.vue
+++ b/src/components/allot-info-confirm.vue
@@ -110,7 +110,7 @@ export default {
this.$http
.get("/apaas/service/v3/resource/apply/distributionDisplay", {
params: {
- apply_id: apply_id,
+ apply_id: apply_id
},
})
.then(({ data }) => {
@@ -146,6 +146,7 @@ export default {
params: {
id: this.detail.id,
user_id: this.detail.user_id,
+ namespace: this.detail.namespace
},
})
.then(({ data }) => {
diff --git a/src/components/e-charts/bar-chart.vue b/src/components/e-charts/bar-chart.vue
index 41b06568865c7a501fd87743d98057765ec4e3cd..1bc083d1b85c0f8361c9a6746cee64b6ebe36338 100644
--- a/src/components/e-charts/bar-chart.vue
+++ b/src/components/e-charts/bar-chart.vue
@@ -32,8 +32,12 @@ export default {
}
},
show_split: {
- typr: Boolean,
+ type: Boolean,
default: false
+ },
+ x_router: {
+ type: Number,
+ default: 0
}
},
data: () => ({}),
@@ -60,7 +64,7 @@ export default {
fontSize: 12
},
interval: 0,
- rotate: 30,
+ rotate: self.x_router,
formatter: function(value) {
let valueTxt = "";
if (value.length > 6) {
diff --git a/src/components/e-charts/graph.vue b/src/components/e-charts/graph.vue
index 1c8c341b3a7124fe727c75fe45525b4d7b8b3ea8..7057049186fc59a6bb09534614f51e01cc1c2d5d 100644
--- a/src/components/e-charts/graph.vue
+++ b/src/components/e-charts/graph.vue
@@ -17,9 +17,7 @@ export default {
}
}
},
- data: () => ({
- navList: []
- }),
+ data: () => ({}),
mounted() {},
methods: {
graph() {
@@ -95,7 +93,7 @@ export default {
lineStyle: {
width: 2,
color: "#274fee",
- shadowColor: "rgb(39, 79, 238, 0.3)",
+ shadowColor: "rgb(39, 79, 238, 0.4)",
shadowBlur: 5,
shadowOffsetY: 8
}
@@ -112,7 +110,7 @@ export default {
lineStyle: {
width: 2,
color: "#ef9433",
- shadowColor: "rgb(239, 148, 51, 0.3)",
+ shadowColor: "rgb(239, 148, 51, 0.4)",
shadowBlur: 5,
shadowOffsetY: 8
}
diff --git a/src/components/e-charts/water-polo.vue b/src/components/e-charts/water-polo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6d03beeea59fb448e232ffc27049819ba96795c3
--- /dev/null
+++ b/src/components/e-charts/water-polo.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/topology.vue b/src/components/topology.vue
index 4ba94fc5ca8a878c94673c0775a9a0fa890961ac..866845a6899b38799447591e382f23aca3febbfd 100644
--- a/src/components/topology.vue
+++ b/src/components/topology.vue
@@ -416,7 +416,7 @@ export default {