Merge remote-tracking branch 'origin/master'

gassafetyprogress-web/src/components/bigWindow/leftBar.vue

@@ -63,8 +63,8 @@
     <div class="pietwo">
       <div id="myChartpietwo" :style="{width: '225px', height: '250px'}"></div>
       <div class="titleTex">
-       <span :style="{color: '#00ffff'}"> ● 已完成:{{allNum.typeOne}}</span>
-       <span :style="{color: '#0099ff'}"> ● 未完成:{{allNum.typeTwo}}</span>
+       <span :style="{color: '#00ffff'}"> ● 已完成:0</span>
+       <span :style="{color: '#0099ff'}"> ● 未完成:0</span>
       </div>
     </div>