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

doum

22 小时以前 6cf36f0e43c9add691b9a375526ce7dc26209574

 screen/src/views/FireFighting.vue

@@ -99,7 +99,7 @@
                      </div>
                    </div>
                    <div class="list_wrap_footer" v-if="dataList1.length > 0">
                      <div class="wrap_footer_item name">总计</div>
                      <div class="wrap_footer_item name" style="color: #fff;">总计</div>
                      <div class="wrap_footer_item">{{sum(dataList1, 'totalDeviceNum')}}</div>
                      <div class="wrap_footer_item">{{sum(dataList1, 'alarmDeviceNum')}}</div>
                      <div class="wrap_footer_item">{{sum(dataList1, 'shieldDeviceNum')}}</div>