4 Commits 3c00169926 ... 60d286cdf2

Auteur SHA1 Bericht Datum
  byq 60d286cdf2 [feat] 彩虹图 2 weken geleden
  byq b69759cc3f Merge branch 'master' of http://47.92.102.27:20005/xjc/xjc-vue 2 weken geleden
  byq 15ab3f1933 Merge remote-tracking branch 'origin/master' 2 weken geleden
  byq 03c5aaf265 [feat] 彩虹图 2 weken geleden
26 gewijzigde bestanden met toevoegingen van 9 en 7 verwijderingen
  1. BIN
      src/assets/images/wakeup/fi-sr-time-quarter-past@2x.png
  2. BIN
      src/assets/images/wakeup/maturity/Frame 2147238438.png
  3. BIN
      src/assets/images/wakeup/maturity/Frame 2147238439@2x.png
  4. BIN
      src/assets/images/wakeup/maturity/Frame 2147238440.png
  5. BIN
      src/assets/images/wakeup/maturity/Frame 2147238441@2x.png
  6. BIN
      src/assets/images/wakeup/maturity/Frame 2147238444.png
  7. BIN
      src/assets/images/wakeup/maturity/Frame 673.png
  8. BIN
      src/assets/images/wakeup/maturity/bg.png
  9. BIN
      src/assets/images/wakeup/maturity/bg@2x.png
  10. BIN
      src/assets/images/wakeup/maturity/btn1.png
  11. BIN
      src/assets/images/wakeup/maturity/btn2.png
  12. BIN
      src/assets/images/wakeup/maturity/btn3.png
  13. BIN
      src/assets/images/wakeup/maturity/btn4.png
  14. BIN
      src/assets/images/wakeup/maturity/btn5.png
  15. BIN
      src/assets/images/wakeup/maturity/fh.png
  16. BIN
      src/assets/images/wakeup/maturity/fh@2x.png
  17. BIN
      src/assets/images/wakeup/maturity/maturity-game-bg.png
  18. BIN
      src/assets/images/wakeup/maturity/maturity-game-left.png
  19. BIN
      src/assets/images/wakeup/maturity/maturity-game-right.png
  20. BIN
      src/assets/images/wakeup/maturity/maturity-game-title.png
  21. BIN
      src/assets/images/wakeup/maturity/pre-qustion.png
  22. BIN
      src/assets/images/wakeup/maturity/shadow-bg.png
  23. BIN
      src/assets/images/wakeup/maturity/structure-img.png
  24. BIN
      src/assets/images/wakeup/maturity/submit.png
  25. BIN
      src/assets/images/wakeup/maturity/time.png
  26. 9 7
      src/views/xjc-integratedmachine/wakeup/rainbow/index.vue

BIN
src/assets/images/wakeup/fi-sr-time-quarter-past@2x.png


BIN
src/assets/images/wakeup/maturity/Frame 2147238438.png


BIN
src/assets/images/wakeup/maturity/Frame 2147238439@2x.png


BIN
src/assets/images/wakeup/maturity/Frame 2147238440.png


BIN
src/assets/images/wakeup/maturity/Frame 2147238441@2x.png


BIN
src/assets/images/wakeup/maturity/Frame 2147238444.png


BIN
src/assets/images/wakeup/maturity/Frame 673.png


BIN
src/assets/images/wakeup/maturity/bg.png


BIN
src/assets/images/wakeup/maturity/bg@2x.png


BIN
src/assets/images/wakeup/maturity/btn1.png


BIN
src/assets/images/wakeup/maturity/btn2.png


BIN
src/assets/images/wakeup/maturity/btn3.png


BIN
src/assets/images/wakeup/maturity/btn4.png


BIN
src/assets/images/wakeup/maturity/btn5.png


BIN
src/assets/images/wakeup/maturity/fh.png


BIN
src/assets/images/wakeup/maturity/fh@2x.png


BIN
src/assets/images/wakeup/maturity/maturity-game-bg.png


BIN
src/assets/images/wakeup/maturity/maturity-game-left.png


BIN
src/assets/images/wakeup/maturity/maturity-game-right.png


BIN
src/assets/images/wakeup/maturity/maturity-game-title.png


BIN
src/assets/images/wakeup/maturity/pre-qustion.png


BIN
src/assets/images/wakeup/maturity/shadow-bg.png


BIN
src/assets/images/wakeup/maturity/structure-img.png


BIN
src/assets/images/wakeup/maturity/submit.png


BIN
src/assets/images/wakeup/maturity/time.png


+ 9 - 7
src/views/xjc-integratedmachine/wakeup/rainbow/index.vue

@@ -23,10 +23,10 @@
                     <FollowRingChart ref="followRingChar2" id="ring-chart2" class="ring-chart2"
                                      :chartProps="chartPrpps2"
                                      style="z-index: 9999"/>
-                    <!--<FollowRingChart ref="followRingChart3" id="ring-chart3" class="ring-chart3"-->
-                    <!--:chartProps="chartPrpps3"/>-->
-                    <!--<FollowRingChart ref="followRingChart4" id="ring-chart4" class="ring-chart4"-->
-                    <!--:chartProps="chartPrpps4"/>-->
+                    <FollowRingChart ref="followRingChart3" id="ring-chart3" class="ring-chart3"
+                    :chartProps="chartPrpps3"/>
+                    <FollowRingChart ref="followRingChart4" id="ring-chart4" class="ring-chart4"
+                    :chartProps="chartPrpps4"/>
                     <!--<FollowRingChart ref="followRingChart5" id="ring-chart5" class="ring-chart5"-->
                     <!--:chartProps="chartPrpps5"/>-->
                     <!--<FollowRingChart ref="followRingChart6" id="ring-chart6" class="ring-chart6"-->
@@ -167,6 +167,8 @@
             console.log("t1")
         } else if (distance <= out_height.value - raduis_half[1] && distance > out_height.value - raduis_half[2]) {
             console.log("t2")
+        }else if (distance <= out_height.value - raduis_half[2] && distance > out_height.value - raduis_half[3]) {
+          console.log("t3")
         }
 
 
@@ -786,7 +788,7 @@
             width: 1832px;
             height: 800px;
             position: absolute;
-            left: 36px;
+            left: 48px;
             top: 36px;
         }
 
@@ -794,7 +796,7 @@
             width: 1832px;
             height: 800px;
             position: absolute;
-            left: 70px;
+            left: 80px;
             top: 69px;
         }
 
@@ -802,8 +804,8 @@
             width: 1832px;
             height: 800px;
             position: absolute;
+            left: 130px;
             top: 117px;
-            left: 117px;
         }
 
         .ring-chart5 {