Merge branch 'feature/停复机1' into test

* feature/停复机1:
  update: dist

# Conflicts:
#	dist/index.html
#	dist/static/css/app.06aaddd0a0d5cd58132565d996a7f711.css
#	dist/static/css/app.07d04d097ce1e2c684bf9ea8ea5ec0ba.css
#	dist/static/css/app.7bbb701cb4addc6ee824500e0f6db3ff.css
#	dist/static/js/3.2f4d69e03b2fd302c6d7.js
#	dist/static/js/3.8abffb4fe8327ffaf1df.js
#	dist/static/js/3.a7801d6ea3ff7486a691.js
#	dist/static/js/manifest.7d088c97fd765324130d.js
#	dist/static/js/manifest.c1d70d61057f1d45a216.js
#	dist/static/js/manifest.c8586fe57e9fd5dc11a2.js

src/components/active/in-progress-active.vue

@@ -11,7 +11,6 @@
 
 import inProgressActive from '@/components/active/in-progress-active.vue';
 -->
-
 <template>
   <div v-if="inProgressData.length" style="margin-top:-9px;">
     <div class="flex-top-wrap" >