From 8e0959d3d8eee573da10ce9d094ff9121f54e3c2 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Mon, 13 Jul 2020 11:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=B5=84=E6=BA=90=E8=B6=85=E7=AE=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E4=BB=AA=E8=A1=A8=E5=9B=BE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/fwglList.vue         | 37 +++++++++++--------
 .../fwgl/organizationCloudResource.vue        | 35 ++++++++++--------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 8335a6f..04b24c9 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -1525,23 +1525,28 @@ export default {
       }
 
       return {
-        title: {
-          text: percent + "%",
-          subtext: item.name,
-          x: "center",
-          y: "center",
-          textVerticalAlign: "auto",
-          textStyle: {
-            fontSize: 34,
-            fontWeight: "100",
-            color: ["#0d1847"],
-          },
-          subtextStyle: {
-            fontSize: 12,
-            fontWeight: "100",
-            color: "#707693",
+        title: [
+          {
+            text: percent + "%",
+            x: "center",
+            y: "28%",
+            textStyle: {
+              fontSize: 34,
+              fontWeight: "100",
+              color: ["#0d1847"],
+            },
           },
-        },
+          {
+            text: item.name,
+            x: "center",
+            y: "55%",
+            textStyle: {
+              fontSize: 12,
+              fontWeight: "100",
+              color: "#707693",
+            },
+          },
+        ],
         angleAxis: {
           axisLine: {
             show: false,
diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue
index 738a0ab..0312d99 100644
--- a/src/pages/workbench/fwgl/organizationCloudResource.vue
+++ b/src/pages/workbench/fwgl/organizationCloudResource.vue
@@ -170,23 +170,28 @@ export default {
       }
 
       return {
-        title: {
-          text: percent + "%",
-          subtext: item.name,
-          x: "center",
-          y: "center",
-          textVerticalAlign: "auto",
-          textStyle: {
-            fontSize: 34,
-            fontWeight: "100",
-            color: ["#0d1847"],
+        title: [
+          {
+            text: percent + "%",
+            x: "center",
+            y: "28%",
+            textStyle: {
+              fontSize: 34,
+              fontWeight: "100",
+              color: ["#0d1847"],
+            },
           },
-          subtextStyle: {
-            fontSize: 12,
-            fontWeight: "100",
-            color: "#707693",
+          {
+            text: item.name,
+            x: "center",
+            y: "55%",
+            textStyle: {
+              fontSize: 12,
+              fontWeight: "100",
+              color: "#707693",
+            },
           },
-        },
+        ],
         angleAxis: {
           axisLine: {
             show: false,
-- 
2.26.0