From bf6121ed0a57ec2f92a4837a602be10e834510aa Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 27 Aug 2020 18:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E6=8E=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/e-charts/doubleLine.vue        |  9 +++++----
 src/components/e-charts/gkmultiple_circle.vue |  4 ++--
 src/components/e-charts/line_chart.vue        |  2 +-
 src/pages/data-analysis/org-control.vue       | 13 ++++++++-----
 src/pages/data-analysis/super-control.vue     | 10 +++++-----
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/components/e-charts/doubleLine.vue b/src/components/e-charts/doubleLine.vue
index c6a3361..c29f73c 100644
--- a/src/components/e-charts/doubleLine.vue
+++ b/src/components/e-charts/doubleLine.vue
@@ -82,13 +82,14 @@ export default {
           itemWidth: 10,
           itemHeight: 10,
           orient: "horizontal",
-          backgroundColor: "#f4f7fc"
+          // backgroundColor: "#f4f7fc"
         },
         color:self.colors,
         grid: {
-          left: "1%",
-          right: "4%",
-          bottom: "3%",
+          top: 35,
+          left: 10,
+          right: 30,
+          bottom: 0,
           containLabel: true
         },
         xAxis: [
diff --git a/src/components/e-charts/gkmultiple_circle.vue b/src/components/e-charts/gkmultiple_circle.vue
index bbdf0e6..477166b 100644
--- a/src/components/e-charts/gkmultiple_circle.vue
+++ b/src/components/e-charts/gkmultiple_circle.vue
@@ -114,7 +114,7 @@ export default {
           type: "pie",
           clockWise: false,
           radius: [65, 70],
-          center: ["50%", "50%"],
+          center: ["50%", "48%"],
           hoverAnimation: false,
           itemStyle: {
             normal: {
@@ -157,7 +157,7 @@ export default {
           show: false
         },
         legend: {
-          bottom: -5,
+          bottom: 0,
           left: "center",
           itemWidth: 10,
           itemHeight: 10,
diff --git a/src/components/e-charts/line_chart.vue b/src/components/e-charts/line_chart.vue
index 0b8463e..ee472aa 100644
--- a/src/components/e-charts/line_chart.vue
+++ b/src/components/e-charts/line_chart.vue
@@ -143,7 +143,7 @@ export default {
         color: this.zzfw ? color2 : color,
         legend: {
           show: yarr.length >= 2, //是否显示图例
-          right: "center",
+          // right: "center",
           bottom: 0,
           itemWidth: 10,
           itemHeight: 10,
diff --git a/src/pages/data-analysis/org-control.vue b/src/pages/data-analysis/org-control.vue
index 4c07b46..e1168c9 100644
--- a/src/pages/data-analysis/org-control.vue
+++ b/src/pages/data-analysis/org-control.vue
@@ -62,14 +62,14 @@
                     :data="mult_data_state"
                     :show_center_data="false"
                     :bar_width="10"
-                    style="height:200px; margin-top:0"
+                    style="height:200px;margin-top:0;"
                   ></gkmultiple-circle>
                 </el-col>
                 <el-col :span="12">
                   <line-chart
                     :data="line_data"
                     :zzfw="true"
-                    style="height:200px;width:400px"
+                    style="height:200px;"
                     :showShadow="false"
                   ></line-chart>
                 </el-col>
@@ -82,7 +82,10 @@
               :show_header="true"
               title="应用构建数量排名"
             >
-              <doubleLine :data="doubleData"></doubleLine>
+              <doubleLine
+                :data="doubleData"
+                style="margin-top: -20px;"
+              ></doubleLine>
             </block-radius>
           </el-col>
         </el-row>
@@ -253,11 +256,11 @@ export default {
         ],
         seriesData: [
           {
-            name: "服务数量",
+            name: "含敏感字段的服务",
             data: [300, 400, 350, 280, 480, 520, 500, 460],
           },
           {
-            name: "应用数量",
+            name: "不含敏感字段的服务",
             data: [300, 350, 400, 280, 320, 450, 400, 350],
           },
         ],
diff --git a/src/pages/data-analysis/super-control.vue b/src/pages/data-analysis/super-control.vue
index 4c07b46..44565ab 100644
--- a/src/pages/data-analysis/super-control.vue
+++ b/src/pages/data-analysis/super-control.vue
@@ -62,14 +62,14 @@
                     :data="mult_data_state"
                     :show_center_data="false"
                     :bar_width="10"
-                    style="height:200px; margin-top:0"
+                    style="height:200px;margin-top:0;"
                   ></gkmultiple-circle>
                 </el-col>
                 <el-col :span="12">
                   <line-chart
                     :data="line_data"
                     :zzfw="true"
-                    style="height:200px;width:400px"
+                    style="height:200px;"
                     :showShadow="false"
                   ></line-chart>
                 </el-col>
@@ -82,7 +82,7 @@
               :show_header="true"
               title="应用构建数量排名"
             >
-              <doubleLine :data="doubleData"></doubleLine>
+              <doubleLine :data="doubleData" style="margin-top: -20px;"></doubleLine>
             </block-radius>
           </el-col>
         </el-row>
@@ -253,11 +253,11 @@ export default {
         ],
         seriesData: [
           {
-            name: "服务数量",
+            name: "含敏感字段的服务",
             data: [300, 400, 350, 280, 480, 520, 500, 460],
           },
           {
-            name: "应用数量",
+            name: "不含敏感字段的服务",
             data: [300, 350, 400, 280, 320, 450, 400, 350],
           },
         ],
-- 
2.26.0