From a3912ca20adcfe97194e5ba72518524eea479c6d Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Thu, 16 Jul 2020 20:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/e-charts/line_chart.vue      | 2 +-
 src/components/e-charts/multiple_circle.vue | 1 -
 src/pages/service_shop/shop_car_apply.vue   | 6 +++---
 src/pages/workbench/yygl/app_debugger.vue   | 8 ++++++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/e-charts/line_chart.vue b/src/components/e-charts/line_chart.vue
index 3d622b3..42a01d2 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 cfef868..6f8d56e 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 d2fbef8..b282991 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 982e508..fc1e391 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`)
-- 
2.26.0