Merge branch 'master' of http://47.92.102.27:20005/xjc/xjc-vue

# Conflicts:
#	src/views/xjc-integratedmachine/wakeup/rainbow/FollowRingChart.vue

src/views/xjc-integratedmachine/wakeup/rainbow/FollowRingChart.vue

@@ -232,7 +232,7 @@
             isBegin.value = false
         })
 
-        alert("绘制完成")
+
     }
 
 

src/views/xjc-integratedmachine/wakeup/rainbow/index.vue

@@ -106,7 +106,7 @@ p{
     background: black;
     border-radius: 35px 35px 35px 35px;
     margin: 13px auto 0;
-    padding-top: 25px;
+    /*padding-top: 25px;*/
     position: relative;
 
     .text-info{
@@ -226,7 +226,7 @@ p{
   }
   .content-bottom{
     width: 100%;
-    height: 270px;
+    height: 100%;
     display: flex;
     justify-content: space-between;
     position: relative;
@@ -268,6 +268,14 @@ p{
     cursor: pointer;
     user-select: none; /* 防止拖拽时选中文字 */
   }
+  .ring-chart1 {
+    width: 800px;
+    height: 800px;
+    position: absolute;
+    left: 0px;
+    top : 0px;
+    background: #ffff00;
+  }
 }
 
 </style>