diff --git a/package.json b/package.json
index b9bef64..4b9d52d 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
     "leaflet-rotatedmarker": "^0.2.0",
+    "leaflet.markercluster": "^1.5.3",
     "mars3d": "^3.0.30",
     "mars3d-cesium": "1.83.0",
     "mockjs": "1.0.1-beta3",

diff --git a/package.json b/package.json
index b9bef64..4b9d52d 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
     "leaflet-rotatedmarker": "^0.2.0",
+    "leaflet.markercluster": "^1.5.3",
     "mars3d": "^3.0.30",
     "mars3d-cesium": "1.83.0",
     "mockjs": "1.0.1-beta3",
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index 83e3a85..685bee7 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,19 +1,28 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
+  <ve-pie :data="chartData" :settings="chartSetting" :legend="legend" :title="title"/>
 </template>
 
 <script>
 import { deviceStaticByStatus } from '@/api/dataStatics'
+import { alarmNowStatic } from '@/api/dataStatics'
 
 export default {
   data() {
     return {
+      chartSetting: {
+        label: {
+          show: false
+        },
+        labelLine: {
+          show: false
+        }
+      },
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
       },
       title: {
-        text: '设备在线情况统计'
+        text: '设备报警情况统计'
       },
       extend: {
         series: {
@@ -34,15 +43,25 @@
     }
   },
   mounted() {
-    this.fetchData()
+    // this.fetchData()
+    this.getAlarmCount()
   },
   methods: {
+    // 当前报警数
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.chartData.rows = [
+          { 'onlineStatus': '在线', 'deviceCount': 297 },
+          { 'onlineStatus': '报警', 'deviceCount': response.data.total }
+        ]
+      })
+    },
     fetchData() {
       deviceStaticByStatus().then(response => {
         const data = response.data
         this.chartData.rows = [
           { 'onlineStatus': '在线', 'deviceCount': data.online },
-          { 'onlineStatus': '离线', 'deviceCount': data.offline }
+          { 'onlineStatus': '报警', 'deviceCount': data.offline }
         ]
       })
     }

diff --git a/package.json b/package.json
index b9bef64..4b9d52d 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
     "leaflet-rotatedmarker": "^0.2.0",
+    "leaflet.markercluster": "^1.5.3",
     "mars3d": "^3.0.30",
     "mars3d-cesium": "1.83.0",
     "mockjs": "1.0.1-beta3",
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index 83e3a85..685bee7 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,19 +1,28 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
+  <ve-pie :data="chartData" :settings="chartSetting" :legend="legend" :title="title"/>
 </template>
 
 <script>
 import { deviceStaticByStatus } from '@/api/dataStatics'
+import { alarmNowStatic } from '@/api/dataStatics'
 
 export default {
   data() {
     return {
+      chartSetting: {
+        label: {
+          show: false
+        },
+        labelLine: {
+          show: false
+        }
+      },
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
       },
       title: {
-        text: '设备在线情况统计'
+        text: '设备报警情况统计'
       },
       extend: {
         series: {
@@ -34,15 +43,25 @@
     }
   },
   mounted() {
-    this.fetchData()
+    // this.fetchData()
+    this.getAlarmCount()
   },
   methods: {
+    // 当前报警数
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.chartData.rows = [
+          { 'onlineStatus': '在线', 'deviceCount': 297 },
+          { 'onlineStatus': '报警', 'deviceCount': response.data.total }
+        ]
+      })
+    },
     fetchData() {
       deviceStaticByStatus().then(response => {
         const data = response.data
         this.chartData.rows = [
           { 'onlineStatus': '在线', 'deviceCount': data.online },
-          { 'onlineStatus': '离线', 'deviceCount': data.offline }
+          { 'onlineStatus': '报警', 'deviceCount': data.offline }
         ]
       })
     }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8f47394..cedda90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row :gutter="40" class="panel-group">
     <div v-for="card in dataGroup" :key="card.title">
-      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <el-col :xs="12" :sm="12" :lg="8" class="card-panel-col">
         <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
       </el-col>
     </div>
@@ -43,15 +43,15 @@
           color: '#f4516c',
           path: '/alarmNow',
           permission: '/alarm/now'
-        },
-        {
-          title: '未完成工单数',
-          context: '--',
-          icon: 'icon-order',
-          color: '#f4516c',
-          path: '/listJob',
-          permission: '/job/list'
         }
+        // {
+        //   title: '未完成工单数',
+        //   context: '--',
+        //   icon: 'icon-order',
+        //   color: '#f4516c',
+        //   path: '/listJob',
+        //   permission: '/job/list'
+        // }
       ]
     }
   },

diff --git a/package.json b/package.json
index b9bef64..4b9d52d 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
     "leaflet-rotatedmarker": "^0.2.0",
+    "leaflet.markercluster": "^1.5.3",
     "mars3d": "^3.0.30",
     "mars3d-cesium": "1.83.0",
     "mockjs": "1.0.1-beta3",
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index 83e3a85..685bee7 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,19 +1,28 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
+  <ve-pie :data="chartData" :settings="chartSetting" :legend="legend" :title="title"/>
 </template>
 
 <script>
 import { deviceStaticByStatus } from '@/api/dataStatics'
+import { alarmNowStatic } from '@/api/dataStatics'
 
 export default {
   data() {
     return {
+      chartSetting: {
+        label: {
+          show: false
+        },
+        labelLine: {
+          show: false
+        }
+      },
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
       },
       title: {
-        text: '设备在线情况统计'
+        text: '设备报警情况统计'
       },
       extend: {
         series: {
@@ -34,15 +43,25 @@
     }
   },
   mounted() {
-    this.fetchData()
+    // this.fetchData()
+    this.getAlarmCount()
   },
   methods: {
+    // 当前报警数
+    getAlarmCount() {
+      alarmNowStatic().then(response => {
+        this.chartData.rows = [
+          { 'onlineStatus': '在线', 'deviceCount': 297 },
+          { 'onlineStatus': '报警', 'deviceCount': response.data.total }
+        ]
+      })
+    },
     fetchData() {
       deviceStaticByStatus().then(response => {
         const data = response.data
         this.chartData.rows = [
           { 'onlineStatus': '在线', 'deviceCount': data.online },
-          { 'onlineStatus': '离线', 'deviceCount': data.offline }
+          { 'onlineStatus': '报警', 'deviceCount': data.offline }
         ]
       })
     }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8f47394..cedda90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row :gutter="40" class="panel-group">
     <div v-for="card in dataGroup" :key="card.title">
-      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <el-col :xs="12" :sm="12" :lg="8" class="card-panel-col">
         <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
       </el-col>
     </div>
@@ -43,15 +43,15 @@
           color: '#f4516c',
           path: '/alarmNow',
           permission: '/alarm/now'
-        },
-        {
-          title: '未完成工单数',
-          context: '--',
-          icon: 'icon-order',
-          color: '#f4516c',
-          path: '/listJob',
-          permission: '/job/list'
         }
+        // {
+        //   title: '未完成工单数',
+        //   context: '--',
+        //   icon: 'icon-order',
+        //   color: '#f4516c',
+        //   path: '/listJob',
+        //   permission: '/job/list'
+        // }
       ]
     }
   },
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index a8f9012..e10118a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -3,41 +3,41 @@
     <panel-group ref="panelgroup"/>
     <el-row>
       <!--井盖布防撤防统计-->
-      <el-col :span="10">
+      <!-- <el-col :span="10">
         <el-card shadow="never">
           <well-count-by-bfzt/>
         </el-card>
-      </el-col>
+      </el-col> -->
       <!--井类型统计-->
-      <el-col :span="14">
+      <el-col :span="12">
         <el-card shadow="never">
           <well-count-by-type/>
         </el-card>
       </el-col>
       <!--设备数量统计-->
-      <el-col :span="14">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count/>
         </el-card>
       </el-col>
       <!--设备在线情况统计-->
-      <el-col :span="10">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count-by-online/>
         </el-card>
       </el-col>
       <!--7日报警次数统计-->
-      <el-col :span="10">
+      <el-col :span="12">
         <el-card shadow="never">
           <alarm-by-days/>
         </el-card>
       </el-col>
       <!--工单数量统计-->
-      <el-col :span="14">
+      <!-- <el-col :span="14">
         <el-card shadow="never">
           <job-by-status/>
         </el-card>
-      </el-col>
+      </el-col> -->
     </el-row>
   </div>
 </template>