diff --git a/src/components/e-charts/line_chart.vue b/src/components/e-charts/line_chart.vue index 3d622b36546b232c6233e1e0103edc1c10f1e05a..42a01d2a19a14e33a5d16bedf6adca66c77d63ac 100644 --- a/src/components/e-charts/line_chart.vue +++ b/src/components/e-charts/line_chart.vue @@ -118,7 +118,7 @@ export default { grid: { top: 10, left:10, - right:10, + right:30, bottom:30, containLabel: true, }, diff --git a/src/components/e-charts/multiple_circle.vue b/src/components/e-charts/multiple_circle.vue index cfef8686322f047f43ae82d0ba2a3d3bcd55da6d..6f8d56e19ce60cccea76e686a81d4b63ed2cdc45 100644 --- a/src/components/e-charts/multiple_circle.vue +++ b/src/components/e-charts/multiple_circle.vue @@ -132,7 +132,6 @@ export default { data: data } ]; - var options = { title: { text: this.show_center_data ? total : "", diff --git a/src/pages/service_shop/shop_car_apply.vue b/src/pages/service_shop/shop_car_apply.vue index d2fbef8ae702bb3c6fe5e3d1beb42a0eb3d38102..b282991889781ad3dce357899a95fc1bf6cbefa4 100644 --- a/src/pages/service_shop/shop_car_apply.vue +++ b/src/pages/service_shop/shop_car_apply.vue @@ -321,7 +321,7 @@ export default { this.service_arr[l]["size"] = "规格:" + (e.spec_id == 0 ? "部署" : "开发"); this.service_arr[l]["applytype"] = - "申请方式:" + (e.duration_unit == 1 ? "月" : "年"); + "申请方式:" + (e.duration_method == 1 ? "月" : "年"); this.service_arr[l]["num"] = e.duration; this.service_arr[l]["isMg"] = false; this.service_arr[l]["isapp"] = true; @@ -350,10 +350,10 @@ export default { } }); this.service_arr[l]["applytype"] = - "申请方式:" + (e.duration_unit == 1 ? "月" : "年"); + "申请方式:" + (e.duration_method == 1 ? "月" : "年"); this.service_arr[l]["num"] = e.duration; this.service_arr[l]["isMg"] = e.service.openness == 3; - this.service_arr[l]["data"] = JSON.parse(e.service.res_fields); + this.service_arr[l]["data"] = e.service.res_fields?JSON.parse(e.service.res_fields):'[]'; console.log(this.service_arr[l]["data"]); this.service_arr[l]["isapp"] = false; } diff --git a/src/pages/workbench/yygl/app_debugger.vue b/src/pages/workbench/yygl/app_debugger.vue index 982e5080fa6014c531811c45ee968f86d06f23ab..fc1e39117e9e2f0b33ed6fab7c5ed8eaf5e1aeed 100644 --- a/src/pages/workbench/yygl/app_debugger.vue +++ b/src/pages/workbench/yygl/app_debugger.vue @@ -207,6 +207,14 @@ export default { changyaml(n){ this.now_yaml = n }, + adelete(val){ + this.$http + .delete(`/awecloud/rest/kubernetes/api/v1/_raw/pod/namespace/${val.namespace}/name/${val.name}`) + .then(response => { + this.$message.success('删除成功') + this.get_list_pod() + }) + }, get_namespace_list(){ this.$http .get(`/apaas/hubApi/market/namespaces`)