Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 6cf36f0e43c9add691b9a375526ce7dc26209574

 screen/src/views/EnergyConsum.vue

@@ -27,7 +27,7 @@
                <div class="name">本年累计循环烟箱</div>
                <div><span class="num" style="color: #68cfb2;" v-if="data1.smokeBoxTotal || data1.smokeBoxTotal == 0">{{
                  data1.smokeBoxTotal.toLocaleString()
                    }}</span><span>个</span></div>
                    }}</span><span>只</span></div>
              </div>
            </div>
          </div>