Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/pages/workbench/workPlace.vue

@@ -217,13 +217,13 @@
             <p>
               <span></span> 服务类型分析
             </p>
-            <div :id="fwlx_asy" class="health" style="width:265px;"></div>
+            <div :id="fwlx_asy" class="health" style="width:265px;margin-top:20px;"></div>
           </div>
           <div class="data_charts_left" style="width:285px;">
             <p>
               <span></span> 应用类型分析
             </p>
-            <div :id="yylx_asy" class="health" style="width:265px;"></div>
+            <div :id="yylx_asy" class="health" style="width:265px;margin-top:20px;"></div>
           </div>
         </div>
       </div>
@@ -1678,8 +1678,9 @@ export default {
           name: "",
           type: "pie",
           clockWise: false,
-          radius: [51, 55],
+          radius: [52, 54],
           center: ["51%", "45%"],
+          z:5,
           hoverAnimation: false,
           itemStyle: {
             normal: {
@@ -1705,7 +1706,48 @@ export default {
             }
           },
           data: data
-        }
+        },
+        {
+        type:'pie',
+        z:4,
+        center:['51%','45%'],
+        radius:['43%','63%'],
+        hoverAnimation:false,
+        avoidLabelOverlap: false,
+        label: {
+            normal: {
+                show: false
+            },
+            emphasis: {
+                show: false
+            }
+        },
+        labelLine: {
+            normal: {
+                show: false
+            },
+            emphasis: {
+                show: false
+            }
+        },
+        tooltip: {
+            show: false
+        },
+        itemStyle: {
+            normal: {
+                color:'#f6f7fc'
+            }
+        },
+        emphasis:{
+            show:false,
+            itemStyle:{
+                color:'#f6f7fc'
+            }
+        },
+        data: [{
+            value: 1,
+        }],
+    }
       ];
 
       var options = {
@@ -1720,7 +1762,8 @@ export default {
           itemHeight: 10,
           orient: "horizontal",
           data: legendarr,
-          backgroundColor: "#f4f7fc"
+          backgroundColor: "#f4f7fc",
+          borderRadius:8
         },
         toolbox: {
           show: false
@@ -1751,7 +1794,8 @@ export default {
           bottom: 0,
           itemWidth: 10,
           itemHeight: 10,
-          backgroundColor: "#f4f7fc"
+          backgroundColor: "#f4f7fc",
+          borderRadius:8
         },
         xAxis: [
           {
@@ -1869,7 +1913,9 @@ export default {
           data: [dataname[n]],
           itemWidth: 14,
           itemHeight: 10,
-          bottom: 0
+          bottom: 0,
+          backgroundColor: "#f4f7fc",
+          borderRadius:8
         },
         grid: {
           borderColor: "#f2f2f2",
@@ -1914,11 +1960,11 @@ export default {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                 {
                   offset: 0,
-                  color: "#0a92c4"
+                  color: "rgba(10,146,196,0.3)"
                 },
                 {
                   offset: 1,
-                  color: "#ffe"
+                  color: 'rgba(255,255,255,0.3)'
                 }
               ])
             }
@@ -1941,12 +1987,14 @@ export default {
   height: 28px;
   line-height: 28px;
   font-size: 12px;
+  border-radius: 4px;
 }
 .data_charts_left .cloud_asy .el-input__inner {
   width: 150px;
   height: 28px;
   line-height: 28px;
   font-size: 12px;
+  border-radius: 4px;
 }
 .data_charts_left .el-input__icon {
   line-height: 28px;
@@ -2145,9 +2193,9 @@ export default {
   color: #0d1847;
 }
 .yy_asy {
-  width: 400px;
+  width: 420px;
   height: 200px;
-  margin: 0px 0 0 0px;
+  margin: 20px 0 0 0px;
 }
 .fwyy {
   width: 420px;