Merge remote-tracking branch 'origin/master'

src/views/IntegratedMonitor/reportStatistics/networkEquipment.vue

@@ -10,7 +10,7 @@
         <el-button id="fullscreen_btn" class="headBtnW">全屏</el-button>
       </div>
     </div>
-    <el-tabs v-model="currentTab" type="card">
+    <el-tabs v-model="currentTab" type="card" style="margin-top: 10px">
       <el-tab-pane label="设备运行报表" name="1">
         <div style="padding: 10px 10px 10px 0">
           <el-table

src/views/IntegratedMonitor/reportStatistics/operationLog.vue

@@ -53,7 +53,7 @@
             </el-checkbox-group>
           </div>
           <div style="margin-top: 5px">
-            <el-button v-model="checkAll" style="width: 30%"  @click="checkName1">全选</el-button>
+            <el-button v-model="checkAll" style="width: 30%" @click="checkName1">全选</el-button>
             <el-button v-model="checkInvert" style="width: 30%" @click="checkName2">反选</el-button>
           </div>
         </el-form-item>