From 5a27e33d292cbdae8dc1b1466fe526bbb3a13633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Mon, 11 Jan 2021 14:56:43 +0800
Subject: [PATCH] fixed

---
 src/components/general/codes.vue              |  2 +-
 src/pages/authority/user/organizationuser.vue |  2 +-
 src/pages/workbench/fwgl/serviceDetail.vue    | 56 ++++++++++---------
 src/pages/workbench/workPlace.vue             |  2 +-
 src/pages/workbench/yygl/app_debugger.vue     |  3 +-
 5 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/components/general/codes.vue b/src/components/general/codes.vue
index 06860f6..b4ae726 100644
--- a/src/components/general/codes.vue
+++ b/src/components/general/codes.vue
@@ -46,7 +46,7 @@ export default {
     }
     if (this.datas) {
       let obj = "";
-      console.log(typeof JSON.parse(this.datas));
+      // console.log(typeof JSON.parse(this.datas));
       try {
         if (typeof JSON.parse(this.datas) == "object") {
           obj = JSON.stringify(JSON.parse(this.datas), null, "\t");
diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue
index dc7f88b..604a0bb 100644
--- a/src/pages/authority/user/organizationuser.vue
+++ b/src/pages/authority/user/organizationuser.vue
@@ -497,7 +497,7 @@ export default {
             this.backPage();
             this.$message.success("新增成功");
           } else {
-            this.$message.error("新增失败");
+            this.$message.error(response.data.errMsg);
           }
         })
         .catch((response) => {
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index b21b707..ea58e94 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -798,12 +798,12 @@ export default {
           minWidth: "20%",
           align: "left",
         },
-        {
-          prop: "dyr",
-          label: "调用人",
-          width: "100px",
-          align: "center",
-        },
+        // {
+        //   prop: "dyr",
+        //   label: "调用人",
+        //   width: "100px",
+        //   align: "center",
+        // },
         {
           prop: "dyyw",
           label: "调用业务系统",
@@ -816,30 +816,36 @@ export default {
           minWidth: "20%",
           align: "left",
         },
-        {
-          prop: "cjms",
-          label: "场景描述",
-          minWidth: "40%",
-          align: "left",
-        },
-        {
-          prop: "sqgg",
-          label: "申请规格",
-          minWidth: "40%",
-          align: "center",
-        },
-        {
-          prop: "sqsc",
-          label: "申请时长",
-          minWidth: "40%",
-          align: "center",
-        },
+        // {
+        //   prop: "cjms",
+        //   label: "场景描述",
+        //   minWidth: "40%",
+        //   align: "left",
+        // },
+        // {
+        //   prop: "sqgg",
+        //   label: "申请规格",
+        //   minWidth: "40%",
+        //   align: "center",
+        // },
+        // {
+        //   prop: "sqsc",
+        //   label: "申请时长",
+        //   minWidth: "40%",
+        //   align: "center",
+        // },
         {
           prop: "sqsj",
           label: "申请调用时间",
           width: "160px",
           align: "right",
         },
+        {
+          prop: "state",
+          label: "调用状态",
+          width: "160px",
+          align: "right",
+        },
       ],
       header_gz_process_arr: [
         {
@@ -1778,7 +1784,7 @@ export default {
             this.sizeset_flag = false;
             this.getsize_arr();
           } else {
-            this.$message.error("保存失败");
+            this.$message.error(response.data.errMsg);
           }
         });
     },
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 0ca57e4..1340abe 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -893,7 +893,7 @@ export default {
             pic: require("@/assets/imgs/ic_gongzuoquyu.png"),
             bg: "#e7fdfc",
             color: "#25bdb1",
-            type: "earnings_money",
+            type: "workplace_count",
             num: ""
           }
         ],
diff --git a/src/pages/workbench/yygl/app_debugger.vue b/src/pages/workbench/yygl/app_debugger.vue
index 1536489..813cdb0 100644
--- a/src/pages/workbench/yygl/app_debugger.vue
+++ b/src/pages/workbench/yygl/app_debugger.vue
@@ -314,7 +314,8 @@ export default {
         .get(`/apaas/rest/kubernetes/api/v1/_raw/pod/namespace/${val.namespace}/name/${val.name}`)
         .then(response => {
             console.log(response.data);
-            this.yaml_arr = yaml.stringify(response.data)
+            this.yaml_arr = yaml.stringify(response.data);
+            console.log(this.yaml_arr)
             this.code_arr = JSON.stringify(json.load(this.yaml_arr), null, 2);
             this.$refs.actiondialog.show();
           
-- 
2.26.0