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

src/pages/data-analysis/org-control.vue

@@ -19,30 +19,32 @@
               style="height:540px;"
             >
               <div style="height:25px;"></div>
-              <gk-circle
-                ref="left_1_r"
-                :data="controlData[0]"
-                :is_word="true"
-                class="left_1_r"
-              ></gk-circle>
-              <gk-circle
-                ref="left_1_r"
-                :data="controlData[1]"
-                :is_word="true"
-                class="left_1_r"
-              ></gk-circle>
-              <gk-circle
-                ref="left_1_r"
-                :data="controlData[2]"
-                :is_word="true"
-                class="left_1_r"
-              ></gk-circle>
-              <gk-circle
-                ref="left_1_r"
-                :data="controlData[3]"
-                :is_word="true"
-                class="left_1_r"
-              ></gk-circle>
+              <div class="block-radius-content circle_container">
+                <gk-circle
+                  ref="left_1_r"
+                  :data="controlData[0]"
+                  :is_word="true"
+                  class="left_1_r"
+                ></gk-circle>
+                <gk-circle
+                  ref="left_1_r"
+                  :data="controlData[1]"
+                  :is_word="true"
+                  class="left_1_r"
+                ></gk-circle>
+                <gk-circle
+                  ref="left_1_r"
+                  :data="controlData[2]"
+                  :is_word="true"
+                  class="left_1_r"
+                ></gk-circle>
+                <gk-circle
+                  ref="left_1_r"
+                  :data="controlData[3]"
+                  :is_word="true"
+                  class="left_1_r"
+                ></gk-circle>
+              </div>
             </block-radius>
           </el-col>
         </el-row>
@@ -314,12 +316,17 @@ export default {
   height: calc(100% - 36px);
   margin-top: 15px;
 }
-.left_1_r {
-  width: 49%;
-  height: 43%;
-  display: inline-block;
+.circle_container {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-items: center;
+}
+.circle_container > .left_1_r {
+  width: calc(50% - 20px);
+  height: calc(50% - 20px);
+  margin: 10px;
 }
-
 .default {
   text-align: center;
 }
@@ -328,12 +335,3 @@ export default {
   height: 230px;
 }
 </style>
-<style>
-.service-control .left_1_r canvas {
-  bottom: 0;
-  right: 0;
-  width: 160px !important;
-  height: 190px !important;
-  margin: 0 auto !important;
-}
-</style>