diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index b86a0a9..1995630 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -18,7 +18,7 @@
             @change="fetchData"/>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
+          <el-select v-show="showDeviceType" v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
             <el-option
               v-for="item in deviceTypeList"
               :key="item.value"
@@ -34,6 +34,7 @@
       </el-row>
       <div class="chart-body">
         <ve-histogram
+          :loading="loading"
           :data="chartData"
           :settings="chartSettings"
           :extend="extend"
@@ -47,6 +48,7 @@
 import { alarmStaticByDept } from '@/api/dataStatics'
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
+import 'v-charts/lib/style.css'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -57,12 +59,7 @@
           'deptName': '权属单位',
           'alarmDevices': '报警设备数',
           'alarmTimes': '报警次数'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'deptName',
-        barWidth: 15
+        }
       },
       extend: {
         series: {
@@ -87,7 +84,8 @@
         columns: ['deptName', 'alarmDevices', 'alarmTimes'],
         rows: []
       },
-      dataEmpty: false
+      dataEmpty: false,
+      loading: true
     }
   },
   mounted() {
@@ -103,11 +101,18 @@
       this.listLoading = true
       alarmStaticByDept(this.listQuery).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) { return item.alarmTimes }))
+        if (maxValue < 10) {
+          this.extend.yAxis = { max: 10 }
+        } else {
+          this.extend.yAxis = {}
+        }
         this.listLoading = false
       })
     },
     // 获取设备类型
     fetchDeviceType() {
+      this.loading = true
       getDeviceType().then(response => {
         this.deviceTypeList = []
         // 过滤掉该单位不支持的设备类型
@@ -120,6 +125,7 @@
         if (this.deviceTypeList.length <= 1) {
           this.showDeviceType = false
         }
+        this.loading = false
       })
     },
     changeDate(date) {