Merge remote-tracking branch 'origin/master'

6097ce03 · 秦嘉 · 5eb590e2 · 25a5f652 · 6097ce03 · 6097ce03
Commit 6097ce03 authored May 22, 2022 by 秦嘉
6 changed files
--- a/src/views/IntegratedMonitor/reportStatistics/networkEquipment.vue
+++ b/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

--- a/src/views/IntegratedMonitor/reportStatistics/operationLog.vue
+++ b/src/views/IntegratedMonitor/reportStatistics/operationLog.vue
--- a/src/views/movingRingMonitoring/accessControl/accessControlList.vue
+++ b/src/views/movingRingMonitoring/accessControl/accessControlList.vue
--- a/src/views/patrolManagement/patrolInspectionPlan.vue
+++ b/src/views/patrolManagement/patrolInspectionPlan.vue
--- a/src/views/patrolManagement/patrolInspectionReport.vue
+++ b/src/views/patrolManagement/patrolInspectionReport.vue
--- a/src/views/patrolManagement/patrolInspectionReportDetails.vue
+++ b/src/views/patrolManagement/patrolInspectionReportDetails.vue