完善progress bar滚动效果

src/App.vue

@@ -31,5 +31,6 @@ html, body
   -moz-osx-font-smoothing grayscale
   width 100%
   height 100%
+  overflow: hidden
   color $fontColor
 </style>

src/components/MonitorProgress/monitor-progress.vue

@@ -4,7 +4,7 @@
       <div class="progress-bar"/>
       <div class="progress-bg" :style="bgStyle"/>
     </div>
-    <b v-if="!hideInfo" class="progress-info">
+    <b v-if="!hideInfo" class="progress-info" :style="infoStyle">
       <m-count :value="percent"/>%
     </b>
   </div>
@@ -30,21 +30,19 @@ export default {
       type: Boolean,
       default: false,
     },
-    status: {
-      type: String,
-      default: 'active',
-    }
   },
   computed: {
     style() {
-      if (!this.hideInfo) {
-        return {
-          width: '95%',
-        }
+      const size = Math.round(this.size / 10)
+      const result = {
+        padding: `${(size / 5).toFixed(1)}rem ${(size / 4.5).toFixed(1)}rem`,
       }
-      return {
-        width: '100%',
+      if (!this.hideInfo) {
+        result.width = '93%'
+      } else {
+        result.width = '100%'
       }
+      return result
     },
     containerStyle() {
       return {
@@ -63,6 +61,11 @@ export default {
         }
       }
     },
+    infoStyle() {
+      return {
+        fontSize: `${(this.size * 0.7 / 10).toFixed(1)}rem`,
+      }
+    },
   }
 }
 </script>
@@ -70,7 +73,6 @@ export default {
 <style lang="stylus" scoped>
 $radius = 2rem
 .monitor-progress
-  padding 0.5rem 0.6rem
   position relative
   border-radius $radius
   background rgba(0,0,0,0.18)
@@ -90,22 +92,21 @@ $radius = 2rem
       &.progress-bar
         z-index 1
         opacity 0.2
-        background-image repeating-linear-gradient(45deg, #fff, #fff 0.8rem, transparent 0.8rem, transparent 1.4rem)
-        background-size 10rem
-        animation loading-slide 30s linear infinite running
+        background-image repeating-linear-gradient(45deg, #fff, #fff 0.8rem, transparent 0.8rem, transparent 1.2rem)
+        background-size 17rem
+        animation rolling 10s linear infinite running
   .progress-info
     display flex
     align-items center
     justify-content center
-    width 5%
+    width 7%
     position absolute
-    right -5%
+    right -7%
     top 0
     color $edgeColor
-    font-size 1.6rem
     height 100%
     text-shadow 0 0 0.6rem $edgeColor
-@keyframes loading-slide
+@keyframes rolling
   to
-    background-position 100%
+    background-position-x 17rem
 </style>

src/views/main.vue

@@ -18,8 +18,27 @@
       </div>
     </m-card>
   </div>
-  <div class="box3"><m-card></m-card></div>
-  <div class="box4"><m-card></m-card></div>
+  <div class="box3">
+    <m-card>
+      <div class="chart-wrapper"><Chart/></div>
+      <div>
+        <p style="color: #ccc">收入组成</p>
+        <br>
+        <div style="display: flex;margin-bottom: 0.5rem;"><span style="color: #0eb2ee; width: 15%;text-align: right;">人力制</span> <div style="width: 85%;margin-left: 1rem"><m-progress :percent="percent" :size="14"/></div></div>
+        <div style="display: flex;margin-bottom: 0.5rem;"><span style="color: #0eb2ee; width: 15%;text-align: right;">项目制</span> <div style="width: 85%;margin-left: 1rem"><m-progress :percent="percent" :size="14"/></div></div>
+        <div style="display: flex;margin-bottom: 4rem;"><span style="color: #0eb2ee; width: 15%;text-align: right;">其他收入</span> <div style="width: 85%;margin-left: 1rem"><m-progress :percent="percent" :size="14"/></div></div>
+        <div style="text-align: right">
+          <m-brief label="人均收入" :count="13417" unit="元"/>
+        </div>
+      </div>
+    </m-card>
+  </div>
+  <div class="box4">
+    <m-card>
+      <div class="chart-wrapper"><Chart/></div>
+      <div></div>
+    </m-card>
+  </div>
   <div class="box5"><m-card><Chart></Chart></m-card></div>
   <div class="box6">
     <m-card title="收入监控">
@@ -46,8 +65,8 @@ export default {
   },
   mounted() {
     setTimeout(() => {
-      this.percent = 80
-    }, 100)
+      this.percent = 50
+    }, 1000)
   }
 }
 </script>
@@ -79,4 +98,8 @@ export default {
     grid-area box5
   .box6
     grid-area box6
+.chart-wrapper
+  height 48%
+  margin-bottom 1rem
+  border-bottom $cardBorder
 </style>