소스 검색

[feat]彩虹图页面合并

byq 2 주 전
부모
커밋
3242c3ba07

+ 9 - 7
src/views/xjc-integratedmachine/wakeup/career_maturity/evaluation.vue

@@ -8,11 +8,11 @@
           <img src="@/assets/images/wakeup/maturity/shadow-bg.png" >
         </div>
         <div>
-          <img src="@/assets/images/wakeup/maturity/shadow-bg.png" >
-          <img src="@/assets/images/wakeup/maturity/shadow-bg.png" >
-          <img src="@/assets/images/wakeup/maturity/shadow-bg.png" >
-          <img src="@/assets/images/wakeup/maturity/shadow-bg.png" >
-          <img src="@/assets/images/wakeup/maturity/shadow-bg.png" >
+          <img src="@/assets/images/wakeup/maturity/btn1.png" >
+          <img src="@/assets/images/wakeup/maturity/btn2.png" >
+          <img src="@/assets/images/wakeup/maturity/btn3.png" >
+          <img src="@/assets/images/wakeup/maturity/btn4.png" >
+<!--          <img src="@/assets/images/wakeup/maturity/btn5.png" >-->
         </div>
       </div>
       <div></div>
@@ -93,13 +93,15 @@ onMounted(() => {
     position: absolute;
     top: 123px;
     bottom: 0;
+    display: flex;
+    justify-content: center;
    .content-img{
      width: 1187px;
-     height: 345px;
+     height: 424px;
      border: 1px solid;
      img{
        width: 1187px;
-       height: 345px;
+       height: 424px;
      }
    }
   }

+ 2 - 1
src/views/xjc-integratedmachine/wakeup/rainbow/FollowRingChart.vue

@@ -277,10 +277,11 @@
     }
 
     .ring-chart {
-        width: 1832px;
+        width: 1704px;
         height: 910px;
         cursor: pointer;
          border: 1px solid white;
+         margin-top: 219px;
     }
 
     .instructions {

+ 12 - 8
src/views/xjc-integratedmachine/wakeup/rainbow/index.vue

@@ -2,9 +2,12 @@
   <div class="development_stage">
     <head-component :headinfo=headinfo></head-component>
     <div class="page-content">
-      <div class="page-box">
-        <FollowRingChart id="ring-chart1" class="ring-chart1" :chartProps="chartPrpps1"/>
+      <div style="display: flex;justify-content: center;width: 1890px;height: 912px;margin-top: 13px">
+        <div class="page-box">
+          <FollowRingChart id="ring-chart1" class="ring-chart1" :chartProps="chartPrpps1"/>
+        </div>
       </div>
+
     </div>
   </div>
 
@@ -30,15 +33,14 @@ function setHeadinfo(){
 
 const chartPrpps1 = ref({
   // left : 100,
-  // top : 200,
-  bottom:900,
+  top : 106,
   width : 1700,
   height : 1700,
   borderColor : "#998877",
   color :"#ff00ff",
   bncolor : "#ffffff",
   radiusMax : '100%',
-  radiusMin : '97%',
+  radiusMin : '96%',
   isFinish : false
 })
 const position = reactive({ x: 10, y: 10 });
@@ -102,6 +104,8 @@ p{
     height: 980px;
     position: absolute;
     top: 100px;
+    //display: flex;
+    //justify-content: ;
     bottom: 0;
   }
   .page-box{
@@ -109,7 +113,7 @@ p{
     height: 910px;
     background: black;
     border-radius: 35px 35px 35px 35px;
-    margin: 13px auto 0;
+    //margin: 13px auto 0;
     /*padding-top: 25px;*/
     position: relative;
 
@@ -166,7 +170,7 @@ p{
             .box-left{
               width: 53px;
               height: 25px;
-              background: #FFC300;
+              //background: #FFC300;
               border-radius: 10px 10px 10px 10px;
               //border: 1px solid white;
             }
@@ -278,7 +282,7 @@ p{
     position: absolute;
     left: 0px;
     top : 0px;
-    background: #ffff00;
+    //background: #ffff00;
   }
 }